diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 11:42:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 11:42:37 -0700 |
| commit | 3d875182d7f4b27b7778c3ab6a39800d383968cb (patch) | |
| tree | 588a0f89219f4252d93a102b49f661b1bf435a84 /lib | |
| parent | 69984b64440729bf6b08d1ddc1b3ee8282a2c846 (diff) | |
| parent | 934ed25ea505859cec5236dcb1769be5f998dd25 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"6 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
sh: add copy_user_page() alias for __copy_user()
lib/Kconfig: ZLIB_DEFLATE must select BITREVERSE
mm, dax: fix DAX deadlocks
memcg: convert threshold to bytes
builddeb: remove debian/files before build
mm, fs: obey gfp_mapping for add_to_page_cache()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 2e491ac15622..f0df318104e7 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -220,6 +220,7 @@ config ZLIB_INFLATE config ZLIB_DEFLATE tristate + select BITREVERSE config LZO_COMPRESS tristate |