diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-28 19:13:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-28 19:13:17 +0200 |
| commit | 28b2013587e535cef8bd8d8e0eae5ad40868369b (patch) | |
| tree | 80b07dfce29e4e94e37660c47a621c368c05a6e8 /fs/afs/fsclient.c | |
| parent | Merge tag 'nfsd-4.11-3' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | btrfs: qgroup: move noisy underflow warning to debugging build (diff) | |
| download | linux-28b2013587e535cef8bd8d8e0eae5ad40868369b.tar.xz linux-28b2013587e535cef8bd8d8e0eae5ad40868369b.zip | |
Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"We have one more fix for btrfs.
This gets rid of a new WARN_ON from rc1 that ended up making more
noise than we really want. The larger fix for the underflow got
delayed a bit and it's better for now to put it under
CONFIG_BTRFS_DEBUG"
* 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: qgroup: move noisy underflow warning to debugging build
Diffstat (limited to 'fs/afs/fsclient.c')
0 files changed, 0 insertions, 0 deletions