Re: linux-next: manual merge of the kspp tree with the net tree

[Kees Cook]

On Wed, Jan 10, 2018 at 8:40 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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: Copy struct sctp_sock.autoclose to userspace using put_user()")
>
> from the kspp tree.
>
> I fixed it up (I just used the latter version) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Thanks! And yes, confirmed, the kspp tree version should be used to
resolve this conflict.

-Kees

-- 
Kees Cook
Pixel Security