* linux-next: manual merge of the kspp tree with the net tree
@ 2018-01-11 4:40 Stephen Rothwell
2018-01-11 20:52 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-01-11 4:40 UTC (permalink / raw)
To: Kees Cook, David Miller, Networking
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
David Windsor, Marcelo Ricardo Leitner
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.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the kspp tree with the net tree
2018-01-11 4:40 linux-next: manual merge of the kspp tree with the net tree Stephen Rothwell
@ 2018-01-11 20:52 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2018-01-11 20:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Linux-Next Mailing List,
Linux Kernel Mailing List, David Windsor,
Marcelo Ricardo Leitner
On Wed, Jan 10, 2018 at 8:40 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-11 20:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-11 4:40 linux-next: manual merge of the kspp tree with the net tree Stephen Rothwell
2018-01-11 20:52 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).