From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@google.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Windsor <dave@nullcore.net>,
Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Subject: linux-next: manual merge of the kspp tree with the net tree
Date: Thu, 11 Jan 2018 15:40:31 +1100 [thread overview]
Message-ID: <20180111154031.577c213b@canb.auug.org.au> (raw)
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
next reply other threads:[~2018-01-11 4:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-11 4:40 Stephen Rothwell [this message]
2018-01-11 20:52 ` linux-next: manual merge of the kspp tree with the net tree Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180111154031.577c213b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dave@nullcore.net \
--cc=davem@davemloft.net \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).