From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>, Jiri Olsa <jolsa@kernel.org>,
Kuniyuki Iwashima <kuniyu@amazon.com>, 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>
Subject: Re: linux-next: manual merge of the bpf-next tree with the bpf tree
Date: Fri, 14 Feb 2025 16:40:46 +1100 [thread overview]
Message-ID: <20250214164046.31cc51af@canb.auug.org.au> (raw)
In-Reply-To: <CAADnVQJhh+An8uorGh-WQfJybqAu84MOREXZtCxep7fZtyMd6A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
Hi Alexei,
On Thu, 13 Feb 2025 21:33:11 -0800 Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote:
>
> what should we do ?
> I feel that moving c83e2d970bae into bpf tree would be the best ?
Just remember to mention the conflict to whomever merges the bpf-next
tree towards Linus' tree. Its a trivial conflict. Or merge the bpf
tree into the bpf-next tree if you feel that you need the bug fixes in
the bpf-next tree as well.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-02-14 5:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-14 5:07 linux-next: manual merge of the bpf-next tree with the bpf tree Stephen Rothwell
2025-02-14 5:33 ` Alexei Starovoitov
2025-02-14 5:40 ` Stephen Rothwell [this message]
2025-02-14 9:12 ` Jiri Olsa
2025-02-14 18:50 ` Alexei Starovoitov
-- strict thread matches above, loose matches on Subject: below --
2026-04-01 12:29 Mark Brown
2026-04-01 15:27 ` Alexei Starovoitov
2026-02-24 12:39 Mark Brown
2026-02-24 16:22 ` Alexei Starovoitov
2025-11-06 0:35 Stephen Rothwell
2025-11-06 17:57 ` Andrii Nakryiko
2024-03-07 1:40 Stephen Rothwell
2023-03-06 22:58 Stephen Rothwell
2023-03-10 0:38 ` Stephen Rothwell
2023-03-10 3:18 ` Bagas Sanjaya
2022-11-21 1:27 Stephen Rothwell
2022-08-26 1:46 Stephen Rothwell
2022-08-25 0:50 Stephen Rothwell
2022-08-22 1:01 Stephen Rothwell
2021-12-05 23:39 Stephen Rothwell
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=20250214164046.31cc51af@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jolsa@kernel.org \
--cc=kuniyu@amazon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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