linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
	"David Miller" <davem@davemloft.net>,
	netdev@vger.kernel.org, "Olof Johansson" <olof@lixom.net>,
	linux-next@vger.kernel.org,
	"Romain Perier" <romain.perier@gmail.com>,
	linux-kernel@vger.kernel.org, "Heiko Stübner" <heiko@sntech.de>
Subject: Re: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Wed, 10 Sep 2014 10:06:19 +0200	[thread overview]
Message-ID: <4343050.11meBDLdD4@wuerfel> (raw)
In-Reply-To: <20140910144837.5e3089e1@canb.auug.org.au>

On Wednesday 10 September 2014 14:48:37 Stephen Rothwell wrote:
> Today's linux-next merge of the net-next tree got a conflict in
> arch/arm/boot/dts/rk3188-radxarock.dts between commit 4721ab855d1a
> ("ARM: dts: rockchip: add hym8563 rtc to Radxa Rock board") from the
> arm-soc tree and commit c6ec956b73db ("ARM: dts: Enable emac node on
> the rk3188-radxarock boards") from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Thanks, looks good.

	Arnd

  reply	other threads:[~2014-09-10  8:06 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-10  4:48 linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell
2014-09-10  8:06 ` Arnd Bergmann [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-07-13  2:55 Stephen Rothwell
2021-02-16  2:04 Stephen Rothwell
2021-02-16  2:20 ` nobuhiro1.iwamatsu
2021-02-16 10:11   ` Arnd Bergmann
2021-02-16 11:53 ` Yoshihiro Shimoda
2021-02-16 12:28   ` Naresh Kamboju
2021-02-16 13:47     ` nobuhiro1.iwamatsu
2021-02-16 14:21       ` nobuhiro1.iwamatsu
2021-02-16 21:17   ` Stephen Rothwell
2021-02-17  0:23     ` Yoshihiro Shimoda
2019-09-05  3:42 Stephen Rothwell
2016-12-01  1:31 Stephen Rothwell
2016-07-27  2:53 Stephen Rothwell
2016-07-27 20:41 ` Duc Dang
2016-06-21  1:18 Stephen Rothwell
2016-06-21  8:56 ` Arnd Bergmann
2016-05-10  0:18 Stephen Rothwell
2015-01-27  2:04 Stephen Rothwell
2014-09-25  2:58 Stephen Rothwell
2014-03-31  2:24 Stephen Rothwell
2012-01-04  4:06 Stephen Rothwell
2012-01-04  4:46 ` Richard Zhao

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=4343050.11meBDLdD4@wuerfel \
    --to=arnd@arndb.de \
    --cc=davem@davemloft.net \
    --cc=heiko@sntech.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=romain.perier@gmail.com \
    --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 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).