linux-next: manual merge of the net-next tree with the rockchip tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts

between commit:

  f48387c005fa ("arm64: dts: rockchip: Enable HDMI audio on BPI R2 Pro")

from the rockchip tree and commit:

  c1804463e5c6 ("arm64: dts: rockchip: Add mt7531 dsa node to BPI-R2-Pro board")

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/rockchip/rk3568-bpi-r2-pro.dts
index 1d3ffbf3cde8,7df8cfb1d3b9..000000000000
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@@ -453,11 -394,54 +453,59 @@@
  	status = "disabled";
  };
  
 +&i2s0_8ch {
 +	/* hdmi sound */
 +	status = "okay";
 +};
 +
+ &mdio0 {
+ 	#address-cells = <1>;
+ 	#size-cells = <0>;
+ 
+ 	switch@0 {
+ 		compatible = "mediatek,mt7531";
+ 		reg = <0>;
+ 
+ 		ports {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 
+ 			port@1 {
+ 				reg = <1>;
+ 				label = "lan0";
+ 			};
+ 
+ 			port@2 {
+ 				reg = <2>;
+ 				label = "lan1";
+ 			};
+ 
+ 			port@3 {
+ 				reg = <3>;
+ 				label = "lan2";
+ 			};
+ 
+ 			port@4 {
+ 				reg = <4>;
+ 				label = "lan3";
+ 			};
+ 
+ 			port@5 {
+ 				reg = <5>;
+ 				label = "cpu";
+ 				ethernet = <&gmac0>;
+ 				phy-mode = "rgmii";
+ 
+ 				fixed-link {
+ 					speed = <1000>;
+ 					full-duplex;
+ 					pause;
+ 				};
+ 			};
+ 		};
+ 	};
+ };
+ 
  &mdio1 {
  	rgmii_phy1: ethernet-phy@0 {
  		compatible = "ethernet-phy-ieee802.3-c22";

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]