From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@google.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Networking <netdev@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Stanislav Fomichev <sdf@google.com>,
Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Subject: linux-next: manual merge of the kspp tree with the bpf-next tree
Date: Thu, 12 Dec 2019 14:41:41 +1100 [thread overview]
Message-ID: <20191212144141.62a303cb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 736 bytes --]
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
net/bpf/test_run.c
between commit:
b590cb5f802d ("bpf: Switch to offsetofend in BPF_PROG_TEST_RUN")
from the bpf-next tree and commit:
c593642c8be0 ("treewide: Use sizeof_field() macro")
from the kspp tree.
I fixed it up (I just used the former 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-12-12 3:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 3:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-27 19:08 linux-next: manual merge of the kspp tree with the bpf-next tree broonie
2022-09-27 19:30 ` 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=20191212144141.62a303cb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pankaj.laxminarayan.bharadiya@intel.com \
--cc=sdf@google.com \
/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