From: Florian Fainelli <f.fainelli@gmail•com>
To: Greg KH <greg@kroah•com>, Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnd Bergmann <arnd@arndb•de>,
Akshay Gupta <akshay.gupta@amd•com>,
Andrea della Porta <andrea.porta@suse•com>,
Florian Fainelli <florian.fainelli@broadcom•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the broadcom tree
Date: Tue, 3 Jun 2025 08:59:38 -0700 [thread overview]
Message-ID: <4ec0dba9-8fdd-42a7-946e-0ae06905bb68@gmail.com> (raw)
In-Reply-To: <2025060350-porous-clutter-88fc@gregkh>
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
next prev parent reply other threads:[~2025-06-03 15:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-03 4:27 linux-next: manual merge of the char-misc tree with the broadcom tree Stephen Rothwell
2025-06-03 5:11 ` Greg KH
2025-06-03 15:59 ` Florian Fainelli [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-25 0:25 Stephen Rothwell
2022-11-25 17:31 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ec0dba9-8fdd-42a7-946e-0ae06905bb68@gmail.com \
--to=f.fainelli@gmail$(echo .)com \
--cc=akshay.gupta@amd$(echo .)com \
--cc=andrea.porta@suse$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=florian.fainelli@broadcom$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox