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")
from
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 a
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 t
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/Makefile
between commit:
554aae35007e ("lib: Add support for generic packing operations")
from the net-next tree and commit:
1a1e7f563bd5 ("lib: Move mathematic helpers to separate folder")
from the akpm-c
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 i
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.
I
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 Kc
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 linka
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 net-next
