linux-kernel - Re: linux-next: manual merge of the bpf-next tree with the mm 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] [day] [month] [year] [list]

Message-Id: <20250331072517.53ff2504faa074ac0a417ae3@linux-foundation.org>
Date: Mon, 31 Mar 2025 07:25:17 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Luiz Capitulino <luizcap@...hat.com>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Daniel Borkmann
 <daniel@...earbox.net>, Alexei Starovoitov <ast@...nel.org>, Andrii
 Nakryiko <andrii@...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>
Subject: Re: linux-next: manual merge of the bpf-next tree with the mm tree

On Mon, 31 Mar 2025 10:19:34 -0400 Luiz Capitulino <luizcap@...hat.com> wrote:

> >>   -	page_ext_put(page_ext);
> >>    
> >>    	if (alloc_handle != early_handle)
> >>    		/*
> > 
> > This is now a conflict between the mm-stable tree and Linus' tree.
> 
> What's the best way to resolve this? Should I post again or can we just use your fix?

It's in Linus's hands now...