On Wed, Aug 17, 2022 at 11:08:45AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> drivers/mfd/intel_soc_pmic_core.c
>
> between commit:
>
> ed5c2f5fd10d ("i2c: Make remove callback return void")
>
> from the i2c tree and commit:
>
> 8a8cf3dc6419 ("mfd: intel_soc_pmic_crc: Merge Intel PMIC core to crc")
>
> from the mfd tree.
>
> I fixed it up (I removed the file and added the following merge fix 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.
The fixup looks right.
@Lee: There is an immutable tag that can be merged into your tree to
resolve the conflict before you send your changes to Linux at
https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable
@Stephen: Thanks for your fixes, here and in the input tree.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Attachment:
signature.asc
Description: PGP signature
