diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-14 16:53:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-14 16:53:45 -0700 |
commit | 4b31ac485daabc50483598500055d63ce5677cc3 (patch) | |
tree | 2b2c316b7cc4fbcbde7e9126cb28df04604d30a5 /kernel | |
parent | 5466f4dfce857a7954f19bc9acfc7ca4a73321b6 (diff) | |
parent | a967efb30b3afa3d858edd6a17f544f9e9e46eea (diff) | |
download | linux-4b31ac485daabc50483598500055d63ce5677cc3.tar.gz linux-4b31ac485daabc50483598500055d63ce5677cc3.tar.bz2 linux-4b31ac485daabc50483598500055d63ce5677cc3.zip |
Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"Dave Sterba collected a few more fixes for the last rc.
These aren't marked for stable, but I'm putting them in with a batch
were testing/sending by hand for this release"
* 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix potential use-after-free for cloned bio
Btrfs: fix segmentation fault when doing dio read
Btrfs: fix invalid dereference in btrfs_retry_endio
btrfs: drop the nossd flag when remounting with -o ssd
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions