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:
2163b49
)
kernel: bump 4.9 to 4.9.130
author
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Tue, 2 Oct 2018 09:13:48 +0000
(11:13 +0200)
committer
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Tue, 2 Oct 2018 11:44:45 +0000
(13:44 +0200)
Refreshed all patches.
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
include/kernel-version.mk
patch
|
blob
|
history
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
patch
|
blob
|
history
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
patch
|
blob
|
history
target/linux/layerscape/patches-4.9/702-pci-support-layerscape.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 988bdb49a53d03d1abd91a2e021de74739d8d2be..db6c87f6a2ab1c55dec8c94898e77a95ddc3e635 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-2,11
+2,11
@@
LINUX_RELEASE?=1
LINUX_RELEASE?=1
-LINUX_VERSION-4.9 = .129
LINUX_VERSION-4.14 = .72
LINUX_VERSION-4.14 = .72
+LINUX_VERSION-4.9 = .130
-LINUX_KERNEL_HASH-4.9.129 = 6f5510d3fcfec1bf1e2d9c8e2fdcd7628c1886c6bdb29092adc5ccdf75e39318
LINUX_KERNEL_HASH-4.14.72 = df925906250bbc40fcf0137d7ad0fb8edc528d926832634f1233b7540564557f
LINUX_KERNEL_HASH-4.14.72 = df925906250bbc40fcf0137d7ad0fb8edc528d926832634f1233b7540564557f
+LINUX_KERNEL_HASH-4.9.130 = 60db3e6a8b00230d5a7c0c8907ef6876702e99c89980bb624f7b649b638b0a7f
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/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
index 5c2a435c9f45debf4025d0e080e6f08fcf686560..049ee78d339b194eb8c0cb1e680a030eb448fa16 100644
(file)
--- a/
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
+++ b/
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
@@
-303,7
+303,7
@@
#endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
#endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
-@@ -131
8,8 +1318
,8 @@ struct sk_buff **inet_gro_receive(struct
+@@ -131
9,8 +1319
,8 @@ struct sk_buff **inet_gro_receive(struct
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock;
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock;
@@
-567,7
+567,7
@@
goto next_ht;
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
goto next_ht;
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
-@@ -22
0,7 +220
,7 @@ static struct sk_buff **ipv6_gro_receive
+@@ -22
1,7 +221
,7 @@ static struct sk_buff **ipv6_gro_receive
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
diff --git
a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
index 393c4524e4d28df16a3af2e77fa0d21bd565472f..90a158ec82eb63c2bd9d602b502ed7f2c01051a7 100644
(file)
--- a/
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
+++ b/
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
@@
-1379,7
+1379,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
*/
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
*/
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
-@@ -10
64,7 +1064
,7 @@ err:
+@@ -10
70,7 +1070
,7 @@ err:
if (work_done < budget) {
int more_to_do = 0;
if (work_done < budget) {
int more_to_do = 0;
diff --git
a/target/linux/layerscape/patches-4.9/702-pci-support-layerscape.patch
b/target/linux/layerscape/patches-4.9/702-pci-support-layerscape.patch
index 03c3fb7cb98430df44c64f15b1e4ca1a733629c0..7ed375e094ee309c123bf58b7ce91488a9de3485 100644
(file)
--- a/
target/linux/layerscape/patches-4.9/702-pci-support-layerscape.patch
+++ b/
target/linux/layerscape/patches-4.9/702-pci-support-layerscape.patch
@@
-2060,7
+2060,7
@@
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
}
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
}
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -467
9,3 +4679
,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
+@@ -467
3,3 +4673
,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);