From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Aug 2018 23:49:31 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: v4.19~375
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ada4e2826794bdf8d88f938a9ced0b80894b037;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - a few misc things

 - a few Y2038 fixes

 - ntfs fixes

 - arch/sh tweaks

 - ocfs2 updates

 - most of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (111 commits)
  mm/hmm.c: remove unused variables align_start and align_end
  fs/userfaultfd.c: remove redundant pointer uwq
  mm, vmacache: hash addresses based on pmd
  mm/list_lru: introduce list_lru_shrink_walk_irq()
  mm/list_lru.c: pass struct list_lru_node* as an argument to __list_lru_walk_one()
  mm/list_lru.c: move locking from __list_lru_walk_one() to its caller
  mm/list_lru.c: use list_lru_walk_one() in list_lru_walk_node()
  mm, swap: make CONFIG_THP_SWAP depend on CONFIG_SWAP
  mm/sparse: delete old sparse_init and enable new one
  mm/sparse: add new sparse_init_nid() and sparse_init()
  mm/sparse: move buffer init/fini to the common place
  mm/sparse: use the new sparse buffer functions in non-vmemmap
  mm/sparse: abstract sparse buffer allocations
  mm/hugetlb.c: don't zero 1GiB bootmem pages
  mm, page_alloc: double zone's batchsize
  mm/oom_kill.c: document oom_lock
  mm/hugetlb: remove gigantic page support for HIGHMEM
  mm, oom: remove sleep from under oom_lock
  kernel/dma: remove unsupported gfp_mask parameter from dma_alloc_from_contiguous()
  mm/cma: remove unsupported gfp_mask parameter from cma_alloc()
  ...
---

6ada4e2826794bdf8d88f938a9ced0b80894b037
diff --cc fs/notify/inotify/inotify_user.c
index 6f48d32,749c46a..ac6978d
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@@ -813,9 -808,10 +815,10 @@@ static int __init inotify_user_setup(vo
  	BUILD_BUG_ON(IN_ISDIR != FS_ISDIR);
  	BUILD_BUG_ON(IN_ONESHOT != FS_IN_ONESHOT);
  
 -	BUG_ON(hweight32(ALL_INOTIFY_BITS) != 21);
 +	BUG_ON(hweight32(ALL_INOTIFY_BITS) != 22);
  
- 	inotify_inode_mark_cachep = KMEM_CACHE(inotify_inode_mark, SLAB_PANIC);
+ 	inotify_inode_mark_cachep = KMEM_CACHE(inotify_inode_mark,
+ 					       SLAB_PANIC|SLAB_ACCOUNT);
  
  	inotify_max_queued_events = 16384;
  	init_user_ns.ucount_max[UCOUNT_INOTIFY_INSTANCES] = 128;