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>,
Christian Brauner <brauner@kernel.org>, 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>,
Song Liu <song@kernel.org>, Viktor Malik <vmalik@redhat.com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the vfs-brauner tree
Date: Fri, 27 Jun 2025 17:50:35 +1000 [thread overview]
Message-ID: <20250627175035.3155e118@canb.auug.org.au> (raw)
In-Reply-To: <CAADnVQLo4-jSRh5J=tNeEnN_3Rsxy0zOGccYdfqe934+jteVjA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
Hi Alexei,
On Thu, 26 Jun 2025 19:17:25 -0700 Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote:
>
> Our emails raced in www :)
> A minute ago merged vfs's branch into bpf-next/master,
> resolved this conflict and pushed to /master and /for-next.
Thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-06-27 7:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-27 2:12 linux-next: manual merge of the bpf-next tree with the vfs-brauner tree Stephen Rothwell
2025-06-27 2:17 ` Alexei Starovoitov
2025-06-27 7:50 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-14 0:56 Stephen Rothwell
2024-08-14 1:48 ` Al Viro
2024-09-15 23:42 ` 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=20250627175035.3155e118@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=brauner@kernel.org \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=song@kernel.org \
--cc=vmalik@redhat.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