| Message ID | 20220713125526.7fcf0bbc@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the arm-soc tree | expand |
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 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 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
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.