On Wed, Jan 10, 2018 at 8:40 PM, Stephen Rothwell wrote:
> Hi Kees,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> net/sctp/socket.c
>
> between commit:
>
> c76f97c99ae6 ("sctp: make use of pre-calculated len")
>
> from the net tree and commit:
>
> 3511d716f5a8 ("sctp:
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
net/sctp/socket.c
between commit:
c76f97c99ae6 ("sctp: make use of pre-calculated len")
from the net tree and commit:
3511d716f5a8 ("sctp: Copy struct sctp_sock.autoclose to userspace using
put_user()")
from the ksp
