linux-next: manual merge of the device-mapper tree with the mm-hotfixes tree

* linux-next: manual merge of the device-mapper tree with the mm-hotfixes tree
@ 2023-06-14  1:55 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2023-06-14  1:55 UTC (permalink / raw)
  To: Alasdair G Kergon, Mike Snitzer, Andrew Morton
  Cc: Li Lingfeng, Linux Kernel Mailing List, Linux Next Mailing List,
	Qi Zheng

[-- Attachment #1: Type: text/plain, Size: 837 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread