Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
net/sctp/stream.c
between commit:
cfe4bd7a257f ("sctp: check and update stream->out_curr when allocating
stream_out")
from the net tree and commit:
2bd3fbb3ff23 ("sctp: convert to genradix")
from the
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
kernel/fork.c between commit c2b1df2eb429 ("Rename nsproxy.pid_ns to
nsproxy.pid_ns_for_children") from the net tree and commits 74a7cb7237ad
("pidns: fix vfork() after unshare(CLONE_NEWPID)"), 98c53a09f937 ("pidns:
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
kernel/fork.c between commit c2b1df2eb429 (Rename nsproxy.pid_ns to
nsproxy.pid_ns_for_children) from the net tree and commits 74a7cb7237ad
(pidns: fix vfork() after unshare(CLONE_NEWPID)), 98c53a09f937 (pidns:
kill
3 matches
Mail list logo