aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
commit6be2305da83471c442dab83366c25be4dfb38793 (patch)
tree30cfe6f3fc964dca1936646468c87367b509e929 /target/linux/generic
parent8e69c9f7ef2e1ca40b33a4a33c76b460c1f62861 (diff)
downloadupstream-6be2305da83471c442dab83366c25be4dfb38793.tar.gz
upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.bz2
upstream-6be2305da83471c442dab83366c25be4dfb38793.zip
kernel: update 4.1 to 4.1.5
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46598
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch4
-rw-r--r--target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch2
-rw-r--r--target/linux/generic/patches-4.1/304-mips_disable_fpu.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
index 199cd0135e..f7543cca73 100644
--- a/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1570,6 +1570,7 @@ config CPU_CAVIUM_OCTEON
+@@ -1571,6 +1571,7 @@ config CPU_CAVIUM_OCTEON
select CPU_SUPPORTS_HUGEPAGES
select USB_EHCI_BIG_ENDIAN_MMIO
select MIPS_L1_CACHE_SHIFT_7
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
help
The Cavium Octeon processor is a highly integrated chip containing
many ethernet hardware widgets for networking tasks. The processor
-@@ -1865,6 +1866,9 @@ config MIPS_MALTA_PM
+@@ -1866,6 +1867,9 @@ config MIPS_MALTA_PM
bool
default y
diff --git a/target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch b/target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch
index 54f7eb8d1b..49f2ded56c 100644
--- a/target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
-@@ -2675,6 +2672,18 @@ config USE_OF
+@@ -2676,6 +2673,18 @@ config USE_OF
config BUILTIN_DTB
bool
diff --git a/target/linux/generic/patches-4.1/304-mips_disable_fpu.patch b/target/linux/generic/patches-4.1/304-mips_disable_fpu.patch
index e07135b075..3288d19d8e 100644
--- a/target/linux/generic/patches-4.1/304-mips_disable_fpu.patch
+++ b/target/linux/generic/patches-4.1/304-mips_disable_fpu.patch
@@ -26,7 +26,7 @@ v2: incorporated changes suggested by Jonas Gorski
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -2667,6 +2667,20 @@ config MIPS_O32_FP64_SUPPORT
+@@ -2668,6 +2668,20 @@ config MIPS_O32_FP64_SUPPORT
If unsure, say N.