kernel: bump 4.14 to 4.14.148
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		| @@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL | |||||||
|   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) |   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) | ||||||
| endif | endif | ||||||
|  |  | ||||||
| LINUX_VERSION-4.14 = .147 | LINUX_VERSION-4.14 = .148 | ||||||
|  |  | ||||||
| LINUX_KERNEL_HASH-4.14.147 = 8fd793688c9d9d4e26fdc175be92b6e638b6a86f4150dd66edecebab0bb85b12 | LINUX_KERNEL_HASH-4.14.148 = 12d2b74003e13a6c1956064754255249fbe5c7af6cbdfb2ddeba45b5ed7c0fad | ||||||
|  |  | ||||||
| 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))))))) | ||||||
|   | |||||||
| @@ -55,7 +55,7 @@ Cc: Kir Kolyshkin <kir@openvz.org> | |||||||
|  	rwlock_t		sk_callback_lock; |  	rwlock_t		sk_callback_lock; | ||||||
| --- a/net/core/sock.c | --- a/net/core/sock.c | ||||||
| +++ b/net/core/sock.c | +++ b/net/core/sock.c | ||||||
| @@ -2740,6 +2740,7 @@ void sock_init_data(struct socket *sock, | @@ -2745,6 +2745,7 @@ void sock_init_data(struct socket *sock, | ||||||
|   |   | ||||||
|  	sk->sk_max_pacing_rate = ~0U; |  	sk->sk_max_pacing_rate = ~0U; | ||||||
|  	sk->sk_pacing_rate = ~0U; |  	sk->sk_pacing_rate = ~0U; | ||||||
|   | |||||||
| @@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) |  struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) | ||||||
|  { |  { | ||||||
|  	struct dst_entry *dst = __sk_dst_get(sk); |  	struct dst_entry *dst = __sk_dst_get(sk); | ||||||
| @@ -1593,9 +1605,11 @@ void sk_destruct(struct sock *sk) | @@ -1598,9 +1610,11 @@ void sk_destruct(struct sock *sk) | ||||||
|   |   | ||||||
|  static void __sk_free(struct sock *sk) |  static void __sk_free(struct sock *sk) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
| --- a/net/core/sock.c | --- a/net/core/sock.c | ||||||
| +++ b/net/core/sock.c | +++ b/net/core/sock.c | ||||||
| @@ -3379,6 +3379,8 @@ static __net_initdata struct pernet_oper | @@ -3384,6 +3384,8 @@ static __net_initdata struct pernet_oper | ||||||
|   |   | ||||||
|  static int __init proto_init(void) |  static int __init proto_init(void) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> | |||||||
|  |  | ||||||
| --- a/usr/Makefile | --- a/usr/Makefile | ||||||
| +++ b/usr/Makefile | +++ b/usr/Makefile | ||||||
| @@ -39,20 +39,22 @@ ifneq ($(wildcard $(obj)/$(datafile_d_y) | @@ -42,20 +42,22 @@ ifneq ($(wildcard $(obj)/$(datafile_d_y) | ||||||
|  	include $(obj)/$(datafile_d_y) |  	include $(obj)/$(datafile_d_y) | ||||||
|  endif |  endif | ||||||
|   |   | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Koen Vandeputte
					Koen Vandeputte