From: Florian Fainelli <f.fainelli@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
William Zhang <william.zhang@broadcom.com>,
ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the broadcom tree with the spdx tree
Date: Wed, 13 Jul 2022 16:26:33 -0700 [thread overview]
Message-ID: <8a37363d-f4d9-669c-9cc6-3e76b9417352@gmail.com> (raw)
In-Reply-To: <20220714091321.4ecfe830@canb.auug.org.au>
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
next prev parent reply other threads:[~2022-07-13 23:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2022-07-14 4:10 ` Stephen Rothwell
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=8a37363d-f4d9-669c-9cc6-3e76b9417352@gmail.com \
--to=f.fainelli@gmail.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=william.zhang@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).