All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Cooper <jason@lakedaemon.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Grant Likely <grant.likely@secretlab.ca>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Thu, 16 Jan 2014 23:35:53 -0500	[thread overview]
Message-ID: <20140117043553.GL29184@titan.lakedaemon.net> (raw)
In-Reply-To: <20140117140853.6faf2c053617c5e66648526f@canb.auug.org.au>

Stephen,

On Fri, Jan 17, 2014 at 02:08:53PM +1100, Stephen Rothwell wrote:
> Hi Grant,
> 
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 ("dt/bindings:
> Remove all references to device_type "ethernet-phy"") and b31b32119abe
> ("ARM: dove: sort DT nodes by address") from the devicetree tree and
> commit 351291754df3 ("dt/bindings: remove device_type "network"
> references") from the devicetree tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

Jason.

WARNING: multiple messages have this Message-ID (diff)
From: Jason Cooper <jason@lakedaemon.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
	linux-kernel@vger.kernel.org,
	Grant Likely <grant.likely@secretlab.ca>,
	linux-next@vger.kernel.org, Olof Johansson <olof@lixom.net>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Thu, 16 Jan 2014 23:35:53 -0500	[thread overview]
Message-ID: <20140117043553.GL29184@titan.lakedaemon.net> (raw)
In-Reply-To: <20140117140853.6faf2c053617c5e66648526f@canb.auug.org.au>

Stephen,

On Fri, Jan 17, 2014 at 02:08:53PM +1100, Stephen Rothwell wrote:
> Hi Grant,
> 
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 ("dt/bindings:
> Remove all references to device_type "ethernet-phy"") and b31b32119abe
> ("ARM: dove: sort DT nodes by address") from the devicetree tree and
> commit 351291754df3 ("dt/bindings: remove device_type "network"
> references") from the devicetree tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

Jason.

WARNING: multiple messages have this Message-ID (diff)
From: jason@lakedaemon.net (Jason Cooper)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Thu, 16 Jan 2014 23:35:53 -0500	[thread overview]
Message-ID: <20140117043553.GL29184@titan.lakedaemon.net> (raw)
In-Reply-To: <20140117140853.6faf2c053617c5e66648526f@canb.auug.org.au>

Stephen,

On Fri, Jan 17, 2014 at 02:08:53PM +1100, Stephen Rothwell wrote:
> Hi Grant,
> 
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 ("dt/bindings:
> Remove all references to device_type "ethernet-phy"") and b31b32119abe
> ("ARM: dove: sort DT nodes by address") from the devicetree tree and
> commit 351291754df3 ("dt/bindings: remove device_type "network"
> references") from the devicetree tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

Jason.

  reply	other threads:[~2014-01-17  4:36 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-17  3:08 linux-next: manual merge of the devicetree tree with the arm-soc tree Stephen Rothwell
2014-01-17  3:08 ` Stephen Rothwell
2014-01-17  3:08 ` Stephen Rothwell
2014-01-17  4:35 ` Jason Cooper [this message]
2014-01-17  4:35   ` Jason Cooper
2014-01-17  4:35   ` Jason Cooper
2014-01-17  3:11 Stephen Rothwell
2014-01-17  3:11 ` Stephen Rothwell
2014-01-17  3:11 ` Stephen Rothwell
2014-01-17  3:14 Stephen Rothwell
2014-01-17  3:14 ` Stephen Rothwell
2014-01-17  3:14 ` Stephen Rothwell
2014-03-12 22:03 Mark Brown
2014-03-12 22:36 ` Olof Johansson
2014-03-13 12:55   ` Grant Likely
2016-06-27  3:42 Stephen Rothwell
2016-06-27  3:42 ` Stephen Rothwell
2016-06-27  3:42 ` Stephen Rothwell
2017-11-09  2:21 Stephen Rothwell
2017-11-09  2:21 ` Stephen Rothwell
2017-11-09  2:26 Stephen Rothwell
2017-11-09  2:26 ` Stephen Rothwell
2019-11-14  2:21 Stephen Rothwell
2019-11-14  2:21 ` Stephen Rothwell
2019-12-03  0:04 ` Stephen Rothwell
2019-12-03  0:04   ` Stephen Rothwell
2020-05-22  6:03 Stephen Rothwell
2020-05-22  6:03 ` Stephen Rothwell
2020-05-22  8:08 ` Arnd Bergmann
2020-05-22  8:08   ` Arnd Bergmann

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=20140117043553.GL29184@titan.lakedaemon.net \
    --to=jason@lakedaemon.net \
    --cc=arnd@arndb.de \
    --cc=grant.likely@secretlab.ca \
    --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 \
    /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.