summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-23 11:39:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-23 11:39:33 -0700
commit131fbf4f9c096adadde27ad4bc70ea1632d720a4 (patch)
treea76baf52612b90c4da8c4ac3c430d483fbbb1d79 /Makefile
parentf341d9f08ae01d90d8d0c135ae2edf4423e724c9 (diff)
parente1699d2d7bf6e6cce3e1baff19f9dd4595a58664 (diff)
downloadop-kernel-dev-131fbf4f9c096adadde27ad4bc70ea1632d720a4.zip
op-kernel-dev-131fbf4f9c096adadde27ad4bc70ea1632d720a4.tar.gz
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 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud