From fec8fe806963c96a6506c2aebc3572d3a11f285f Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 31 Jul 2018 13:30:14 +0200 Subject: kernel: bump 4.9 to 4.9.116 Refreshed all patches Remove upstreamed patches. - 103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch - 403-mtd_fix_cfi_cmdset_0002_status_check.patch - 001-4.11-01-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch - 001-4.15-08-bcm63xx_enet-correct-clock-usage.patch - 001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch - 900-gen_stats-fix-netlink-stats-padding.patch Introduce a new backported patch to address ext4 breakage, introduced in 4.9.112 - backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch This patch has been slightly altered to compensate for a new helper function introduced in later kernels. Also add ARM64_SSBD symbol to ARM64 targets still running kernel 4.9 Compile-tested on: ar71xx, bcm2710 Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte --- ...gnore-dtco-targets-when-filtering-symbols.patch | 2 +- .../patches-4.9/950-0031-Add-dwc_otg-driver.patch | 2 +- ...e-realtime-clock-1-wire-chip-DS1307-and-1.patch | 30 ++++++++-------------- 3 files changed, 12 insertions(+), 22 deletions(-) (limited to 'target/linux/brcm2708/patches-4.9') diff --git a/target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch b/target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch index 0f5afac4ea..52fe8a2281 100644 --- a/target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch +++ b/target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch @@ -9,7 +9,7 @@ Subject: [PATCH] kbuild: Ignore dtco targets when filtering symbols --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include -@@ -284,7 +284,7 @@ ksym_dep_filter = +@@ -285,7 +285,7 @@ ksym_dep_filter = $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;; \ as_*_S|cpp_s_S) \ $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ diff --git a/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch index d19027a2f0..258299fcf1 100644 --- a/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch @@ -696,7 +696,7 @@ Signed-off-by: Noralf Trønnes } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5064,7 +5064,7 @@ static void port_event(struct usb_hub *h +@@ -5068,7 +5068,7 @@ static void port_event(struct usb_hub *h if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; diff --git a/target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch b/target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch index 5a324dde61..4c3d2b15f6 100644 --- a/target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch +++ b/target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch @@ -28,10 +28,8 @@ w1-gpio: Sort out the pullup/parasitic power tangle include/linux/w1-gpio.h | 1 + 5 files changed, 99 insertions(+), 9 deletions(-) -Index: linux-4.9.111/drivers/w1/masters/w1-gpio.c -=================================================================== ---- linux-4.9.111.orig/drivers/w1/masters/w1-gpio.c -+++ linux-4.9.111/drivers/w1/masters/w1-gpio.c +--- a/drivers/w1/masters/w1-gpio.c ++++ b/drivers/w1/masters/w1-gpio.c @@ -23,6 +23,19 @@ #include "../w1.h" #include "../w1_int.h" @@ -145,10 +143,8 @@ Index: linux-4.9.111/drivers/w1/masters/w1-gpio.c return 0; } -Index: linux-4.9.111/drivers/w1/w1.h -=================================================================== ---- linux-4.9.111.orig/drivers/w1/w1.h -+++ linux-4.9.111/drivers/w1/w1.h +--- a/drivers/w1/w1.h ++++ b/drivers/w1/w1.h @@ -173,6 +173,12 @@ struct w1_bus_master u8 (*set_pullup)(void *, int); @@ -162,10 +158,8 @@ Index: linux-4.9.111/drivers/w1/w1.h void (*search)(void *, struct w1_master *, u8, w1_slave_found_callback); }; -Index: linux-4.9.111/drivers/w1/w1_int.c -=================================================================== ---- linux-4.9.111.orig/drivers/w1/w1_int.c -+++ linux-4.9.111/drivers/w1/w1_int.c +--- a/drivers/w1/w1_int.c ++++ b/drivers/w1/w1_int.c @@ -122,6 +122,20 @@ int w1_add_master_device(struct w1_bus_m return(-EINVAL); } @@ -187,10 +181,8 @@ Index: linux-4.9.111/drivers/w1/w1_int.c /* Lock until the device is added (or not) to w1_masters. */ mutex_lock(&w1_mlock); /* Search for the first available id (starting at 1). */ -Index: linux-4.9.111/drivers/w1/w1_io.c -=================================================================== ---- linux-4.9.111.orig/drivers/w1/w1_io.c -+++ linux-4.9.111/drivers/w1/w1_io.c +--- a/drivers/w1/w1_io.c ++++ b/drivers/w1/w1_io.c @@ -134,10 +134,22 @@ static void w1_pre_write(struct w1_maste static void w1_post_write(struct w1_master *dev) { @@ -217,10 +209,8 @@ Index: linux-4.9.111/drivers/w1/w1_io.c dev->pullup_duration = 0; } } -Index: linux-4.9.111/include/linux/w1-gpio.h -=================================================================== ---- linux-4.9.111.orig/include/linux/w1-gpio.h -+++ linux-4.9.111/include/linux/w1-gpio.h +--- a/include/linux/w1-gpio.h ++++ b/include/linux/w1-gpio.h @@ -18,6 +18,7 @@ struct w1_gpio_platform_data { unsigned int pin; -- cgit v1.2.3