| Message ID | 20230117122552.64f70650@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the iio tree with the arm-soc tree | expand |
Hi all, On Tue, 17 Jan 2023 12:25:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the iio tree got a conflict in: > > MAINTAINERS > > between commit: > > 59ce53421673 ("MAINTAINERS: update file entries after arm multi-platform rework and mach-pxa removal") > > from the arm-soc tree and commit: > > 08025a3bd9e0 ("dt-bindings: iio: adc: ep93xx: Add cirrus,ep9301-adc description") > > from the iio 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc MAINTAINERS > index 390d79c20a59,9ff472ca1244..000000000000 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@@ -2071,8 -2091,10 +2071,10 @@@ M: Hartley Sweeten <hsweeten@visionengr > M: Alexander Sverdlin <alexander.sverdlin@gmail.com> > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Maintained > + F: Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml > +F: arch/arm/boot/compressed/misc-ep93xx.h > F: arch/arm/mach-ep93xx/ > -F: arch/arm/mach-ep93xx/include/mach/ > + F: drivers/iio/adc/ep93xx_adc.c > > ARM/CLKDEV SUPPORT > M: Russell King <linux@armlinux.org.uk> This is now a conflict between the char-misc tree and the arm-soc tree.
diff --cc MAINTAINERS index 390d79c20a59,9ff472ca1244..000000000000 --- a/MAINTAINERS
Hi all, Today's linux-next merge of the iio tree got a conflict in: MAINTAINERS between commit: 59ce53421673 ("MAINTAINERS: update file entries after arm multi-platform rework and mach-pxa removal") from the arm-soc tree and commit: 08025a3bd9e0 ("dt-bindings: iio: adc: ep93xx: Add cirrus,ep9301-adc description") from the iio 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.