diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-06 07:18:36 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-06 07:18:36 -0600 |
| commit | aeb542a1b5c507ea117d21c3e3e012ba16f065ac (patch) | |
| tree | 5299600957d34a4eea5f6d2f2771d277f8a6bc8a /mm/z3fold.c | |
| parent | b0b8a945ea29166706611820e609bce23e278f6b (diff) | |
| parent | 140d7e88bb2ac4af7b0db1fd6302179440f3c4be (diff) | |
| download | linux-aeb542a1b5c507ea117d21c3e3e012ba16f065ac.tar.bz2 | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"7 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
arch/Kconfig: update HAVE_RELIABLE_STACKTRACE description
mm, hotplug: fix page online with DEBUG_PAGEALLOC compiled but not enabled
mm/z3fold.c: do not include rwlock.h directly
fat: fix uninit-memory access for partial initialized inode
mm: avoid data corruption on CoW fault into PFN-mapped VMA
mm: fix possible PMD dirty bit lost in set_pmd_migration_entry()
mm, numa: fix bad pmd by atomically check for pmd_trans_huge when marking page tables prot_numa
Diffstat (limited to 'mm/z3fold.c')
| -rw-r--r-- | mm/z3fold.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/z3fold.c b/mm/z3fold.c index 43754d8ebce8..42f31c4b53ad 100644 --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -41,7 +41,6 @@ #include <linux/workqueue.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/rwlock.h> #include <linux/zpool.h> #include <linux/magic.h> |