From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
David Miller <davem@davemloft.net>
Cc: bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
Tiezhu Yang <yangtiezhu@loongson.cn>,
Tonghao Zhang <xiangxia.m.yue@gmail.com>
Subject: linux-next: manual merge of the bpf-next tree with the net-next tree
Date: Wed, 11 May 2022 11:10:12 +1000 [thread overview]
Message-ID: <20220511111012.22c08135@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 834 bytes --]
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
net/core/sysctl_net_core.c
between commits:
bd8a53675c0d ("net: sysctl: use shared sysctl macro")
4c7f24f857c7 ("net: sysctl: introduce sysctl SYSCTL_THREE")
from the net-next tree and commit:
f922c8972fb5 ("net: sysctl: Use SYSCTL_TWO instead of &two")
from the bpf-next tree.
I fixed it up (bd8a53675c0d and f922c8972fb5 delete the same line) 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:[~2022-05-11 1:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-11 1:10 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-17 23:29 linux-next: manual merge of the bpf-next tree with the net-next tree Stephen Rothwell
2023-12-14 23:56 Stephen Rothwell
2023-11-30 22:47 Stephen Rothwell
2023-04-13 16:12 broonie
2023-04-13 16:31 ` Christian Ehrig
2023-03-19 23:09 Stephen Rothwell
2023-03-20 3:17 ` Bagas Sanjaya
2023-02-19 23:00 Stephen Rothwell
2023-02-20 11:53 ` Alexander Lobakin
2023-02-06 23:19 Stephen Rothwell
2021-01-25 0:12 Stephen Rothwell
2021-01-25 16:09 ` Stanislav Fomichev
2021-01-25 18:03 ` Arjun Roy
2021-02-14 21:12 ` Stephen Rothwell
2021-02-14 21:40 ` Arjun Roy
2021-02-14 23:00 ` Stephen Rothwell
2020-08-03 3:05 Stephen Rothwell
2020-07-21 2:16 Stephen Rothwell
2020-07-21 8:53 ` Lorenzo Bianconi
2020-07-21 2:12 Stephen Rothwell
2019-11-24 23:58 Stephen Rothwell
2019-11-25 1:19 ` Alexei Starovoitov
2019-07-01 4:47 Stephen Rothwell
2018-11-21 23:36 Stephen Rothwell
2018-04-26 0:49 Stephen Rothwell
2018-04-26 7:56 ` Daniel Borkmann
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=20220511111012.22c08135@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=xiangxia.m.yue@gmail.com \
--cc=yangtiezhu@loongson.cn \
/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).