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

Message-ID: <aNJXnM0dyGQ5CaNp@finisterre.sirena.org.uk>
Date: Tue, 23 Sep 2025 10:17:32 +0200
From: Mark Brown <broonie@...nel.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Jakub Acs <acsjakub@...zon.de>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the mm-unstable tree with the
 e94608c9744b01b6136ce6b701f34b4078a5a5fa tree

Hi all,

Today's linux-next merge of the mm-unstable tree got a conflict in:

  fs/proc/task_mmu.c

between commit:

  e94608c9744b0 ("fs/proc/task_mmu: check cur_buf for NULL")

from the e94608c9744b01b6136ce6b701f34b4078a5a5fa tree and commit:

  ecd5d2763540d ("fs/proc/task_mmu: check p->vec_buf for NULL")

from the mm-unstable tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc fs/proc/task_mmu.c
index 5b5b3ee328c5a,fc35a0543f019..0000000000000
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)