aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/dev-replace.c
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2019-11-14 01:06:01 +0000
committerDave Airlie <[email protected]>2019-11-14 01:09:06 +0000
commitdfce90259d74d34cff4cb0c75ecfc0336c09520f (patch)
treee13b4f5083043a15d53c096d924d21cc57b45b59 /fs/btrfs/dev-replace.c
parentdrm/i915/gen8+: Add RC6 CTX corruption WA (diff)
parentdrm/i915/cmdparser: Fix jump whitelist clearing (diff)
downloadkernel-dfce90259d74d34cff4cb0c75ecfc0336c09520f.tar.gz
kernel-dfce90259d74d34cff4cb0c75ecfc0336c09520f.zip
Backmerge i915 security patches from commit 'ea0b163b13ff' into drm-next
This backmerges the branch that ended up in Linus' tree. It removes all the changes for the rc6 patches from Linus' tree in favour of a patch that is based on a large refactor that occured. Otherwise it all looks good. Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
0 files changed, 0 insertions, 0 deletions