diff options
| author | John Audia <graysky@archlinux.us> | 2020-10-01 09:22:00 -0400 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-10-02 22:02:26 +0200 |
| commit | d6a9a92e32177e8236812045d09deacc4e36be26 (patch) | |
| tree | b42a2c4eea5d7d8e126a4cfeb45e572578ea6522 /target/linux/generic/hack-5.4 | |
| parent | 2d72671b6e7469dbc5b2e79cb1be77c4e13a9c92 (diff) | |
| download | openwrt-d6a9a92e32177e8236812045d09deacc4e36be26.tar.gz openwrt-d6a9a92e32177e8236812045d09deacc4e36be26.tar.bz2 openwrt-d6a9a92e32177e8236812045d09deacc4e36be26.zip | |
kernel: bump 5.4 to 5.4.69
Seemingly unneeded based on new upstream code so manually deleted:
layerscape:
820-usb-0007-usb-dwc3-gadget-increase-timeout-value-for-send-ep-c.patch
Manually merged:
generic-hack:
251-sound_kconfig.patch
All other modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711
Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[add lantiq test report, minor commit message clarification]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/generic/hack-5.4')
5 files changed, 7 insertions, 6 deletions
diff --git a/target/linux/generic/hack-5.4/251-sound_kconfig.patch b/target/linux/generic/hack-5.4/251-sound_kconfig.patch index bcc6e5476b..f593417c9d 100644 --- a/target/linux/generic/hack-5.4/251-sound_kconfig.patch +++ b/target/linux/generic/hack-5.4/251-sound_kconfig.patch @@ -156,7 +156,7 @@ Signed-off-by: John Crispin <john@phrozen.org> default n help This options enables a library of common routines used -@@ -212,16 +212,16 @@ config LIB80211 +@@ -212,17 +212,17 @@ config LIB80211 Drivers should select this themselves if needed. config LIB80211_CRYPT_WEP @@ -167,6 +167,7 @@ Signed-off-by: John Crispin <john@phrozen.org> config LIB80211_CRYPT_CCMP - tristate + tristate "LIB80211_CRYPT_CCMP" + select CRYPTO select CRYPTO_AES select CRYPTO_CCM diff --git a/target/linux/generic/hack-5.4/259-regmap_dynamic.patch b/target/linux/generic/hack-5.4/259-regmap_dynamic.patch index 185926468d..812e182467 100644 --- a/target/linux/generic/hack-5.4/259-regmap_dynamic.patch +++ b/target/linux/generic/hack-5.4/259-regmap_dynamic.patch @@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <linux/mutex.h> #include <linux/err.h> #include <linux/of.h> -@@ -3117,3 +3118,5 @@ static int __init regmap_initcall(void) +@@ -3118,3 +3119,5 @@ static int __init regmap_initcall(void) return 0; } postcore_initcall(regmap_initcall); diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch index ed18da9e0c..407597c896 100644 --- a/target/linux/generic/hack-5.4/721-phy_packets.patch +++ b/target/linux/generic/hack-5.4/721-phy_packets.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2667,6 +2667,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2679,6 +2679,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2798,16 +2802,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2810,16 +2814,6 @@ static inline struct sk_buff *dev_alloc_ } diff --git a/target/linux/generic/hack-5.4/902-debloat_proc.patch b/target/linux/generic/hack-5.4/902-debloat_proc.patch index a2a7e1eefe..19926866a6 100644 --- a/target/linux/generic/hack-5.4/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.4/902-debloat_proc.patch @@ -396,7 +396,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -408,6 +408,9 @@ static struct pernet_operations ip_rt_pr +@@ -409,6 +409,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) { diff --git a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch index 7c768c6a7e..3216d20157 100644 --- a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch @@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> selftest.o \ --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c -@@ -1298,4 +1298,5 @@ static void __exit dma_buf_deinit(void) +@@ -1300,4 +1300,5 @@ static void __exit dma_buf_deinit(void) dma_buf_uninit_debugfs(); kern_unmount(dma_buf_mnt); } |