Bump kernel to 4.4.194

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 1c1e99b462948678257672f02de231bf19cbb931..e7047d14d6d51016dd3053f75ed445bf816bebd8 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -2,9 +2,9 @@
 
 LINUX_RELEASE?=1
 
-LINUX_VERSION-4.4 = .192
+LINUX_VERSION-4.4 = .194
 
-LINUX_KERNEL_HASH-4.4.192 = e6f50259a4dfdf19ac5b3ceaf00561cf8da2ea971dc57cdacbe056e06b062055
+LINUX_KERNEL_HASH-4.4.194 = 334c207aa39bc1ea94ddb2bd060777e07b35702a76cfd76f5cf4ad9c1fca2a4a
 
 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))

diff --git a/target/linux/ar71xx/patches-4.4/500-MIPS-fw-myloader.patch b/target/linux/ar71xx/patches-4.4/500-MIPS-fw-myloader.patch
index 7e56e75b1441d4f23a9a7ee4fa9e2923a747d9b2..83143a1d8b81f69ad96da83ac223a4f427ae6db1 100644 (file)
--- a/target/linux/ar71xx/patches-4.4/500-MIPS-fw-myloader.patch
+++ b/target/linux/ar71xx/patches-4.4/500-MIPS-fw-myloader.patch
@@ -10,7 +10,7 @@
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1122,6 +1122,9 @@ config MIPS_MSC
+@@ -1119,6 +1119,9 @@ config MIPS_MSC
  config MIPS_NILE4
        bool
  

diff --git a/target/linux/generic/patches-4.4/092-MIPS-ZBOOT-copy-appended-dtb-to-the-end-of-the-kerne.patch b/target/linux/generic/patches-4.4/092-MIPS-ZBOOT-copy-appended-dtb-to-the-end-of-the-kerne.patch
index a88638cca710da1c712777dd3ceedaf7a58bb15d..dd048f95b313f82d0ab5b31ce305c15bf05315c3 100644 (file)
--- a/target/linux/generic/patches-4.4/092-MIPS-ZBOOT-copy-appended-dtb-to-the-end-of-the-kerne.patch
+++ b/target/linux/generic/patches-4.4/092-MIPS-ZBOOT-copy-appended-dtb-to-the-end-of-the-kerne.patch
@@ -27,7 +27,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -2757,10 +2757,10 @@ choice
+@@ -2754,10 +2754,10 @@ choice
                  the documented boot protocol using a device tree.
  
        config MIPS_RAW_APPENDED_DTB
@@ -40,7 +40,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
                  (e.g. cat vmlinux.bin <filename>.dtb > vmlinux_w_dtb).
  
                  This is meant as a backward compatibility convenience for those
-@@ -2772,24 +2772,6 @@ choice
+@@ -2769,24 +2769,6 @@ choice
                  look like a DTB header after a reboot if no actual DTB is appended
                  to vmlinux.bin.  Do not leave this option active in a production kernel
                  if you don't intend to always append a DTB.

diff --git a/target/linux/generic/patches-4.4/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-4.4/132-mips_inline_dma_ops.patch
index 1ff49424f66fc23bff1aa781aed4925e529b430c..4eea45a12f42ea10d2a87b76d8f3e58afeb58633 100644 (file)
--- a/target/linux/generic/patches-4.4/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-4.4/132-mips_inline_dma_ops.patch
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1623,6 +1623,7 @@ config CPU_CAVIUM_OCTEON
+@@ -1620,6 +1620,7 @@ config CPU_CAVIUM_OCTEON
        select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
        select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
        select MIPS_L1_CACHE_SHIFT_7
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        help
          The Cavium Octeon processor is a highly integrated chip containing
          many ethernet hardware widgets for networking tasks. The processor
-@@ -1918,6 +1919,9 @@ config MIPS_MALTA_PM
+@@ -1915,6 +1916,9 @@ config MIPS_MALTA_PM
        bool
        default y
  

diff --git a/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch b/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch
index 51b1d041bf43da85044d73f75dd54b2908bb58b2..b285206b62ffe17103c4c79b4618d2cd7570b0fb 100644 (file)
--- a/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch
+++ b/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch
@@ -4,7 +4,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/arch/mips/vdso/Makefile
 +++ b/arch/mips/vdso/Makefile
-@@ -28,11 +28,11 @@ aflags-vdso := $(ccflags-vdso) \
+@@ -30,11 +30,11 @@ aflags-vdso := $(ccflags-vdso) \
  # the comments on that file.
  #
  ifndef CONFIG_CPU_MIPSR6

diff --git a/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch b/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch
index cfcd0b33a09f5455d23605f945efea0a6003f9eb..649b147addf9245339d0369576228068274c8079 100644 (file)
--- a/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch
+++ b/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/vdso/Makefile
 +++ b/arch/mips/vdso/Makefile
-@@ -77,7 +77,7 @@ $(obj-vdso): KBUILD_AFLAGS := $(aflags-v
+@@ -79,7 +79,7 @@ $(obj-vdso): KBUILD_AFLAGS := $(aflags-v
  
  $(obj)/vdso.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) $(native-abi)
  
@@ -9,7 +9,7 @@
        $(call if_changed,vdsold)
  
  $(obj)/vdso-image.c: $(obj)/vdso.so.dbg $(obj)/genvdso FORCE
-@@ -111,7 +111,7 @@ $(obj)/vdso-o32.lds: KBUILD_CPPFLAGS :=
+@@ -113,7 +113,7 @@ $(obj)/vdso-o32.lds: KBUILD_CPPFLAGS :=
  $(obj)/vdso-o32.lds: $(src)/vdso.lds.S FORCE
        $(call if_changed_dep,cpp_lds_S)
  
@@ -18,7 +18,7 @@
        $(call if_changed,vdsold)
  
  $(obj)/vdso-o32-image.c: VDSO_NAME := o32
-@@ -147,7 +147,7 @@ $(obj)/vdso-n32.lds: KBUILD_CPPFLAGS :=
+@@ -149,7 +149,7 @@ $(obj)/vdso-n32.lds: KBUILD_CPPFLAGS :=
  $(obj)/vdso-n32.lds: $(src)/vdso.lds.S FORCE
        $(call if_changed_dep,cpp_lds_S)
  

diff --git a/target/linux/generic/patches-4.4/300-mips_expose_boot_raw.patch b/target/linux/generic/patches-4.4/300-mips_expose_boot_raw.patch
index cf21d60a5f8b54260845ea817d86c68972a31f79..d59eb6b260daecc976dafe3142ce6536ddeead63 100644 (file)
--- a/target/linux/generic/patches-4.4/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/patches-4.4/300-mips_expose_boot_raw.patch
@@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1037,9 +1037,6 @@ config FW_ARC
+@@ -1034,9 +1034,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
        bool
  
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
  config CEVT_BCM1480
        bool
  
-@@ -2797,6 +2794,18 @@ choice
+@@ -2794,6 +2791,18 @@ choice
                bool "Bootloader kernel arguments if available"
  endchoice
  

diff --git a/target/linux/generic/patches-4.4/301-mips_image_cmdline_hack.patch b/target/linux/generic/patches-4.4/301-mips_image_cmdline_hack.patch
index e3fdfa96f4c6f4e08749076aa69e95f7fae87e5f..fdaeae115c731d6635b71d964915c4b56d644695 100644 (file)
--- a/target/linux/generic/patches-4.4/301-mips_image_cmdline_hack.patch
+++ b/target/linux/generic/patches-4.4/301-mips_image_cmdline_hack.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1128,6 +1128,10 @@ config SYNC_R4K
+@@ -1125,6 +1125,10 @@ config SYNC_R4K
  config MIPS_MACHINE
        def_bool n
  

diff --git a/target/linux/generic/patches-4.4/304-mips_disable_fpu.patch b/target/linux/generic/patches-4.4/304-mips_disable_fpu.patch
index 3c303b6f5da0df17c7c18384cf1b6f531209c79f..8f85cf519f1813e5989a1dfe5f0e3456f43a5276 100644 (file)
--- a/target/linux/generic/patches-4.4/304-mips_disable_fpu.patch
+++ b/target/linux/generic/patches-4.4/304-mips_disable_fpu.patch
@@ -26,7 +26,7 @@ v2: incorporated changes suggested by Jonas Gorski
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -2729,6 +2729,20 @@ config MIPS_O32_FP64_SUPPORT
+@@ -2726,6 +2726,20 @@ config MIPS_O32_FP64_SUPPORT
  
          If unsure, say N.
  

diff --git a/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch b/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch
index 6aeca173fade8a5d08e25c0d0475acc6f2608211..b3320209c86b748fe459bfaaed47e983e629f7c1 100644 (file)
--- a/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch
+++ b/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch
@@ -51,7 +51,7 @@
  EXPORT_SYMBOL(default_qdisc_ops);
  
  /* Main transmission queue. */
-@@ -731,7 +731,7 @@ static void attach_one_default_qdisc(str
+@@ -735,7 +735,7 @@ static void attach_one_default_qdisc(str
                                     void *_unused)
  {
        struct Qdisc *qdisc;