linux-kernel - linux-next: manual merge of the sysctl tree with the ext3 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20250313164906.6d6ff001@canb.auug.org.au>
Date: Thu, 13 Mar 2025 16:49:06 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Luis Chamberlain <mcgrof@...nel.org>, Kees Cook <kees@...nel.org>, Joel
 Granados <joel.granados@...nel.org>, Jan Kara <jack@...e.cz>
Cc: Amir Goldstein <amir73il@...il.com>, Kaixiong Yu
 <yukaixiong@...wei.com>, 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 sysctl tree with the ext3 tree

Hi all,

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

  mm/filemap.c

between commit:

  e6529028f9ac ("Revert "fsnotify: generate pre-content permission event on page fault"")

from the ext3 tree and commit:

  73aa354af21d ("mm: filemap: move sysctl to mm/filemap.c")

from the sysctl 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.

-- 
Cheers,
Stephen Rothwell

diff --cc mm/filemap.c
index 1911d43b319e,004d78767804..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -47,6 -47,8 +47,7 @@@
  #include <linux/splice.h>
  #include <linux/rcupdate_wait.h>
  #include <linux/sched/mm.h>
+ #include <linux/sysctl.h>
 -#include <linux/fsnotify.h>
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
  #include "internal.h"

Content of type "application/pgp-signature" skipped