From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Nov 2017 03:42:40 +0000 (-0800)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: v4.15-rc1~93
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/7c225c69f86c934e3be9be63ecde754e286838d7

Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - a few misc bits

 - ocfs2 updates

 - almost all of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (131 commits)
  memory hotplug: fix comments when adding section
  mm: make alloc_node_mem_map a void call if we don't have CONFIG_FLAT_NODE_MEM_MAP
  mm: simplify nodemask printing
  mm,oom_reaper: remove pointless kthread_run() error check
  mm/page_ext.c: check if page_ext is not prepared
  writeback: remove unused function parameter
  mm: do not rely on preempt_count in print_vma_addr
  mm, sparse: do not swamp log with huge vmemmap allocation failures
  mm/hmm: remove redundant variable align_end
  mm/list_lru.c: mark expected switch fall-through
  mm/shmem.c: mark expected switch fall-through
  mm/page_alloc.c: broken deferred calculation
  mm: don't warn about allocations which stall for too long
  fs: fuse: account fuse_inode slab memory as reclaimable
  mm, page_alloc: fix potential false positive in __zone_watermark_ok
  mm: mlock: remove lru_add_drain_all()
  mm, sysctl: make NUMA stats configurable
  shmem: convert shmem_init_inodecache() to void
  Unify migrate_pages and move_pages access checks
  mm, pagevec: rename pagevec drained field
  ...
---

7c225c69f86c934e3be9be63ecde754e286838d7
diff --cc include/net/inet_sock.h
index 2135c9ba6ac3,8e51b4a69088..39efb968b7a4
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@@ -92,9 -90,7 +90,8 @@@ struct inet_request_sock 
  				wscale_ok  : 1,
  				ecn_ok	   : 1,
  				acked	   : 1,
 -				no_srccheck: 1;
 +				no_srccheck: 1,
 +				smc_ok	   : 1;
- 	kmemcheck_bitfield_end(flags);
  	u32                     ir_mark;
  	union {
  		struct ip_options_rcu __rcu	*ireq_opt;
diff --cc include/net/sock.h
index f8715c5af37d,a63e6a8bb7e0..79e1a2c7912c
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@@ -449,10 -444,7 +448,8 @@@ struct sock 
  				sk_protocol  : 8,
  				sk_type      : 16;
  #define SK_PROTOCOL_MAX U8_MAX
- 	kmemcheck_bitfield_end(flags);
- 
  	u16			sk_gso_max_segs;
 +	u8			sk_pacing_shift;
  	unsigned long	        sk_lingertime;
  	struct proto		*sk_prot_creator;
  	rwlock_t		sk_callback_lock;