On 11/10/24 8:10 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the block tree got a conflict in: > > drivers/nvme/host/core.c > > between commit: > > 6d1c69945ce6 ("nvme/host: Fix RCU list traversal to use SRCU primitive") > > from Linus' tree and commit: > > 6b6f6c41c8ac ("nvme: core: switch to non_owner variant of start_freeze/unfreeze queue") > > from the block 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. Thanks I sorted it out in my for-next branch merge now. -- Jens Axboe