All of lore.kernel.org
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Arnd Bergmann <arnd@arndb.de>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	Steffen Trumtrar <s.trumtrar@pengutronix.de>,
	Shawn Guo <shawn.guo@linaro.org>
Subject: Re: linux-next: manual merge of the staging tree with the arm-soc tree
Date: Tue, 25 Feb 2014 08:51:37 -0800	[thread overview]
Message-ID: <CAOesGMiTZN3z441d3bOaCcF8Zsss4WZv6YkH9CJpZtTBGxadWw@mail.gmail.com> (raw)
In-Reply-To: <20140225164921.GA4458@kroah.com>

On Tue, Feb 25, 2014 at 8:49 AM, Greg KH <greg@kroah.com> wrote:
> On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the staging tree got a conflict in
>> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
>> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
>> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
>> from the staging tree.
>>
>> I fixed it up (see at bottom) and can carry the fix as necessary (no
>> action is required).  I also added the following fix up patch:
>
> I think it's right, but I really have no idea about any of these.  I'll
> defer to Russell to ensure they are correct.

We normally merge all dts changes through arm-soc to avoid these kind
of conflicts. Since your tree is a stable one there isn't much to do
about it, but I'd appreciate it if we just got those parts of the
patch series in the future to avoid these situations. We've been bit
by it before.


-Olof

WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the staging tree with the arm-soc tree
Date: Tue, 25 Feb 2014 08:51:37 -0800	[thread overview]
Message-ID: <CAOesGMiTZN3z441d3bOaCcF8Zsss4WZv6YkH9CJpZtTBGxadWw@mail.gmail.com> (raw)
In-Reply-To: <20140225164921.GA4458@kroah.com>

On Tue, Feb 25, 2014 at 8:49 AM, Greg KH <greg@kroah.com> wrote:
> On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the staging tree got a conflict in
>> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
>> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
>> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
>> from the staging tree.
>>
>> I fixed it up (see at bottom) and can carry the fix as necessary (no
>> action is required).  I also added the following fix up patch:
>
> I think it's right, but I really have no idea about any of these.  I'll
> defer to Russell to ensure they are correct.

We normally merge all dts changes through arm-soc to avoid these kind
of conflicts. Since your tree is a stable one there isn't much to do
about it, but I'd appreciate it if we just got those parts of the
patch series in the future to avoid these situations. We've been bit
by it before.


-Olof

  reply	other threads:[~2014-02-25 16:57 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-25  6:09 linux-next: manual merge of the staging tree with the arm-soc tree Stephen Rothwell
2014-02-25  6:09 ` Stephen Rothwell
2014-02-25  6:09 ` Stephen Rothwell
2014-02-25 16:49 ` Greg KH
2014-02-25 16:49   ` Greg KH
2014-02-25 16:51   ` Olof Johansson [this message]
2014-02-25 16:51     ` Olof Johansson
2014-02-25 16:51     ` Olof Johansson
2014-02-25 16:56     ` Greg KH
2014-02-25 16:56       ` Greg KH
2014-02-25 16:56       ` Greg KH
2014-04-02  1:55 ` Stephen Rothwell
2014-04-02  1:55   ` Stephen Rothwell
2014-04-02  1:55   ` Stephen Rothwell
2014-02-25  6:09 Stephen Rothwell
2014-02-25  6:09 ` Stephen Rothwell
2014-02-25  6:09 ` Stephen Rothwell
2014-03-18  6:10 Stephen Rothwell
2014-03-18  6:10 ` Stephen Rothwell
2014-03-18  6: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=CAOesGMiTZN3z441d3bOaCcF8Zsss4WZv6YkH9CJpZtTBGxadWw@mail.gmail.com \
    --to=olof@lixom.net \
    --cc=arnd@arndb.de \
    --cc=greg@kroah.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=s.trumtrar@pengutronix.de \
    --cc=sfr@canb.auug.org.au \
    --cc=shawn.guo@linaro.org \
    /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.