diff mbox series

linux-next: manual merge of the mmc tree with the block tree

Message ID 20240220120117.15188a66@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the mmc tree with the block tree |

Commit Message

Stephen Rothwell Feb. 20, 2024, 1:01 a.m. UTC 
  Hi all,

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

  drivers/mmc/core/queue.c

between commit:

  616f87661792 ("mmc: pass queue_limits to blk_mq_alloc_disk")

from the block tree and commit:

  069279d6fef5 ("mmc: core Drop BLK_BOUNCE_HIGH")

from the mmc tree.

I fixed it up (I think - 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.

Comments

Christoph Hellwig Feb. 20, 2024, 8:04 a.m. UTC | #1 
Thanks, the merge looks good to me.
diff mbox series

Patch

diff --cc drivers/mmc/core/queue.c
index 2ae60d208cdf,316415588a77..000000000000
--- a/drivers/mmc/core/queue.c