diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-01-14 14:44:24 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-01-20 13:44:38 +0100 |
| commit | 891bba8f77192aec9d3e4d50a17525c33efd873a (patch) | |
| tree | faf63ad97444a87dad12b801d25df0856b82a62f | |
| parent | ab9d1bf608170c17dd8a372bc42806b9703a20ce (diff) | |
| download | upstream-891bba8f77192aec9d3e4d50a17525c33efd873a.tar.gz upstream-891bba8f77192aec9d3e4d50a17525c33efd873a.tar.bz2 upstream-891bba8f77192aec9d3e4d50a17525c33efd873a.zip | |
kernel: bump 4.9 to 4.9.209
Refreshed all patches.
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
4 files changed, 5 insertions, 5 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 88649e6309..d9ade32942 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,10 +2,10 @@ LINUX_RELEASE?=1 -LINUX_VERSION-4.9 = .208 +LINUX_VERSION-4.9 = .209 LINUX_VERSION-4.14 = .162 -LINUX_KERNEL_HASH-4.9.208 = b7ad1c9841d671d026c55a4c91c77205f8b488ca5f980f838591c68662e0525a +LINUX_KERNEL_HASH-4.9.209 = 0258d5bef915fddcdd584a26ae91bafa996d7e400e725d36329ee44041aa59e1 LINUX_KERNEL_HASH-4.14.162 = f65170224cd4359ce8b2793b492bd8127abdd0b91350484e001bce13f0c98b4b remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(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 6008be38d3..3e367589f9 100644 --- a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch @@ -795,7 +795,7 @@ --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3926,14 +3926,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3929,14 +3929,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch b/target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch index c5d65b7105..b553dfaa3f 100644 --- a/target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch +++ b/target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch @@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int eth_gro_complete(struct sk_buff *skb, int nhoff); --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c -@@ -391,6 +391,34 @@ struct net_device *alloc_etherdev_mqs(in +@@ -396,6 +396,34 @@ struct net_device *alloc_etherdev_mqs(in } EXPORT_SYMBOL(alloc_etherdev_mqs); diff --git a/target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch b/target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch index 52dfced2b8..473990ddaa 100644 --- a/target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch @@ -345,7 +345,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> #define PROT_SECT_NORMAL (PROT_SECT_DEFAULT | PMD_SECT_PXN | PMD_SECT_UXN | PMD_ATTRINDX(MT_NORMAL)) --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h -@@ -370,6 +370,11 @@ static inline int pmd_protnone(pmd_t pmd +@@ -366,6 +366,11 @@ static inline int pmd_protnone(pmd_t pmd __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN) #define pgprot_writecombine(prot) \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN) |