linux-kernel - linux-next: manual merge of the mtd 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20231030103415.401ce804@canb.auug.org.au>
Date:   Mon, 30 Oct 2023 10:34:15 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Richard Weinberger <richard.weinberger@...il.com>,
        Christian Brauner <brauner@...nel.org>
Cc:     Jan Kara <jack@...e.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Miquel Raynal <miquel.raynal@...tlin.com>,
        Richard Weinberger <richard@....at>
Subject: linux-next: manual merge of the mtd tree with the vfs-brauner tree

Hi all,

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

  drivers/mtd/devices/block2mtd.c

between commit:

  1bcded92d938 ("mtd: block2mtd: Convert to bdev_open_by_dev/path()")

from the vfs-brauner tree and commit:

  ff6abbe85634 ("mtd: block2mtd: Add a valid holder to blkdev_put()")

from the mtd tree.

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