diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-11 09:15:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-11 09:15:58 -0800 |
| commit | 2b95550a4323e501e133dac1c9c9cad6ff17f4c1 (patch) | |
| tree | c68b793cfc897e003d08164cb3f03db274766e6f /drivers/ptp/Makefile | |
| parent | 13ebfd0601228fbbd92707ce4944ab1a09a4d821 (diff) | |
| parent | 6e78b3f7a193546b1c00a6d084596e774f147169 (diff) | |
Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"This has two last minute fixes. The highest priority here is a
regression fix for the decompression code, but we also fixed up a
problem with the 32-bit compat ioctls.
The decompression bug could hand back the wrong data on big reads when
zlib was used. I have a larger cleanup to make the math here less
error prone, but at this stage in the release Omar's patch is the best
choice"
* 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: fix btrfs_decompress_buf2page()
btrfs: fix btrfs_compat_ioctl failures on non-compat ioctls
Diffstat (limited to 'drivers/ptp/Makefile')
0 files changed, 0 insertions, 0 deletions