mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-03-30 11:17:42 +08:00
This reverts commits2c0cba482e("arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module") to2428fd0fe5("arm64: defconfig: Enable dwmac-sun8i driver on defconfig") and3432a86e64("arm: sun8i: orangepipc: use internal phy-mode") to5a79b4f2a5("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>