From 38df8a1d09b1e6bd1f7aaf20a59cc9117ed807be Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Sat, 26 May 2018 03:40:20 -0400 Subject: [PATCH] Bump kernel to 4.4.132 --- include/kernel-version.mk | 4 +-- include/version.mk | 2 +- ...Fix-brightness-setting-when-setting-.patch | 28 ------------------- ...etfilter_match_bypass_default_checks.patch | 12 ++++---- 4 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 target/linux/generic/patches-4.4/087-Revert-led-core-Fix-brightness-setting-when-setting-.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 1047527dab..b6b7894773 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,9 +2,9 @@ LINUX_RELEASE?=1 -LINUX_VERSION-4.4 = .120 +LINUX_VERSION-4.4 = .132 -LINUX_KERNEL_HASH-4.4.120 = 667fcda44441106b649afe0952a3f4243ee9a214d9445491a3710e75572bf39f +LINUX_KERNEL_HASH-4.4.132 = 29d274e289ff15b3658124dba624e631a1d0319a2baab255044fa3b8f7aa5604 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/include/version.mk b/include/version.mk index 9ea2d1fece..391c4f80c4 100644 --- a/include/version.mk +++ b/include/version.mk @@ -31,7 +31,7 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1))) sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1)))) VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) -VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),v1.4.3) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),v1.4.4) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) diff --git a/target/linux/generic/patches-4.4/087-Revert-led-core-Fix-brightness-setting-when-setting-.patch b/target/linux/generic/patches-4.4/087-Revert-led-core-Fix-brightness-setting-when-setting-.patch deleted file mode 100644 index 6378ed4351..0000000000 --- a/target/linux/generic/patches-4.4/087-Revert-led-core-Fix-brightness-setting-when-setting-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b98deaa353d8f7af3f7543d0b59497fe1275599 Mon Sep 17 00:00:00 2001 -Message-Id: <4b98deaa353d8f7af3f7543d0b59497fe1275599.1520544136.git.mschiffer@universe-factory.net> -From: Matthias Schiffer -Date: Thu, 8 Mar 2018 22:22:08 +0100 -Subject: [PATCH] Revert "led: core: Fix brightness setting when setting - delay_off=0" - -This reverts commit 20ac8f72514b3af8b62c520d55656ded865eff00. ---- - drivers/leds/led-core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c -index 92b6798ef5b3..c1c3af089634 100644 ---- a/drivers/leds/led-core.c -+++ b/drivers/leds/led-core.c -@@ -149,7 +149,7 @@ void led_blink_set(struct led_classdev *led_cdev, - unsigned long *delay_on, - unsigned long *delay_off) - { -- led_stop_software_blink(led_cdev); -+ del_timer_sync(&led_cdev->blink_timer); - - led_cdev->flags &= ~LED_BLINK_ONESHOT; - led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP; --- -2.16.2 - diff --git a/target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch index 257bcf79ee..0967795751 100644 --- a/target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch @@ -50,16 +50,16 @@ static bool ip_checkentry(const struct ipt_ip *ip) { -@@ -655,6 +681,8 @@ find_check_entry(struct ipt_entry *e, st +@@ -659,6 +685,8 @@ find_check_entry(struct ipt_entry *e, st + struct xt_mtchk_param mtpar; struct xt_entry_match *ematch; - unsigned long pcnt; + ip_checkdefault(&e->ip); + - pcnt = xt_percpu_counter_alloc(); - if (IS_ERR_VALUE(pcnt)) + if (!xt_percpu_counter_alloc(alloc_state, &e->counters)) return -ENOMEM; -@@ -953,6 +981,7 @@ copy_entries_to_user(unsigned int total_ + +@@ -957,6 +985,7 @@ copy_entries_to_user(unsigned int total_ const struct xt_table_info *private = table->private; int ret = 0; const void *loc_cpu_entry; @@ -67,7 +67,7 @@ counters = alloc_counters(table); if (IS_ERR(counters)) -@@ -979,6 +1008,14 @@ copy_entries_to_user(unsigned int total_ +@@ -983,6 +1012,14 @@ copy_entries_to_user(unsigned int total_ ret = -EFAULT; goto free_counters; } -- 2.25.1