From ca53effdd6478f32948f6755bb65b34505203e59 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Mon, 4 Sep 2017 12:50:01 +0100 Subject: [PATCH] kernel: update 4.4 to 4.4.86 Refresh patches Signed-off-by: Kevin Darbyshire-Bryant --- include/kernel-version.mk | 4 ++-- ..._leds-convert-IDE-trigger-to-common-disk-trigger.patch | 2 +- .../ar71xx/patches-4.4/910-unaligned_access_hacks.patch | 2 +- ...70x_DT-Add-pwr_led-and-the-required-input-trigge.patch | 8 ++++---- .../linux/ixp4xx/patches-4.4/295-latch_led_driver.patch | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index a70ae5b61d..356dcd7f72 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .43 -LINUX_VERSION-4.4 = .83 +LINUX_VERSION-4.4 = .86 LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c -LINUX_KERNEL_HASH-4.4.83 = 5b5f0a0a6cdadcbe5e1c1c057470bb42880590fc97edee299fb1833d646856b4 +LINUX_KERNEL_HASH-4.4.86 = cb7787b9cc77cd3f0c6e5a9d6aabec989a932f8145251431cf186f6ad850e2a8 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch index 4e0be8d5ad..48714aa466 100644 --- a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch +++ b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch @@ -193,7 +193,7 @@ Signed-off-by: Jacek Anaszewski -MODULE_LICENSE("GPL"); --- a/include/linux/leds.h +++ b/include/linux/leds.h -@@ -302,10 +302,10 @@ static inline void *led_get_trigger_data +@@ -308,10 +308,10 @@ static inline void *led_get_trigger_data #endif /* CONFIG_LEDS_TRIGGERS */ /* Trigger specific functions */ diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch index 487e896718..5bedf5dc9e 100644 --- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch @@ -838,7 +838,7 @@ --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3819,14 +3819,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3818,14 +3818,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/brcm2708/patches-4.4/0073-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch b/target/linux/brcm2708/patches-4.4/0073-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch index edd7dfac59..e8777d2c3d 100644 --- a/target/linux/brcm2708/patches-4.4/0073-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch +++ b/target/linux/brcm2708/patches-4.4/0073-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch @@ -31,7 +31,7 @@ See: https://github.com/raspberrypi/linux/issues/1064 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c -@@ -42,6 +42,13 @@ static void gpio_led_work(struct work_st +@@ -41,6 +41,13 @@ static void gpio_led_work(struct work_st led_dat->platform_gpio_blink_set(led_dat->gpiod, led_dat->new_level, NULL, NULL); led_dat->blinking = 0; @@ -45,7 +45,7 @@ See: https://github.com/raspberrypi/linux/issues/1064 } else gpiod_set_value_cansleep(led_dat->gpiod, led_dat->new_level); } -@@ -62,7 +69,8 @@ static void gpio_led_set(struct led_clas +@@ -61,7 +68,8 @@ static void gpio_led_set(struct led_clas * seem to have a reliable way to know if we're already in one; so * let's just assume the worst. */ @@ -55,7 +55,7 @@ See: https://github.com/raspberrypi/linux/issues/1064 led_dat->new_level = level; schedule_work(&led_dat->work); } else { -@@ -75,6 +83,13 @@ static void gpio_led_set(struct led_clas +@@ -74,6 +82,13 @@ static void gpio_led_set(struct led_clas } } @@ -69,7 +69,7 @@ See: https://github.com/raspberrypi/linux/issues/1064 static int gpio_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on, unsigned long *delay_off) { -@@ -131,6 +146,7 @@ static int create_gpio_led(const struct +@@ -129,6 +144,7 @@ static int create_gpio_led(const struct led_dat->cdev.blink_set = gpio_blink_set; } led_dat->cdev.brightness_set = gpio_led_set; diff --git a/target/linux/ixp4xx/patches-4.4/295-latch_led_driver.patch b/target/linux/ixp4xx/patches-4.4/295-latch_led_driver.patch index a2f846373b..2b475161cf 100644 --- a/target/linux/ixp4xx/patches-4.4/295-latch_led_driver.patch +++ b/target/linux/ixp4xx/patches-4.4/295-latch_led_driver.patch @@ -180,7 +180,7 @@ +MODULE_DESCRIPTION("Latch LED driver"); --- a/include/linux/leds.h +++ b/include/linux/leds.h -@@ -376,4 +376,18 @@ static inline void ledtrig_cpu(enum cpu_ +@@ -385,4 +385,18 @@ static inline void ledtrig_cpu(enum cpu_ } #endif