From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 12 Aug 2017 16:12:00 +0000 (-0700)
Subject: 4.9-stable patches
X-Git-Tag: v3.18.65~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a693143a55a170debaeb10f1a2bc58612604e70c;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	revert-arm-dts-sun8i-support-dtb-build-for-nanopi-m1.patch
---

diff --git a/queue-4.9/revert-arm-dts-sun8i-support-dtb-build-for-nanopi-m1.patch b/queue-4.9/revert-arm-dts-sun8i-support-dtb-build-for-nanopi-m1.patch
new file mode 100644
index 00000000000..dec13f43104
--- /dev/null
+++ b/queue-4.9/revert-arm-dts-sun8i-support-dtb-build-for-nanopi-m1.patch
@@ -0,0 +1,29 @@
+From ef355037dbdb67ae5433980edaad5d9d90112791 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sat, 12 Aug 2017 09:08:48 -0700
+Subject: [PATCH] Revert "ARM: dts: sun8i: Support DTB build for NanoPi M1"
+
+This reverts commit 1e9e71782f3462d5aecb0720d26298253bdbeca7 which is
+commit 661ccdc1a95f18ab6c1373322fde09afd5b90a1f upstream.
+
+It's not needed in 4.9, and it breaks the build.
+
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Cc: Milo Kim <woogyom.kim@gmail.com>
+Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
+Cc: Sasha Levin <alexander.levin@verizon.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/Makefile |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -820,7 +820,6 @@ dtb-$(CONFIG_MACH_SUN8I) += \
+ 	sun8i-a83t-allwinner-h8homlet-v2.dtb \
+ 	sun8i-a83t-cubietruck-plus.dtb \
+ 	sun8i-h3-bananapi-m2-plus.dtb \
+-	sun8i-h3-nanopi-m1.dtb	\
+ 	sun8i-h3-nanopi-neo.dtb \
+ 	sun8i-h3-orangepi-2.dtb \
+ 	sun8i-h3-orangepi-lite.dtb \
diff --git a/queue-4.9/series b/queue-4.9/series
index f33a70b2186..69984b205ac 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -14,3 +14,4 @@ revert-ipv4-should-use-consistent-conditional-judgement-for-ip-fragment-in-__ip_
 udp-consistently-apply-ufo-or-fragmentation.patch
 sparc64-prevent-perf-from-running-during-super-critical-sections.patch
 kvm-arm-arm64-handle-hva-aging-while-destroying-the-vm.patch
+revert-arm-dts-sun8i-support-dtb-build-for-nanopi-m1.patch