On Wed, Jul 10, 2024 at 02:10:10PM +1000, Stephen Rothwell wrote:
> 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
The fix looks good to me. Thank you!
Attachment:
signature.asc
Description: PGP signature
