]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3062556 51a6025)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 20:40:13 +0000 (05:40 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 20:40:13 +0000 (05:40 +0900)
Pull two btrfs fixes from Chris Mason:
 "This has two fixes that we've been testing for 3.16, but since both
  are safe and fix real bugs, it makes sense to send for 3.15 instead"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: send, fix incorrect ref access when using extrefs
  Btrfs: fix EIO on reading file after ioctl clone works on it

1  2 
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/ioctl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.