From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
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>
Subject: Re: linux-next: manual merge of the broadcom tree with the spdx tree
Date: Mon, 11 Jul 2022 08:19:41 +0200 [thread overview]
Message-ID: <YsvA/c/Ji9f/O/tw@kroah.com> (raw)
In-Reply-To: <20220711095520.4fad4c97@canb.auug.org.au>
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
next prev parent reply other threads:[~2022-07-11 6:19 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 [this message]
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
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=YsvA/c/Ji9f/O/tw@kroah.com \
--to=greg@kroah.com \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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