linux-next: manual merge of the net-next tree with the arm-soc tree

Arnd Bergmann
2016-06-21T08:56:21Z

On Tuesday, June 21, 2016 11:18:39 AM CEST Stephen Rothwell wrote:
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/arm64/boot/dts/broadcom/ns2-svk.dts
> arch/arm64/boot/dts/broadcom/ns2.dtsi
>
> between commits:
>
> 97b1504a30b3 ("arm64: dts: enable pinctrl for Broadcom NS2 SoC")
> 5dcc9c7618df ("arm64: dts: NS2: Add CCI-400 PMU support")
>
> from the arm-soc tree and commit:
>
> 5f1a067bfa0a ("dt: mdio-mux: Add mdio multiplexer driver node")
>
> 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.

Looks good to me, thanks!

I don't see a good way to resolve the conflict before the merge window,
but it's simple enough that we can just send it this way and let
Linus handle it.

Arnd