linux-next: manual merge of the akpm-current tree with the net-next tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/filemap.c between commit: 76cd61739fd1 ("mm/error_inject: Fix allow_error_inject function signatures.") from the net-next tree and commit: 2cb138387ead ("mm/filemap: fix storing to a THP shadow entry")

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: net/sctp/socket.c between commits: 89fae01eef8b ("sctp: switch sctp_setsockopt_auth_key to use memzero_explicit") 534d13d07e77 ("sctp: pass a kernel pointer to sctp_setsockopt_auth_key") from the net-next tree

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/cma.h between commit: a2b992c828f7 ("debugfs: make sure we can remove u32_array files cleanly") from the net-next tree and commit: bc7212aceef6 ("mm: cma: fix the name of CMA areas") from the akpm-current

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: lib/Makefile between commit: 509e56b37cc3 ("blackhole_dev: add a selftest") from the net-next tree and commit: c86f3a66de9a ("lib: introduce test_meminit module") from the akpm-current tree. I fixed it up

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: net/ipv6/sysctl_net_ipv6.c between commit: 323a53c41292 ("ipv6: tcp: enable flowlabel reflection in some RST packets") from the net-next tree and commit: f4e7c821eda5 ("proc/sysctl: add shared variables for

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/net/ethernet/netronome/nfp/nfp_net_common.c between commits: 5f0ca2fb71e2 ("nfp: handle page allocation failures") 790a39917183 ("nfp: switch to dev_alloc_page()") 16f50cda06ae ("nfp: use a counter

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/net/ethernet/netronome/nfp/nfp_net_common.c between commits: 5f0ca2fb71e2 ("nfp: handle page allocation failures") 790a39917183 ("nfp: switch to dev_alloc_page()") 16f50cda06ae ("nfp: use a counter

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/net/inet_sock.h between commit: 60e2a7780793 ("tcp: TCP experimental option for SMC") from the net-next tree and commit: 8a3e1a11b8af ("kmemcheck: remove annotations") from the akpm-current tree.

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/net/inet_sock.h between commit: 60e2a7780793 ("tcp: TCP experimental option for SMC") from the net-next tree and commit: 8a3e1a11b8af ("kmemcheck: remove annotations") from the akpm-current tree.

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/sh/configs/se7751_defconfig between commit: 9efdb14f76f4 ("net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.") from the net-next tree and commit: a83883ff2285 ("sh: defconfig: cleanup from old

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/sh/configs/se7751_defconfig between commit: 9efdb14f76f4 ("net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.") from the net-next tree and commit: a83883ff2285 ("sh: defconfig: cleanup from old

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/net/sock.h net/ipv4/tcp_ipv4.c between commit: 64be0aed59ad ("net: diag: Add the ability to destroy a socket.") from the net-next tree and commit: 0e2cde9cf7b6 ("net: tcp_memcontrol: simplify

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/net/sock.h net/ipv4/tcp_ipv4.c between commit: 64be0aed59ad ("net: diag: Add the ability to destroy a socket.") from the net-next tree and commit: 0e2cde9cf7b6 ("net: tcp_memcontrol: simplify

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/net/sock.h between commits: 297dbde19cf6 ("netprio_cgroup: limit the maximum css->id to USHRT_MAX") 2a56a1fec290 ("net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct") from the

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/net/sock.h between commits: 297dbde19cf6 ("netprio_cgroup: limit the maximum css->id to USHRT_MAX") 2a56a1fec290 ("net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct") from the

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in lib/Makefile between commits 9d6dbe1bbaf8 ("rhashtable: Make selftest modular") and 57dd8a0735aa ("vhost: vhost_scsi_handle_vq() should just use copy_from_user()") from the net-next tree and commits f3d593d650ec

linux-next: manual merge of the akpm-current tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in lib/Makefile between commits 9d6dbe1bbaf8 (rhashtable: Make selftest modular) and 57dd8a0735aa (vhost: vhost_scsi_handle_vq() should just use copy_from_user()) from the net-next tree and commits f3d593d650ec (hexdump: