* linux-next: manual merge of the broadcom tree with the spdx tree
@ 2022-07-10 23:55 Stephen Rothwell
2022-07-11 6:19 ` Greg KH
2022-07-13 23:13 ` Stephen Rothwell
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2022-07-10 23:55 UTC (permalink / raw)
To: Florian Fainelli, Greg KH
Cc: Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Gleixner, William Zhang
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
Hi all,
Today's linux-next merge of the broadcom tree got a conflict in:
arch/arm/mach-bcm/bcm63xx.c
between commit:
52e6676ef56f ("treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_30.RULE (part 1)")
from the spdx tree and commit:
889390f83d4e ("arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA")
from the broadcom tree.
I fixed it up (I just removed the file) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the broadcom tree with the spdx tree
2022-07-10 23:55 linux-next: manual merge of the broadcom tree with the spdx tree Stephen Rothwell
@ 2022-07-11 6:19 ` Greg KH
2022-07-11 17:31 ` William Zhang
2022-07-13 23:13 ` Stephen Rothwell
1 sibling, 1 reply; 6+ messages in thread
From: Greg KH @ 2022-07-11 6:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Florian Fainelli, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Gleixner, William Zhang
On Mon, Jul 11, 2022 at 09:55:20AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the broadcom tree got a conflict in:
>
> arch/arm/mach-bcm/bcm63xx.c
>
> between commit:
>
> 52e6676ef56f ("treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_30.RULE (part 1)")
>
> from the spdx tree and commit:
>
> 889390f83d4e ("arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA")
>
> from the broadcom tree.
>
> I fixed it up (I just removed the file) 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.
Removing is fine, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the broadcom tree with the spdx tree
2022-07-11 6:19 ` Greg KH
@ 2022-07-11 17:31 ` William Zhang
0 siblings, 0 replies; 6+ messages in thread
From: William Zhang @ 2022-07-11 17:31 UTC (permalink / raw)
To: Greg KH, Stephen Rothwell
Cc: Florian Fainelli, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Gleixner
[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]
On 7/10/22 23:19, Greg KH wrote:
> On Mon, Jul 11, 2022 at 09:55:20AM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the broadcom tree got a conflict in:
>>
>> arch/arm/mach-bcm/bcm63xx.c
>>
>> between commit:
>>
>> 52e6676ef56f ("treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_30.RULE (part 1)")
>>
>> from the spdx tree and commit:
>>
>> 889390f83d4e ("arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA")
>>
>> from the broadcom tree.
>>
>> I fixed it up (I just removed the file) 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.
>
> Removing is fine, thanks.
>
> greg k-h
Thanks Greg and Stephen! This file is no longer needed so simply
removing it fine. Will work closely with Florian to minimize any
potentially conflict in future BCMBCA related changes.
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the broadcom tree with the spdx tree
2022-07-10 23:55 linux-next: manual merge of the broadcom tree with the spdx tree Stephen Rothwell
2022-07-11 6:19 ` Greg KH
@ 2022-07-13 23:13 ` Stephen Rothwell
2022-07-13 23:26 ` Florian Fainelli
1 sibling, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2022-07-13 23:13 UTC (permalink / raw)
To: Greg KH, Olof Johansson, Arnd Bergmann
Cc: Florian Fainelli, Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Gleixner, William Zhang, ARM
[-- Attachment #1: Type: text/plain, Size: 995 bytes --]
Hi all,
On Mon, 11 Jul 2022 09:55:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the broadcom tree got a conflict in:
>
> arch/arm/mach-bcm/bcm63xx.c
>
> between commit:
>
> 52e6676ef56f ("treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_30.RULE (part 1)")
>
> from the spdx tree and commit:
>
> 889390f83d4e ("arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA")
>
> from the broadcom tree.
>
> I fixed it up (I just removed the file) 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.
This is now a conflict between the arm-soc tree and the spdx tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the broadcom tree with the spdx tree
2022-07-13 23:13 ` Stephen Rothwell
@ 2022-07-13 23:26 ` Florian Fainelli
2022-07-14 4:10 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2022-07-13 23:26 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH, Olof Johansson, Arnd Bergmann
Cc: Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Gleixner, William Zhang, ARM
On 7/13/22 16:13, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 11 Jul 2022 09:55:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the broadcom tree got a conflict in:
>>
>> arch/arm/mach-bcm/bcm63xx.c
>>
>> between commit:
>>
>> 52e6676ef56f ("treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_30.RULE (part 1)")
>>
>> from the spdx tree and commit:
>>
>> 889390f83d4e ("arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA")
>>
>> from the broadcom tree.
>>
>> I fixed it up (I just removed the file) 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.
>
> This is now a conflict between the arm-soc tree and the spdx tree.
There was a link in the cover letter that I sent to the arm-soc
maintainers referencing your first email. Not sure what else we could
have done to prevent that conflict.
--
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the broadcom tree with the spdx tree
2022-07-13 23:26 ` Florian Fainelli
@ 2022-07-14 4:10 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2022-07-14 4:10 UTC (permalink / raw)
To: Florian Fainelli
Cc: Greg KH, Olof Johansson, Arnd Bergmann, Greg Kroah-Hartman,
Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Gleixner, William Zhang, ARM
[-- Attachment #1: Type: text/plain, Size: 436 bytes --]
Hi Florian,
On Wed, 13 Jul 2022 16:26:33 -0700 Florian Fainelli <f.fainelli@gmail.com> wrote:
>
> There was a link in the cover letter that I sent to the arm-soc
> maintainers referencing your first email. Not sure what else we could
> have done to prevent that conflict.
Nothing really. Hopefully between the 2 notifications, the arm-soc and
spdx guys will remember to let Linus know ...
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-07-14 4:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-10 23:55 linux-next: manual merge of the broadcom tree with the spdx tree Stephen Rothwell
2022-07-11 6:19 ` Greg KH
2022-07-11 17:31 ` William Zhang
2022-07-13 23:13 ` Stephen Rothwell
2022-07-13 23:26 ` Florian Fainelli
2022-07-14 4:10 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).