Re: linux-next: manual merge of the char-misc tree with the broadcom tree

[Florian Fainelli]

On 6/2/25 22:11, Greg KH wrote:
> On Tue, Jun 03, 2025 at 02:27:30PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the char-misc tree got conflicts in:
> >
> >    drivers/misc/Kconfig
> >    drivers/misc/Makefile
> >
> > between commit:
> >
> >    d04abc60a903 ("misc: rp1: RaspberryPi RP1 misc driver")
> >
> > from the broadcom tree and commit:
> >
> >    e15658676405 ("hwmon/misc: amd-sbi: Move core sbrmi from hwmon to misc")
> >
> > from the char-misc 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 drivers/misc/Kconfig
> > index e12e445a10fa,0de7c35f6fe5..000000000000
> > --- a/drivers/misc/Kconfig
> > +++ b/drivers/misc/Kconfig
> > @@@ -660,5 -647,5 +659,6 @@@ source "drivers/misc/uacce/Kconfig
> >    source "drivers/misc/pvpanic/Kconfig"
> >    source "drivers/misc/mchp_pci1xxxx/Kconfig"
> >    source "drivers/misc/keba/Kconfig"
> >   +source "drivers/misc/rp1/Kconfig"
> > + source "drivers/misc/amd-sbi/Kconfig"
> >    endmenu
> > diff --cc drivers/misc/Makefile
> > index 9ed1c3d8dc06,b628044fb74e..000000000000
> > --- a/drivers/misc/Makefile
> > +++ b/drivers/misc/Makefile
> > @@@ -75,4 -73,4 +74,5 @@@ lan966x-pci-objs		:= lan966x_pci.
> >    lan966x-pci-objs		+= lan966x_pci.dtbo.o
> >    obj-$(CONFIG_MCHP_LAN966X_PCI)	+= lan966x-pci.o
> >    obj-y				+= keba/
> >   +obj-$(CONFIG_MISC_RP1)		+= rp1/
> > + obj-y				+= amd-sbi/
>
> This is fine, but why are new drivers being added to trees during the
> -rc1 merge window period?

I applied Andrea's pull request adding the RP1 drivers to get a head 
start on what merge conflicts we would get and some build coverage by 
the robots.
--
Florian