linux-kernel - linux-next: manual merge of the vfs-brauner tree with the erofs-fixes 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-next>] [day] [month] [year] [list]

Message-ID: <20240424102445.53ba5ba2@canb.auug.org.au>
Date: Wed, 24 Apr 2024 10:24:45 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christian Brauner <brauner@...nel.org>, Gao Xiang <xiang@...nel.org>
Cc: Baokun Li <libaokun1@...wei.com>, Gao Xiang
 <hsiangkao@...ux.alibaba.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 vfs-brauner tree with the
 erofs-fixes tree

Hi all,

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

  fs/erofs/super.c

between commits:

  ab1bbc1735ff ("erofs: get rid of erofs_fs_context")
  569a48fed355 ("erofs: reliably distinguish block based and fscache mode")

from the erofs-fixes tree and commit:

  e4f586a41748 ("erofs: reliably distinguish block based and fscache mode")

from the vfs-brauner tree.

I fixed it up (I think - I used the former version) 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

Content of type "application/pgp-signature" skipped