]> git.baikalelectronics.ru Git - kernel.git/commit
arm: sunxi: Revert changes merged through net-next.
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Fri, 30 Jun 2017 07:46:17 +0000 (09:46 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 1 Jul 2017 21:18:13 +0000 (14:18 -0700)
commitd98da4de1450c759247989fa60cad8ccacd649e6
tree4a6fb8a6527f9ccc8cefa4e3760933a44964e915
parentd681572ed36ce05bcd1534b6fdb8d925238e6a1c
arm: sunxi: Revert changes merged through net-next.

This reverts commits fcd6131ca94d ("arm: sun8i: sunxi-h3-h5: Add dt node
for the syscon control module") to 854f2c12407f ("arm64: defconfig: Enable
dwmac-sun8i driver on defconfig") and 1d5ebdefdf94 ("arm: sun8i:
orangepipc: use internal phy-mode") to 9e30f58aaa02 ("arm: sun8i:
orangepi-2: use internal phy-mode") that should be merged
through the arm-soc tree, and end up in merge conflicts and build failures.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
arch/arm/boot/dts/sunxi-h3-h5.dtsi
arch/arm/configs/multi_v7_defconfig
arch/arm/configs/sunxi_defconfig
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
arch/arm64/configs/defconfig