[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250627175035.3155e118@canb.auug.org.au>
Date: Fri, 27 Jun 2025 17:50:35 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alexei Starovoitov <alexei.starovoitov@...il.com>
Cc: Daniel Borkmann <daniel@...earbox.net>, Alexei Starovoitov
<ast@...nel.org>, Andrii Nakryiko <andrii@...nel.org>, Christian Brauner
<brauner@...nel.org>, bpf <bpf@...r.kernel.org>, Networking
<netdev@...r.kernel.org>, Linux Kernel Mailing List
<linux-kernel@...r.kernel.org>, Linux Next Mailing List
<linux-next@...r.kernel.org>, Song Liu <song@...nel.org>, Viktor Malik
<vmalik@...hat.com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the
vfs-brauner tree
Hi Alexei,
On Thu, 26 Jun 2025 19:17:25 -0700 Alexei Starovoitov <alexei.starovoitov@...il.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
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists