projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 625e200 a6aa10c)
Merge tag 'for-4.17-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 May 2018 06:32:18 +0000 (20:32 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 May 2018 06:32:18 +0000 (20:32 -1000)
Pull btrfs fixes from David Sterba:
 "Two regression fixes and one fix for stable"

* tag 'for-4.17-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: send, fix missing truncate for inode with prealloc extent past eof
  btrfs: Take trans lock before access running trans in check_delayed_ref
  btrfs: Fix wrong first_key parameter in replace_path

1  2 
fs/btrfs/extent-tree.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/extent-tree.c
Simple merge
John Crispins staging tree