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

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

Hi all,

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).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/rk3188-radxarock.dts
index 2c2313ff67c6,d63d685ea6cc..000000000000
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@@ -209,12 -217,12 +225,18 @@@
  		};
  	};
  
 +	hym8563 {
 +		rtc_int: rtc-int {
 +			rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_up>;
 +		};
 +	};
 +
+ 	lan8720a  {
+ 		phy_int: phy-int {
+ 			rockchip,pins = <RK_GPIO3 26 RK_FUNC_GPIO &pcfg_pull_up>;
+ 		};
+ 	};
+ 
  	ir-receiver {
  		ir_recv_pin: ir-recv-pin {
  			rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, Olof Johansson <olof@lixom.net>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Romain Perier" <romain.perier@gmail.com>,
	"Heiko Stübner" <heiko@sntech.de>
Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Wed, 10 Sep 2014 14:48:37 +1000	[thread overview]
Message-ID: <20140910144837.5e3089e1@canb.auug.org.au> (raw)

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

Hi all,

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).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/rk3188-radxarock.dts
index 2c2313ff67c6,d63d685ea6cc..000000000000
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@@ -209,12 -217,12 +225,18 @@@
  		};
  	};
  
 +	hym8563 {
 +		rtc_int: rtc-int {
 +			rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_up>;
 +		};
 +	};
 +
+ 	lan8720a  {
+ 		phy_int: phy-int {
+ 			rockchip,pins = <RK_GPIO3 26 RK_FUNC_GPIO &pcfg_pull_up>;
+ 		};
+ 	};
+ 
  	ir-receiver {
  		ir_recv_pin: ir-recv-pin {
  			rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Wed, 10 Sep 2014 14:48:37 +1000	[thread overview]
Message-ID: <20140910144837.5e3089e1@canb.auug.org.au> (raw)

Hi all,

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).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/boot/dts/rk3188-radxarock.dts
index 2c2313ff67c6,d63d685ea6cc..000000000000
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@@ -209,12 -217,12 +225,18 @@@
  		};
  	};
  
 +	hym8563 {
 +		rtc_int: rtc-int {
 +			rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_up>;
 +		};
 +	};
 +
+ 	lan8720a  {
+ 		phy_int: phy-int {
+ 			rockchip,pins = <RK_GPIO3 26 RK_FUNC_GPIO &pcfg_pull_up>;
+ 		};
+ 	};
+ 
  	ir-receiver {
  		ir_recv_pin: ir-recv-pin {
  			rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140910/3cb62171/attachment.sig>

             reply	other threads:[~2014-09-10  4:48 UTC|newest]

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