summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-31 17:58:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-31 17:58:48 -0700
commitfe8e12b5032536d37751c47e1c0446f17e974e5c (patch)
tree279c47182394244da6fd87a33031117dd459bbe1 /net
parentf9799ad21b5e4a41633f54dfab407ebb37abbd8a (diff)
parent41a75a6eb2bf4e75e0d93862171bebb3ca4efec7 (diff)
Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions