summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 13:32:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 13:32:17 -0700
commitef161ea1ff96337cbe2253afb72636474d90598e (patch)
tree58fa11ed86de6069d81a5f5b09310ae2a9bd0c70 /Makefile
parent8ccf863f09bbff209b124cbd90644c0b75b8fefd (diff)
parentd37973082b453ba6b89ec07eb7b84305895d35e1 (diff)
downloadop-kernel-dev-ef161ea1ff96337cbe2253afb72636474d90598e.zip
op-kernel-dev-ef161ea1ff96337cbe2253afb72636474d90598e.tar.gz
Merge branch 'for-linus-update' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs data corruption fix from Chris Mason: "I'm testing a pull with more fixes, but wanted to get this one out so Greg can pick it up. The corruption isn't easy to hit, you have to do a readonly snapshot and have orphans in the snapshot. But my review and testing missed the bug. Filipe has added a better xfstest to cover it" * 'for-linus-update' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Revert "Btrfs: race free update of commit root for ro snapshots"
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud