Re: [LEDE-DEV] [PATCH] kernel: bump 4.14 to 4.14.37

2018-04-26 Thread Stijn Segers 
Op do, 26 apr 2018 om 6:20 , schreef Koen Vandeputte 
:

Refreshed all patches

Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6


Compile-tested on: ramips/mt7621, x86/64
Run-tested on: ramips/mt7621, x86/64



Signed-off-by: Koen Vandeputte 

Tested-by: Stijn Segers 


---
 include/kernel-version.mk
 | 4 ++--
 .../backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch   
 | 2 +-
 .../pending-4.14/610-netfilter_match_bypass_default_checks.patch 
 | 2 +-

 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 8d0a62347cbf..cf84e31f7b0f 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -5,12 +5,12 @@ LINUX_RELEASE?=1
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .121
 LINUX_VERSION-4.9 = .96
-LINUX_VERSION-4.14 = .36
+LINUX_VERSION-4.14 = .37

 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.121 = 
44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
 LINUX_KERNEL_HASH-4.9.96 = 
826f596eb5197f8b17304649c2990dd7b766f5c79076cae79f4261c40cea877f
-LINUX_KERNEL_HASH-4.14.36 = 
cae24404d7b5812a331cbbc430b3ab75ca0f76eb16803528cbffbc42e768bc43
+LINUX_KERNEL_HASH-4.14.37 = 
8197e7ed3620713e412905430a7bf93e2048384042ffba189a66f0eeb6908e92


 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/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch 
b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch

index 92d7942d8684..d930751d415f 100644
--- 
a/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
+++ 
b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
@@ -80,7 +80,7 @@ Signed-off-by: Pablo Neira Ayuso 

  static void nfnl_queue_net_exit_batch(struct list_head 
*net_exit_list)

 --- a/net/netfilter/x_tables.c
 +++ b/net/netfilter/x_tables.c
-@@ -1754,8 +1754,17 @@ static int __net_init xt_net_init(struct
+@@ -1785,8 +1785,17 @@ static int __net_init xt_net_init(struct
return 0;
  }

diff --git 
a/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch 
b/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch

index ec269b6cd880..36118796094d 100644
--- 
a/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch
+++ 
b/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch

@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau 
for (i = sizeof(struct ipt_entry);
 i < e->target_offset;
 i += m->u.match_size) {
-@@ -1224,12 +1261,15 @@ compat_copy_entry_to_user(struct ipt_ent
+@@ -1226,12 +1263,15 @@ compat_copy_entry_to_user(struct ipt_ent
compat_uint_t origsize;
const struct xt_entry_match *ematch;
int ret = 0;
--
2.7.4


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev



___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] kernel: bump 4.14 to 4.14.37

2018-04-26 Thread Koen Vandeputte 
Refreshed all patches

Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6

Signed-off-by: Koen Vandeputte 
---
 include/kernel-version.mk | 4 ++--
 .../backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch| 2 +-
 .../pending-4.14/610-netfilter_match_bypass_default_checks.patch  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 8d0a62347cbf..cf84e31f7b0f 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -5,12 +5,12 @@ LINUX_RELEASE?=1
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .121
 LINUX_VERSION-4.9 = .96
-LINUX_VERSION-4.14 = .36
+LINUX_VERSION-4.14 = .37
 
 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.121 = 
44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
 LINUX_KERNEL_HASH-4.9.96 = 
826f596eb5197f8b17304649c2990dd7b766f5c79076cae79f4261c40cea877f
-LINUX_KERNEL_HASH-4.14.36 = 
cae24404d7b5812a331cbbc430b3ab75ca0f76eb16803528cbffbc42e768bc43
+LINUX_KERNEL_HASH-4.14.37 = 
8197e7ed3620713e412905430a7bf93e2048384042ffba189a66f0eeb6908e92
 
 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/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
 
b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
index 92d7942d8684..d930751d415f 100644
--- 
a/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
+++ 
b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
@@ -80,7 +80,7 @@ Signed-off-by: Pablo Neira Ayuso 
  static void nfnl_queue_net_exit_batch(struct list_head *net_exit_list)
 --- a/net/netfilter/x_tables.c
 +++ b/net/netfilter/x_tables.c
-@@ -1754,8 +1754,17 @@ static int __net_init xt_net_init(struct
+@@ -1785,8 +1785,17 @@ static int __net_init xt_net_init(struct
return 0;
  }
  
diff --git 
a/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch
 
b/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch
index ec269b6cd880..36118796094d 100644
--- 
a/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch
+++ 
b/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau 
for (i = sizeof(struct ipt_entry);
 i < e->target_offset;
 i += m->u.match_size) {
-@@ -1224,12 +1261,15 @@ compat_copy_entry_to_user(struct ipt_ent
+@@ -1226,12 +1263,15 @@ compat_copy_entry_to_user(struct ipt_ent
compat_uint_t origsize;
const struct xt_entry_match *ematch;
int ret = 0;
-- 
2.7.4


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev