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

[Stephen Rothwell]

Hi all,

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

  include/linux/mfd/tmio.h

between commits:

  89f415b99050 ("mfd: tmio: Remove obsolete .set_clk_div() callback")
  f86937afb446 ("mmc: tmio: Remove obsolete .set_pwr() callback()")

from the mmc tree and commit:

  70b46487b155 ("mfd: tmio: Move header to platform_data")

from the mfd tree.

I fixed it up (I removed the file and applied the following patch) 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.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 10 Jul 2024 14:06:29 +1000
Subject: [PATCH] fixup for "mfd: tmio: Move header to platform_data"

interacting with "mfd: tmio: Remove obsolete .set_clk_div() callback"
and "mmc: tmio: Remove obsolete .set_pwr() callback()" from the mmc tree

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/linux/platform_data/tmio.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/linux/platform_data/tmio.h b/include/linux/platform_data/tmio.h
index 1cf418643da9..b060124ba1ae 100644
--- a/include/linux/platform_data/tmio.h
+++ b/include/linux/platform_data/tmio.h
@@ -58,7 +58,5 @@ struct tmio_mmc_data {
 	dma_addr_t			dma_rx_offset;
 	unsigned int			max_blk_count;
 	unsigned short			max_segs;
-	void (*set_pwr)(struct platform_device *host, int state);
-	void (*set_clk_div)(struct platform_device *host, int state);
 };
 #endif
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgpnkBCOkFrnM.pgp
Description: OpenPGP digital signature