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
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_init.c
Simple merge

diff --cc drivers/infiniband/sw/rdmavt/qp.c
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
Simple merge

diff --cc drivers/net/ethernet/cavium/liquidio/octeon_network.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_rx.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfp_net_common.c
Simple merge

diff --cc drivers/net/ethernet/sfc/falcon/rx.c
Simple merge

diff --cc drivers/net/ethernet/sfc/rx.c
Simple merge

diff --cc drivers/net/ethernet/ti/netcp_core.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc fs/fuse/inode.c
Simple merge

diff --cc fs/ocfs2/dlmfs/dlmfs.c
Simple merge

diff --cc include/linux/filter.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/inet_sock.h
index 2135c9ba6ac30dfb8bb8f7194d863c37cae07dca,8e51b4a69088c211f79b1d5e26029c56df93b99a..39efb968b7a4cc9f5ea06ce5e5670ef60c5f7505
--- 1/include/net/inet_sock.h
--- 2/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 f8715c5af37d4e598770dbe5c5f83246241f18d5,a63e6a8bb7e00429713a8a4cfd40c6a0729020b6..79e1a2c7912c03d8281d449609d57cc909138a3b
--- 1/include/net/sock.h
--- 2/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;

diff --cc init/Kconfig
Simple merge

diff --cc kernel/bpf/core.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/inet_timewait_sock.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge