From: Stephen Rothwell <sfr@canb.auug.org.au> To: David Miller <davem@davemloft.net>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de> Cc: Networking <netdev@vger.kernel.org>, ARM <linux-arm-kernel@lists.infradead.org>, Ioana Ciornei <ioana.ciornei@nxp.com>, Jakub Kicinski <kuba@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the net-next tree with the arm-soc tree Date: Wed, 13 Jul 2022 12:55:26 +1000 [thread overview] Message-ID: <20220713125526.7fcf0bbc@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 4845 bytes --] Hi all, Today's linux-next merge of the net-next tree got conflicts in: arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts between commit: 8c1be9336e9a ("arm64: dts: marvell: adjust whitespace around '='") from the arm-soc tree and commit: 4ce223e5ef70 ("arch: arm64: dts: marvell: rename the sfp GPIO properties") from the net-next tree. I fixed it up (see below) 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. -- Cheers, Stephen Rothwell diff --cc arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts index b9ba7c452a77,5f6ed735e31a..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts @@@ -34,20 -34,20 +34,20 @@@ sfp_eth0: sfp-eth0 { compatible = "sff,sfp"; i2c-bus = <&cp0_i2c1>; - los-gpio = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfp_gpio 2 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfp_gpio 2 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>; }; /* SFP 1G */ sfp_eth2: sfp-eth2 { compatible = "sff,sfp"; i2c-bus = <&cp0_i2c0>; - los-gpio = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfp_gpio 6 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfp_gpio 6 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>; }; }; diff --cc arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi index c0389dd17340,33c179838e24..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi @@@ -65,10 -65,10 +65,10 @@@ /* CON15,16 - CPM lane 4 */ compatible = "sff,sfp"; i2c-bus = <&sfpp0_i2c>; - los-gpio = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; + los-gpios = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp1_sfpp0_pins>; maximum-power-milliwatt = <2000>; diff --cc arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts index cf868e0bbb9c,72e9b0f671a9..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts @@@ -67,20 -67,20 +67,20 @@@ sfp_cp0_eth0: sfp-cp0-eth0 { compatible = "sff,sfp"; i2c-bus = <&sfpplus0_i2c>; - los-gpio = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; sfp_cp1_eth0: sfp-cp1-eth0 { compatible = "sff,sfp"; i2c-bus = <&sfpplus1_i2c>; - los-gpio = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: David Miller <davem@davemloft.net>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de> Cc: Networking <netdev@vger.kernel.org>, ARM <linux-arm-kernel@lists.infradead.org>, Ioana Ciornei <ioana.ciornei@nxp.com>, Jakub Kicinski <kuba@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the net-next tree with the arm-soc tree Date: Wed, 13 Jul 2022 12:55:26 +1000 [thread overview] Message-ID: <20220713125526.7fcf0bbc@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 4845 bytes --] Hi all, Today's linux-next merge of the net-next tree got conflicts in: arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts between commit: 8c1be9336e9a ("arm64: dts: marvell: adjust whitespace around '='") from the arm-soc tree and commit: 4ce223e5ef70 ("arch: arm64: dts: marvell: rename the sfp GPIO properties") from the net-next tree. I fixed it up (see below) 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. -- Cheers, Stephen Rothwell diff --cc arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts index b9ba7c452a77,5f6ed735e31a..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts @@@ -34,20 -34,20 +34,20 @@@ sfp_eth0: sfp-eth0 { compatible = "sff,sfp"; i2c-bus = <&cp0_i2c1>; - los-gpio = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfp_gpio 2 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfp_gpio 2 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>; }; /* SFP 1G */ sfp_eth2: sfp-eth2 { compatible = "sff,sfp"; i2c-bus = <&cp0_i2c0>; - los-gpio = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfp_gpio 6 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfp_gpio 6 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>; }; }; diff --cc arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi index c0389dd17340,33c179838e24..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi @@@ -65,10 -65,10 +65,10 @@@ /* CON15,16 - CPM lane 4 */ compatible = "sff,sfp"; i2c-bus = <&sfpp0_i2c>; - los-gpio = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; + los-gpios = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp1_sfpp0_pins>; maximum-power-milliwatt = <2000>; diff --cc arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts index cf868e0bbb9c,72e9b0f671a9..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts @@@ -67,20 -67,20 +67,20 @@@ sfp_cp0_eth0: sfp-cp0-eth0 { compatible = "sff,sfp"; i2c-bus = <&sfpplus0_i2c>; - los-gpio = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; sfp_cp1_eth0: sfp-cp1-eth0 { compatible = "sff,sfp"; i2c-bus = <&sfpplus1_i2c>; - los-gpio = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>; ++ tx-fault-gpios = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2022-07-13 2:55 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-13 2:55 Stephen Rothwell [this message] 2022-07-13 2:55 ` linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 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-09-10 4:48 Stephen Rothwell 2014-09-10 4:48 ` Stephen Rothwell 2014-09-10 4:48 ` Stephen Rothwell 2014-09-10 8:06 ` Arnd Bergmann 2014-09-10 8:06 ` Arnd Bergmann 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=20220713125526.7fcf0bbc@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=arnd@arndb.de \ --cc=davem@davemloft.net \ --cc=ioana.ciornei@nxp.com \ --cc=krzysztof.kozlowski@linaro.org \ --cc=kuba@kernel.org \ --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 \ /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: linkBe 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.