linux-kernel - linux-next: manual merge of the device-mapper tree with the mm-hotfixes 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: <20230614115540.569a9b9d@canb.auug.org.au>
Date:   Wed, 14 Jun 2023 11:55:40 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alasdair G Kergon <agk@...hat.com>,
        Mike Snitzer <snitzer@...nel.org>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     Li Lingfeng <lilingfeng3@...wei.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Qi Zheng <zhengqi.arch@...edance.com>
Subject: linux-next: manual merge of the device-mapper tree with the
 mm-hotfixes tree

Hi all,

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

  drivers/md/dm-thin-metadata.c

between commit:

  49444301e665 ("Revert "mm: shrinkers: convert shrinker_rwsem to mutex"")

from the mm-hotfixes tree and commit:

  71720b0916ca ("dm thin metadata: Fix ABBA deadlock by resetting dm_bufio_client")

from the device-mapper tree.

I fixed it up (the latter removed the comment that was modified by 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