linux-kernel - Re: linux-next: manual merge of the bpf-next tree with the bpf tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250214164046.31cc51af@canb.auug.org.au>
Date: Fri, 14 Feb 2025 16:40:46 +1100
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>, Jiri Olsa
 <jolsa@...nel.org>, Kuniyuki Iwashima <kuniyu@...zon.com>, 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>
Subject: Re: linux-next: manual merge of the bpf-next tree with the bpf tree

Hi Alexei,

On Thu, 13 Feb 2025 21:33:11 -0800 Alexei Starovoitov <alexei.starovoitov@...il.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

Content of type "application/pgp-signature" skipped