projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f053a8c
)
kernel: bump 4.14 to 4.14.118
author
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Mon, 13 May 2019 11:53:42 +0000
(13:53 +0200)
committer
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Wed, 15 May 2019 09:28:40 +0000
(11:28 +0200)
Refreshed all patches.
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
include/kernel-version.mk
patch
|
blob
|
history
target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/530-jffs2_make_lzma_available.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/630-packet_socket_type.patch
patch
|
blob
|
history
target/linux/ipq806x/patches-4.14/0066-GPIO-add-named-gpio-exports.patch
patch
|
blob
|
history
target/linux/lantiq/patches-4.14/0030-GPIO-add-named-gpio-exports.patch
patch
|
blob
|
history
target/linux/ramips/patches-4.14/0024-GPIO-add-named-gpio-exports.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 70ae299abf13c08a8f3c591c706ffb22738531f7..020a08525f057a9fc2e2af3802f8ad98261d0e34 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-3,10
+3,10
@@
LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .175
LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .175
-LINUX_VERSION-4.14 = .11
5
+LINUX_VERSION-4.14 = .11
8
LINUX_KERNEL_HASH-4.9.175 = d98434f91f9df2bf36c7896ca747b7cf98be2e3a491073fd26e3f53cda07500c
LINUX_KERNEL_HASH-4.9.175 = d98434f91f9df2bf36c7896ca747b7cf98be2e3a491073fd26e3f53cda07500c
-LINUX_KERNEL_HASH-4.14.11
5 = b7ae61711a1323053d68fd47911b92977afd526d302755518e42744251516186
+LINUX_KERNEL_HASH-4.14.11
8 = 687d73abd4b9af66ec30bdccdf96193e04316f9f5a1c7b8d74732c10b4729a15
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
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/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
index 007b8315e529dc8afd1f73464b1ecbd422701c13..9b33393c01d5912451f8893654a8a1cc30c1983b 100644
(file)
--- a/
target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
+++ b/
target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
@@
-92,7
+92,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
#endif
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
#endif
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
-@@ -98
7,7 +987
,7 @@ int br_nf_hook_thresh(unsigned int hook,
+@@ -98
8,7 +988
,7 @@ int br_nf_hook_thresh(unsigned int hook,
unsigned int i;
int ret;
unsigned int i;
int ret;
diff --git
a/target/linux/generic/pending-4.14/530-jffs2_make_lzma_available.patch
b/target/linux/generic/pending-4.14/530-jffs2_make_lzma_available.patch
index 834876fa84c2e433b2edc5693a2bc50b76f6532e..838d4168a200655f5f16e496b19cdbd306921eb3 100644
(file)
--- a/
target/linux/generic/pending-4.14/530-jffs2_make_lzma_available.patch
+++ b/
target/linux/generic/pending-4.14/530-jffs2_make_lzma_available.patch
@@
-244,7
+244,7
@@
Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
+}
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
+}
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
-@@ -37
1,14 +371
,41 @@ static int __init init_jffs2_fs(void)
+@@ -37
4,14 +374
,41 @@ static int __init init_jffs2_fs(void)
BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
@@
-1119,7
+1119,7
@@
Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))
ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))
-@@ -12
2,6 +132
,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
+@@ -12
3,6 +133
,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/
obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/
obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/
obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/
diff --git
a/target/linux/generic/pending-4.14/630-packet_socket_type.patch
b/target/linux/generic/pending-4.14/630-packet_socket_type.patch
index e8eae3b7ff81b588d7a1d5a613f089cfa784d2a4..0b9addc36eef800b78fa763530fc9d0d891405b4 100644
(file)
--- a/
target/linux/generic/pending-4.14/630-packet_socket_type.patch
+++ b/
target/linux/generic/pending-4.14/630-packet_socket_type.patch
@@
-87,7
+87,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -32
69,6 +3271
,7 @@ static int packet_create(struct net *net
+@@ -32
73,6 +3275
,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
@@
-95,7
+95,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -388
2,6 +3885
,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -388
6,6 +3889
,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
@@
-112,7
+112,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
default:
return -ENOPROTOOPT;
}
default:
return -ENOPROTOOPT;
}
-@@ -393
4,6 +3947
,13 @@ static int packet_getsockopt(struct sock
+@@ -393
8,6 +3951
,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;
diff --git
a/target/linux/ipq806x/patches-4.14/0066-GPIO-add-named-gpio-exports.patch
b/target/linux/ipq806x/patches-4.14/0066-GPIO-add-named-gpio-exports.patch
index daeb8c0acdb273090c7166924726badeaf05dbc1..79d720e17e5f26629ca2aad55235752cd2f29c6a 100644
(file)
--- a/
target/linux/ipq806x/patches-4.14/0066-GPIO-add-named-gpio-exports.patch
+++ b/
target/linux/ipq806x/patches-4.14/0066-GPIO-add-named-gpio-exports.patch
@@
-22,7
+22,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
#include "gpiolib.h"
#include "gpiolib.h"
-@@ -5
07,3 +509
,69 @@ void of_gpiochip_remove(struct gpio_chip
+@@ -5
13,3 +515
,69 @@ void of_gpiochip_remove(struct gpio_chip
gpiochip_remove_pin_ranges(chip);
of_node_put(chip->of_node);
}
gpiochip_remove_pin_ranges(chip);
of_node_put(chip->of_node);
}
diff --git
a/target/linux/lantiq/patches-4.14/0030-GPIO-add-named-gpio-exports.patch
b/target/linux/lantiq/patches-4.14/0030-GPIO-add-named-gpio-exports.patch
index 784786b7c87e944d84cf9765c0b678a92d073a67..03978998183f193e0cbe7d4c3e498eb349fa58fd 100644
(file)
--- a/
target/linux/lantiq/patches-4.14/0030-GPIO-add-named-gpio-exports.patch
+++ b/
target/linux/lantiq/patches-4.14/0030-GPIO-add-named-gpio-exports.patch
@@
-22,7
+22,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
#include "gpiolib.h"
#include "gpiolib.h"
-@@ -5
07,3 +509
,73 @@ void of_gpiochip_remove(struct gpio_chip
+@@ -5
13,3 +515
,73 @@ void of_gpiochip_remove(struct gpio_chip
gpiochip_remove_pin_ranges(chip);
of_node_put(chip->of_node);
}
gpiochip_remove_pin_ranges(chip);
of_node_put(chip->of_node);
}
diff --git
a/target/linux/ramips/patches-4.14/0024-GPIO-add-named-gpio-exports.patch
b/target/linux/ramips/patches-4.14/0024-GPIO-add-named-gpio-exports.patch
index da8ac96eb04c6d07b195b2644df5740f21012fcd..ee0c02ee8856fba7423dd698d8c371ca357ac6e3 100644
(file)
--- a/
target/linux/ramips/patches-4.14/0024-GPIO-add-named-gpio-exports.patch
+++ b/
target/linux/ramips/patches-4.14/0024-GPIO-add-named-gpio-exports.patch
@@
-22,7
+22,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
#include "gpiolib.h"
#include "gpiolib.h"
-@@ -5
07,3 +509
,69 @@ void of_gpiochip_remove(struct gpio_chip
+@@ -5
13,3 +515
,69 @@ void of_gpiochip_remove(struct gpio_chip
gpiochip_remove_pin_ranges(chip);
of_node_put(chip->of_node);
}
gpiochip_remove_pin_ranges(chip);
of_node_put(chip->of_node);
}