From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jonathan Corbet <corbet@lwn.net>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the spdx tree
Date: Thu, 17 Sep 2020 20:04:43 +0200 [thread overview]
Message-ID: <20200917180443.GA871678@kroah.com> (raw)
In-Reply-To: <20200917121656.4116529b@canb.auug.org.au>
On Thu, Sep 17, 2020 at 12:16:56PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 951f3e9f2086 ("net/qla3xxx: Convert to SPDX license identifiers")
>
> from the spdx tree and commit:
>
> 51652804d018 ("MAINTAINERS: fix location of qlogic/LICENSE.qla3xxx")
>
> from the jc_docs tree.
>
> I fixed it up (I used the former - which removed the line updated by the
> latter) 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.
Merge is fine, thanks!
greg k-h
prev parent reply other threads:[~2020-09-17 18:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 2:16 linux-next: manual merge of the jc_docs tree with the spdx tree Stephen Rothwell
2020-09-17 18:04 ` Greg KH [this message]
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=20200917180443.GA871678@kroah.com \
--to=greg@kroah.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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).