kernel: bump 4.14 to 4.14.82
Refreshed all patches. Compile-tested: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested: ar71xx, cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
parent
e1debc557c
commit
02e16e9e82
5 changed files with 8 additions and 8 deletions
|
@ -4,11 +4,11 @@ LINUX_RELEASE?=1
|
||||||
|
|
||||||
LINUX_VERSION-3.18 = .125
|
LINUX_VERSION-3.18 = .125
|
||||||
LINUX_VERSION-4.9 = .138
|
LINUX_VERSION-4.9 = .138
|
||||||
LINUX_VERSION-4.14 = .81
|
LINUX_VERSION-4.14 = .82
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-3.18.125 = 708433b360efd8623f7303b721ffb0e7c59cbe8552f1a3f4c0d980a12b4ed90e
|
LINUX_KERNEL_HASH-3.18.125 = 708433b360efd8623f7303b721ffb0e7c59cbe8552f1a3f4c0d980a12b4ed90e
|
||||||
LINUX_KERNEL_HASH-4.9.138 = 92301242601d50854b173a3fdec318480e24fc86f32102003a9ed7108fab21b7
|
LINUX_KERNEL_HASH-4.9.138 = 92301242601d50854b173a3fdec318480e24fc86f32102003a9ed7108fab21b7
|
||||||
LINUX_KERNEL_HASH-4.14.81 = 4b36dfd053844ef0617799d432eed67aa4795d3403216d6789288aa7a0e75bde
|
LINUX_KERNEL_HASH-4.14.82 = a790a2e6f6a76d70decec91d1b7bcfba90f821b076273da070f6e0e1e6391dad
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||||
|
|
|
@ -57,7 +57,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||||
if (nf_ct_is_expired(tmp)) {
|
if (nf_ct_is_expired(tmp)) {
|
||||||
nf_ct_gc_expired(tmp);
|
nf_ct_gc_expired(tmp);
|
||||||
continue;
|
continue;
|
||||||
@@ -975,6 +978,18 @@ static bool gc_worker_can_early_drop(con
|
@@ -978,6 +981,18 @@ static bool gc_worker_can_early_drop(con
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||||
static void gc_worker(struct work_struct *work)
|
static void gc_worker(struct work_struct *work)
|
||||||
{
|
{
|
||||||
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
|
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
|
||||||
@@ -1011,6 +1026,11 @@ static void gc_worker(struct work_struct
|
@@ -1014,6 +1029,11 @@ static void gc_worker(struct work_struct
|
||||||
tmp = nf_ct_tuplehash_to_ctrack(h);
|
tmp = nf_ct_tuplehash_to_ctrack(h);
|
||||||
|
|
||||||
scanned++;
|
scanned++;
|
||||||
|
|
|
@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/net/netfilter/nf_conntrack_core.c
|
--- a/net/netfilter/nf_conntrack_core.c
|
||||||
+++ b/net/netfilter/nf_conntrack_core.c
|
+++ b/net/netfilter/nf_conntrack_core.c
|
||||||
@@ -978,18 +978,6 @@ static bool gc_worker_can_early_drop(con
|
@@ -981,18 +981,6 @@ static bool gc_worker_can_early_drop(con
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
static void gc_worker(struct work_struct *work)
|
static void gc_worker(struct work_struct *work)
|
||||||
{
|
{
|
||||||
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
|
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
|
||||||
@@ -1026,10 +1014,8 @@ static void gc_worker(struct work_struct
|
@@ -1029,10 +1017,8 @@ static void gc_worker(struct work_struct
|
||||||
tmp = nf_ct_tuplehash_to_ctrack(h);
|
tmp = nf_ct_tuplehash_to_ctrack(h);
|
||||||
|
|
||||||
scanned++;
|
scanned++;
|
||||||
|
|
|
@ -184,7 +184,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The generic kexec code builds a page list with physical
|
* The generic kexec code builds a page list with physical
|
||||||
@@ -121,15 +235,16 @@ machine_kexec(struct kimage *image)
|
@@ -124,15 +238,16 @@ machine_kexec(struct kimage *image)
|
||||||
/*
|
/*
|
||||||
* we do not want to be bothered.
|
* we do not want to be bothered.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -4143,7 +4143,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||||
+
|
+
|
||||||
--- a/arch/mips/pci/pci-legacy.c
|
--- a/arch/mips/pci/pci-legacy.c
|
||||||
+++ b/arch/mips/pci/pci-legacy.c
|
+++ b/arch/mips/pci/pci-legacy.c
|
||||||
@@ -309,3 +309,30 @@ char *__init pcibios_setup(char *str)
|
@@ -313,3 +313,30 @@ char *__init pcibios_setup(char *str)
|
||||||
return pcibios_plat_setup(str);
|
return pcibios_plat_setup(str);
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue