linux-kernel - linux-next: manual merge of the scsi-mkp tree with the vfs-brauner 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: <20240227153716.43e5cbad@canb.auug.org.au>
Date: Tue, 27 Feb 2024 15:37:16 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@...cle.com>, Christian Brauner
 <brauner@...nel.org>
Cc: Bart Van Assche <bvanassche@....org>, Chuck Lever
 <chuck.lever@...cle.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 scsi-mkp tree with the vfs-brauner
 tree

Hi all,

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

  include/linux/fs.h

between commit:

  0e4a862174f2 ("libfs: Convert simple directory offsets to use a Maple Tree")

from the vfs-brauner tree and commit:

  fe3944fb245a ("fs: Move enum rw_hint into a new header file")

from the scsi-mkp 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 include/linux/fs.h
index f69c082e0f16,bdabda5dc364..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -43,7 -43,7 +43,8 @@@
  #include <linux/cred.h>
  #include <linux/mnt_idmapping.h>
  #include <linux/slab.h>
 +#include <linux/maple_tree.h>
+ #include <linux/rw_hint.h>

  #include <asm/byteorder.h>
  #include <uapi/linux/fs.h>

Content of type "application/pgp-signature" skipped