Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Apr 2017 23:53:45 +0000 (16:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Apr 2017 23:53:45 +0000 (16:53 -0700)
commit4b31ac485daabc50483598500055d63ce5677cc3
tree2b2c316b7cc4fbcbde7e9126cb28df04604d30a5
parent5466f4dfce857a7954f19bc9acfc7ca4a73321b6
parenta967efb30b3afa3d858edd6a17f544f9e9e46eea
Merge branch 'for-linus-4.11' of git://git./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
fs/btrfs/inode.c
fs/btrfs/volumes.c