From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, bpf <bpf@vger.kernel.org>,
Networking <netdev@vger.kernel.org>,
Haiyue Wang <haiyue.wang@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the net tree
Date: Wed, 27 Mar 2024 18:57:47 -0700 [thread overview]
Message-ID: <CAADnVQJ3S2DpCTe6m2xxjwgmUO5wLknDdV68Y5S7Lit+jZy51Q@mail.gmail.com> (raw)
In-Reply-To: <20240328125500.2582492e@canb.auug.org.au>
On Wed, Mar 27, 2024 at 6:55 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> kernel/bpf/arena.c
>
> between commit:
>
> ee498a38f317 ("bpf: Clarify bpf_arena comments.")
>
> from the net tree and commit:
>
> 45a683b2d815 ("bpf,arena: Use helper sizeof_field in struct accessors")
>
> from the bpf-next tree.
>
> I fixed it up (see below) 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 for headsup.
We'll fix it up when bpf-next gets ffwded in a day or two.
next prev parent reply other threads:[~2024-03-28 1:58 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-28 1:55 linux-next: manual merge of the bpf-next tree with the net tree Stephen Rothwell
2024-03-28 1:57 ` Alexei Starovoitov [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-29 1:49 Stephen Rothwell
2024-04-29 18:56 ` Jakub Kicinski
2024-04-29 21:17 ` Daniel Borkmann
2022-11-15 23:10 Stephen Rothwell
2022-09-01 1:11 Stephen Rothwell
2022-08-25 1:00 Stephen Rothwell
2020-07-22 3:21 Stephen Rothwell
2020-07-22 12:17 ` Jakub Sitnicki
2020-07-22 14:42 ` Kuniyuki Iwashima
2020-07-22 15:02 ` Jakub Sitnicki
2020-07-22 15:05 ` Willem de Bruijn
2020-07-22 15:25 ` Jakub Sitnicki
2020-07-22 15:49 ` Willem de Bruijn
2020-07-22 17:14 ` Alexei Starovoitov
2020-07-23 2:11 ` Stephen Rothwell
2019-12-19 23:23 Stephen Rothwell
2019-10-13 23:32 Stephen Rothwell
2019-10-15 23:30 ` Stephen Rothwell
2019-03-26 22:14 Stephen Rothwell
2019-03-27 1:56 ` Alexei Starovoitov
2019-03-27 9:26 ` Luca Boccassi
2019-03-27 15:15 ` Alexei Starovoitov
2019-03-28 1:53 ` Alexei Starovoitov
2019-03-28 11:37 ` Luca Boccassi
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=CAADnVQJ3S2DpCTe6m2xxjwgmUO5wLknDdV68Y5S7Lit+jZy51Q@mail.gmail.com \
--to=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=haiyue.wang@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sfr@canb.auug.org.au \
/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).