diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2017-03-23 11:39:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2017-03-23 11:39:33 -0700 |
| commit | 131fbf4f9c096adadde27ad4bc70ea1632d720a4 (patch) | |
| tree | a76baf52612b90c4da8c4ac3c430d483fbbb1d79 /fs/xfs/xfs_extent_busy.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | btrfs: add missing memset while reading compressed inline extents (diff) | |
| download | linux-131fbf4f9c096adadde27ad4bc70ea1632d720a4.tar.gz linux-131fbf4f9c096adadde27ad4bc70ea1632d720a4.tar.bz2 linux-131fbf4f9c096adadde27ad4bc70ea1632d720a4.zip | |
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:
"Zygo tracked down a very old bug with inline compressed extents.
I didn't tag this one for stable because I want to do individual
tested backports. It's a little tricky and I'd rather do some extra
testing on it along the way"
* 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: add missing memset while reading compressed inline extents
Btrfs: fix regression in lock_delalloc_pages
btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h
Diffstat (limited to 'fs/xfs/xfs_extent_busy.h')
0 files changed, 0 insertions, 0 deletions