diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-22 19:35:33 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-22 19:35:33 +0100 |
commit | 67d584e33e54c3f33c8541928aa7115388c97433 (patch) | |
tree | 1eaa36ba218afa5365879c77213593ea3c781efb /drivers/ide/legacy | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
parent | btrfs: fix removal of raid[56|1c34} incompat flags after removing block group (diff) | |
download | linux-67d584e33e54c3f33c8541928aa7115388c97433.tar.xz linux-67d584e33e54c3f33c8541928aa7115388c97433.zip |
Merge tag 'for-5.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"Two fixes.
The first is a regression: when dropping some incompat bits the
conditions were reversed. The other is a fix for rename whiteout
potentially leaving stack memory linked to a list"
* tag 'for-5.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: fix removal of raid[56|1c34} incompat flags after removing block group
btrfs: fix log context list corruption after rename whiteout error
Diffstat (limited to 'drivers/ide/legacy')
0 files changed, 0 insertions, 0 deletions