All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the devicetree tree with Linus' tree
Date: Tue, 9 Jul 2019 09:56:30 +1000	[thread overview]
Message-ID: <20190709095630.41ce0fec@canb.auug.org.au> (raw)
In-Reply-To: <20190624155124.7bcae936@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]

Hi all,

On Mon, 24 Jun 2019 15:51:24 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> Today's linux-next merge of the devicetree tree got conflicts in:
> 
>   scripts/dtc/Makefile.dtc
>   scripts/dtc/libfdt/Makefile.libfdt
> 
> between commit:
> 
>   ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")
> 
> from Linus' tree and commit:
> 
>   12869ecd5eef ("scripts/dtc: Update to upstream version v1.5.0-30-g702c1b6c0e73")
> 
> from the devicetree tree.
> 
> I fixed it up (I used the latter's SPDX tags as these come from an
> upstream project) 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.

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2019-07-08 23:56 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-24  5:51 linux-next: manual merge of the devicetree tree with Linus' tree Stephen Rothwell
2019-07-08 23:56 ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-16  3:42 Stephen Rothwell
2022-01-14 23:41 Stephen Rothwell
2020-10-15  3:21 Stephen Rothwell
2019-11-12  2:57 Stephen Rothwell
2019-10-16  1:25 Stephen Rothwell
2019-07-24  3:02 Stephen Rothwell
2019-07-24 19:31 ` Rob Herring
2019-02-14  3:02 Stephen Rothwell
2017-09-06  3:01 Stephen Rothwell
2017-09-06  2:55 Stephen Rothwell
2011-08-05  2:13 Stephen Rothwell
2010-07-16  1:15 Stephen Rothwell
2010-07-16  4:27 ` Grant Likely
2010-06-07  2:53 Stephen Rothwell
2010-06-07 17:03 ` Grant Likely

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=20190709095630.41ce0fec@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=robherring2@gmail.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.