projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f9799ad 41a75a6)
Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Apr 2017 00:58:48 +0000 (17:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Apr 2017 00:58:48 +0000 (17:58 -0700)
commitfe8e12b5032536d37751c47e1c0446f17e974e5c
tree279c47182394244da6fd87a33031117dd459bbe1tree | snapshot
parentf9799ad21b5e4a41633f54dfab407ebb37abbd8acommit | diff
parent41a75a6eb2bf4e75e0d93862171bebb3ca4efec7commit | diff
Merge branch 'for-linus-4.11' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "We have three small fixes queued up in my for-linus-4.11 branch"

* 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix an integer overflow check
  btrfs: Change qgroup_meta_rsv to 64bit
  Btrfs: bring back repair during read
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
John Crispins staging tree