diff options
-rw-r--r-- | mk/kernel-ver.mk | 8 | ||||
-rw-r--r-- | target/config/Config.in.kernelversion | 4 | ||||
-rw-r--r-- | target/linux/patches/4.9.32/0001-sparc64-make-string-buffers-large-enough.patch | 41 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/crisv32_ethernet_driver.patch (renamed from target/linux/patches/4.9.32/crisv32_ethernet_driver.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/h8300.patch (renamed from target/linux/patches/4.9.32/h8300.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/initramfs-nosizelimit.patch (renamed from target/linux/patches/4.9.32/initramfs-nosizelimit.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/ld-or1k.patch (renamed from target/linux/patches/4.9.32/ld-or1k.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/macsonic.patch (renamed from target/linux/patches/4.9.32/macsonic.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/microblaze-sigaltstack.patch (renamed from target/linux/patches/4.9.32/microblaze-sigaltstack.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/or1k-more-ram.patch (renamed from target/linux/patches/4.9.32/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/patch-realtime (renamed from target/linux/patches/4.9.32/patch-realtime) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/sh2.patch (renamed from target/linux/patches/4.9.32/sh2.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/startup.patch (renamed from target/linux/patches/4.9.32/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.35/vdso2.patch (renamed from target/linux/patches/4.9.32/vdso2.patch) | 0 |
14 files changed, 6 insertions, 47 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 095303127..7648bf435 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -16,16 +16,16 @@ KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_11),y) -KERNEL_FILE_VER:= 4.11.6 +KERNEL_FILE_VER:= 4.11.8 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 25539bfc34a01735d23ee80d5ef84054c65d1ea35dbd81be1cea339c21509631 +KERNEL_HASH:= 8e7d8dcbeb9e2c0dad15706e7f37fb8348f1cf4d72d72be13f254f533d279db8 endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_9),y) -KERNEL_FILE_VER:= 4.9.32 +KERNEL_FILE_VER:= 4.9.35 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= c3796575bbd2f55a1d1fb3f07b197b76afbb62dc1f64bd15d44626f78a610765 +KERNEL_HASH:= 3491234ed79f3e4a425457edf96447773be677521932a3e5bafb79834c5e7436 endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_6),y) KERNEL_FILE_VER:= 4.6.2 diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index 0e7e0424c..af04b446e 100644 --- a/target/config/Config.in.kernelversion +++ b/target/config/Config.in.kernelversion @@ -28,7 +28,7 @@ config ADK_TARGET_KERNEL_VERSION_GIT select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK config ADK_TARGET_KERNEL_VERSION_4_11 - bool "4.11.6" + bool "4.11.8" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG @@ -38,7 +38,7 @@ config ADK_TARGET_KERNEL_VERSION_4_11 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU config ADK_TARGET_KERNEL_VERSION_4_9 - bool "4.9.32" + bool "4.9.35" depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_NDS32 diff --git a/target/linux/patches/4.9.32/0001-sparc64-make-string-buffers-large-enough.patch b/target/linux/patches/4.9.32/0001-sparc64-make-string-buffers-large-enough.patch deleted file mode 100644 index 2b1eaeedf..000000000 --- a/target/linux/patches/4.9.32/0001-sparc64-make-string-buffers-large-enough.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b5c3206190f1fddd100b3060eb15f0d775ffeab8 Mon Sep 17 00:00:00 2001 -From: Dan Carpenter <dan.carpenter@oracle.com> -Date: Fri, 25 Nov 2016 14:03:55 +0300 -Subject: [PATCH] sparc64: make string buffers large enough - -My static checker complains that if "lvl" is ULONG_MAX (this is 64 bit) -then some of the strings will overflow. I don't know if that's possible -but it seems simple enough to make the buffers slightly larger. - -Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> ---- - arch/sparc/kernel/traps_64.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c -index 4094a51..496fa92 100644 ---- a/arch/sparc/kernel/traps_64.c -+++ b/arch/sparc/kernel/traps_64.c -@@ -85,7 +85,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p) - - void bad_trap(struct pt_regs *regs, long lvl) - { -- char buffer[32]; -+ char buffer[36]; - siginfo_t info; - - if (notify_die(DIE_TRAP, "bad trap", regs, -@@ -116,7 +116,7 @@ void bad_trap(struct pt_regs *regs, long lvl) - - void bad_trap_tl1(struct pt_regs *regs, long lvl) - { -- char buffer[32]; -+ char buffer[36]; - - if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs, - 0, lvl, SIGTRAP) == NOTIFY_STOP) --- -2.1.4 - diff --git a/target/linux/patches/4.9.32/crisv32_ethernet_driver.patch b/target/linux/patches/4.9.35/crisv32_ethernet_driver.patch index 0cef202fc..0cef202fc 100644 --- a/target/linux/patches/4.9.32/crisv32_ethernet_driver.patch +++ b/target/linux/patches/4.9.35/crisv32_ethernet_driver.patch diff --git a/target/linux/patches/4.9.32/h8300.patch b/target/linux/patches/4.9.35/h8300.patch index a58b3f137..a58b3f137 100644 --- a/target/linux/patches/4.9.32/h8300.patch +++ b/target/linux/patches/4.9.35/h8300.patch diff --git a/target/linux/patches/4.9.32/initramfs-nosizelimit.patch b/target/linux/patches/4.9.35/initramfs-nosizelimit.patch index 40d2f6bd8..40d2f6bd8 100644 --- a/target/linux/patches/4.9.32/initramfs-nosizelimit.patch +++ b/target/linux/patches/4.9.35/initramfs-nosizelimit.patch diff --git a/target/linux/patches/4.9.32/ld-or1k.patch b/target/linux/patches/4.9.35/ld-or1k.patch index 264f9166f..264f9166f 100644 --- a/target/linux/patches/4.9.32/ld-or1k.patch +++ b/target/linux/patches/4.9.35/ld-or1k.patch diff --git a/target/linux/patches/4.9.32/macsonic.patch b/target/linux/patches/4.9.35/macsonic.patch index 75a6fcad2..75a6fcad2 100644 --- a/target/linux/patches/4.9.32/macsonic.patch +++ b/target/linux/patches/4.9.35/macsonic.patch diff --git a/target/linux/patches/4.9.32/microblaze-sigaltstack.patch b/target/linux/patches/4.9.35/microblaze-sigaltstack.patch index c4064e8b9..c4064e8b9 100644 --- a/target/linux/patches/4.9.32/microblaze-sigaltstack.patch +++ b/target/linux/patches/4.9.35/microblaze-sigaltstack.patch diff --git a/target/linux/patches/4.9.32/or1k-more-ram.patch b/target/linux/patches/4.9.35/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/4.9.32/or1k-more-ram.patch +++ b/target/linux/patches/4.9.35/or1k-more-ram.patch diff --git a/target/linux/patches/4.9.32/patch-realtime b/target/linux/patches/4.9.35/patch-realtime index 7abba16fe..7abba16fe 100644 --- a/target/linux/patches/4.9.32/patch-realtime +++ b/target/linux/patches/4.9.35/patch-realtime diff --git a/target/linux/patches/4.9.32/sh2.patch b/target/linux/patches/4.9.35/sh2.patch index 9debe80ad..9debe80ad 100644 --- a/target/linux/patches/4.9.32/sh2.patch +++ b/target/linux/patches/4.9.35/sh2.patch diff --git a/target/linux/patches/4.9.32/startup.patch b/target/linux/patches/4.9.35/startup.patch index e54ac19a6..e54ac19a6 100644 --- a/target/linux/patches/4.9.32/startup.patch +++ b/target/linux/patches/4.9.35/startup.patch diff --git a/target/linux/patches/4.9.32/vdso2.patch b/target/linux/patches/4.9.35/vdso2.patch index 35df488a8..35df488a8 100644 --- a/target/linux/patches/4.9.32/vdso2.patch +++ b/target/linux/patches/4.9.35/vdso2.patch |