| Message ID | 20230110095041.0d6311d2@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the omap tree with the arm-soc tree | expand |
* Stephen Rothwell <sfr@canb.auug.org.au> [230109 22:57]: > Hi all, > > Today's linux-next merge of the omap tree got a conflict in: > > arch/arm/mach-omap1/Kconfig > > between commit: > > 67d3928c3df5 ("ARM: omap1: remove unused board files") > > from the arm-soc tree and commit: > > 609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation") > > from the omap tree. > > I fixed it up (see below) and can carry the fix as necessary. Thanks, I just dropped "ARM: omap1: remove unused board files" to simplify things. Juerg, care to update and resend in a few weeks after v6.3-rc1 after the omap1 clean-up patches are merged? Regards, Tony
diff --cc arch/arm/mach-omap1/Kconfig index 8df9a4de0e79,f833526aa7cd..000000000000 --- a/arch/arm/mach-omap1/Kconfig
Hi all, Today's linux-next merge of the omap tree got a conflict in: arch/arm/mach-omap1/Kconfig between commit: 67d3928c3df5 ("ARM: omap1: remove unused board files") from the arm-soc tree and commit: 609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation") from the omap 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.