From 697658e220bcf63d4bae12c20737fbd50a967e65 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 7 Aug 2019 14:21:39 +0200 Subject: [PATCH] kernel: bump 4.19 to 4.19.65 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- ...29-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch | 4 ++-- .../generic/backport-4.19/011-kbuild-export-SUBARCH.patch | 4 ++-- target/linux/generic/hack-4.19/207-disable-modorder.patch | 4 ++-- target/linux/generic/hack-4.19/220-gc_sections.patch | 2 +- .../linux/generic/pending-4.19/201-extra_optimization.patch | 2 +- .../linux/generic/pending-4.19/220-optimize_inlining.patch | 4 ++-- .../generic/pending-4.19/332-arc-add-OWRTDTB-section.patch | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 8a604844b34b..97188d875bf4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .188 LINUX_VERSION-4.14 = .137 -LINUX_VERSION-4.19 = .64 +LINUX_VERSION-4.19 = .65 LINUX_KERNEL_HASH-4.9.188 = 27539853b25d1830fe81b108f39249c6ddf8b47257cdba09404ba0949863e222 LINUX_KERNEL_HASH-4.14.137 = 93f8e91329300f325a5b4dd9de1f51c0b1bf9591dfd2274044c2f70f96bae228 -LINUX_KERNEL_HASH-4.19.64 = 7a6f8be33df3bef763495e8dde7a2fd7cdad71d7b952cd740b68eaac1bab5abd +LINUX_KERNEL_HASH-4.19.65 = e59939186916c0286289c5bf78b83fac0d71a807241c6b1899bfe7a84486dedf remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index d251129a2ea8..1905c71bdd67 100644 --- a/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell /* Device and char device-related information */ static DEFINE_IDA(gpio_ida); static dev_t gpio_devt; -@@ -2624,7 +2626,7 @@ int gpiod_direction_output(struct gpio_d +@@ -2626,7 +2628,7 @@ int gpiod_direction_output(struct gpio_d value = !!value; /* GPIOs used for IRQs shall not be set as output */ @@ -35,7 +35,7 @@ Signed-off-by: Phil Elwell gpiod_err(desc, "%s: tried to set a GPIO tied to an IRQ as output\n", __func__); -@@ -3312,7 +3314,7 @@ int gpiochip_lock_as_irq(struct gpio_chi +@@ -3314,7 +3316,7 @@ int gpiochip_lock_as_irq(struct gpio_chi } } diff --git a/target/linux/generic/backport-4.19/011-kbuild-export-SUBARCH.patch b/target/linux/generic/backport-4.19/011-kbuild-export-SUBARCH.patch index b5f654906a78..a42c72044622 100644 --- a/target/linux/generic/backport-4.19/011-kbuild-export-SUBARCH.patch +++ b/target/linux/generic/backport-4.19/011-kbuild-export-SUBARCH.patch @@ -10,9 +10,9 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -431,8 +431,8 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s - KBUILD_LDFLAGS := +@@ -432,8 +432,8 @@ KBUILD_LDFLAGS := GCC_PLUGINS_CFLAGS := + CLANG_FLAGS := -export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC -export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS diff --git a/target/linux/generic/hack-4.19/207-disable-modorder.patch b/target/linux/generic/hack-4.19/207-disable-modorder.patch index f19d36c3de45..942c0255639a 100644 --- a/target/linux/generic/hack-4.19/207-disable-modorder.patch +++ b/target/linux/generic/hack-4.19/207-disable-modorder.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -1225,7 +1225,6 @@ all: modules +@@ -1226,7 +1226,6 @@ all: modules PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1254,7 +1253,6 @@ _modinst_: +@@ -1255,7 +1254,6 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(CURDIR) $(MODLIB)/build ; \ fi diff --git a/target/linux/generic/hack-4.19/220-gc_sections.patch b/target/linux/generic/hack-4.19/220-gc_sections.patch index 1ca28990998c..77422e821bd7 100644 --- a/target/linux/generic/hack-4.19/220-gc_sections.patch +++ b/target/linux/generic/hack-4.19/220-gc_sections.patch @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) -@@ -781,11 +786,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH +@@ -782,11 +787,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once) endif diff --git a/target/linux/generic/pending-4.19/201-extra_optimization.patch b/target/linux/generic/pending-4.19/201-extra_optimization.patch index 809154397635..cafccd42c93b 100644 --- a/target/linux/generic/pending-4.19/201-extra_optimization.patch +++ b/target/linux/generic/pending-4.19/201-extra_optimization.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -656,12 +656,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni +@@ -657,12 +657,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE diff --git a/target/linux/generic/pending-4.19/220-optimize_inlining.patch b/target/linux/generic/pending-4.19/220-optimize_inlining.patch index c493742eeeaa..1cb0a1d485da 100644 --- a/target/linux/generic/pending-4.19/220-optimize_inlining.patch +++ b/target/linux/generic/pending-4.19/220-optimize_inlining.patch @@ -11,7 +11,7 @@ early_print("no ATAGS support: can't continue\n"); --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h -@@ -365,7 +365,7 @@ static inline bool cpu_have_feature(unsi +@@ -366,7 +366,7 @@ static inline bool cpu_have_feature(unsi } /* System capability check for constant caps */ @@ -20,7 +20,7 @@ { if (num >= ARM64_NCAPS) return false; -@@ -379,7 +379,7 @@ static inline bool cpus_have_cap(unsigne +@@ -380,7 +380,7 @@ static inline bool cpus_have_cap(unsigne return test_bit(num, cpu_hwcaps); } diff --git a/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch index 6fea6f0b666e..ec89547726e4 100644 --- a/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch +++ b/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch @@ -42,8 +42,8 @@ Signed-off-by: Evgeniy Didin ;---------------------------------------------------------------- --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c -@@ -528,7 +528,7 @@ ignore_uboot_args: - #endif +@@ -526,7 +526,7 @@ void __init handle_uboot_args(void) + ignore_uboot_args: if (use_embedded_dtb) { - machine_desc = setup_machine_fdt(__dtb_start); @@ -51,7 +51,7 @@ Signed-off-by: Evgeniy Didin if (!machine_desc) panic("Embedded DT invalid\n"); } -@@ -544,6 +544,8 @@ ignore_uboot_args: +@@ -542,6 +542,8 @@ ignore_uboot_args: } } -- 2.30.2