3.10-stable patches

added patches:
	arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch
	arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch

diff --git a/queue-3.10/arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch b/queue-3.10/arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch
new file mode 100644 (file)
index 0000000..4959dd8
--- /dev/null
+++ b/queue-3.10/arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch
@@ -0,0 +1,34 @@
+From a0396b9bd5a4a7baf598b60d2ca53c605c440a42 Mon Sep 17 00:00:00 2001
+From: Olof Johansson <olof@lixom.net>
+Date: Mon, 16 Sep 2013 09:01:24 -0700
+Subject: ARM: multi_v7_defconfig: enable ARM_ATAG_DTB_COMPAT
+
+From: Olof Johansson <olof@lixom.net>
+
+commit a0396b9bd5a4a7baf598b60d2ca53c605c440a42 upstream.
+
+Without this, legacy platforms that can boot with a multiplatform
+kernel but that need the DTB to be appended, won't have a way to pass
+firmware-set bootargs to the kernel.
+
+This is needed to boot multi_v7_defconfig on snowball, for instance.
+
+Signed-off-by: Olof Johansson <olof@lixom.net>
+Cc: Jason Cooper <jason@lakedaemon.net>
+Cc: Kevin Hilman <khilman@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/configs/multi_v7_defconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/configs/multi_v7_defconfig
++++ b/arch/arm/configs/multi_v7_defconfig
+@@ -23,6 +23,7 @@ CONFIG_AEABI=y
+ CONFIG_HIGHMEM=y
+ CONFIG_HIGHPTE=y
+ CONFIG_ARM_APPENDED_DTB=y
++CONFIG_ARM_ATAG_DTB_COMPAT=y
+ CONFIG_VFP=y
+ CONFIG_NEON=y
+ CONFIG_NET=y

diff --git a/queue-3.10/arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch b/queue-3.10/arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch
new file mode 100644 (file)
index 0000000..3024a4c
--- /dev/null
+++ b/queue-3.10/arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch
@@ -0,0 +1,30 @@
+From c12d82b84353784f8233c28ee43cec0ac9fbd7d2 Mon Sep 17 00:00:00 2001
+From: Soren Brinkmann <soren.brinkmann@xilinx.com>
+Date: Wed, 19 Jun 2013 10:53:04 -0700
+Subject: arm: multi_v7_defconfig: Enable initrd/initramfs support
+
+From: Soren Brinkmann <soren.brinkmann@xilinx.com>
+
+commit c12d82b84353784f8233c28ee43cec0ac9fbd7d2 upstream.
+
+Add CONFIG_BLK_DEV_INITRD to the defconfig to support
+initramfs and initrd.
+
+Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
+Signed-off-by: Michal Simek <michal.simek@xilinx.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/configs/multi_v7_defconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/configs/multi_v7_defconfig
++++ b/arch/arm/configs/multi_v7_defconfig
+@@ -1,6 +1,7 @@
+ CONFIG_EXPERIMENTAL=y
+ CONFIG_NO_HZ=y
+ CONFIG_HIGH_RES_TIMERS=y
++CONFIG_BLK_DEV_INITRD=y
+ CONFIG_ARCH_MVEBU=y
+ CONFIG_MACH_ARMADA_370=y
+ CONFIG_ARCH_SIRF=y

diff --git a/queue-3.10/series b/queue-3.10/series
index 3c748c59655ccaaadc3ac95c2e8187769f6e0bba..e00d072f04f5bd8f5ac7915c1b0214fcedff0107 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -7,3 +7,5 @@ netfilter-can-t-fail-and-free-after-table-replacement.patch
 tracepoint-do-not-waste-memory-on-mods-with-no-tracepoints.patch
 firewire-ohci-beautify-some-macro-definitions.patch
 firewire-ohci-fix-probe-failure-with-agere-lsi-controllers.patch
+arm-multi_v7_defconfig-enable-initrd-initramfs-support.patch
+arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch