diff options
| author | John Audia <graysky@archlinux.us> | 2021-11-27 14:56:33 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-28 16:32:45 +0100 |
| commit | bbdc13b15b383b8b8d5492575e0a83cbe2af139b (patch) | |
| tree | e874ca367d12c68d8cdb5392f829bd53c37563a0 /target/linux/generic/hack-5.4 | |
| parent | 26a7a385bbe2c8a258b9b845122e48935c8738c9 (diff) | |
| download | upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.gz upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.bz2 upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.zip | |
kernel: bump 5.4 to 5.4.161
Removed upstreamed:
ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch[1]
Manually rebased:
layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
All other patches automatically rebased.
1. Private email exchange with patch author, Hauke Mehrtens
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/hack-5.4')
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch index bbe43d24c2..11f1a25bce 100644 --- a/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h -@@ -615,12 +615,13 @@ extern struct Qdisc_ops noop_qdisc_ops; +@@ -617,12 +617,13 @@ extern struct Qdisc_ops noop_qdisc_ops; extern struct Qdisc_ops pfifo_fast_ops; extern struct Qdisc_ops mq_qdisc_ops; extern struct Qdisc_ops noqueue_qdisc_ops; 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 bc9b3a4783..268e9df051 100644 --- a/target/linux/generic/hack-5.4/721-phy_packets.patch +++ b/target/linux/generic/hack-5.4/721-phy_packets.patch @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3198,10 +3198,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -3200,10 +3200,20 @@ static int xmit_one(struct sk_buff *skb, if (dev_nit_active(dev)) dev_queue_xmit_nit(skb, dev); 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 ad8636b16d..9ea1afd57a 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 -@@ -1313,4 +1313,5 @@ static void __exit dma_buf_deinit(void) +@@ -1314,4 +1314,5 @@ static void __exit dma_buf_deinit(void) dma_buf_uninit_debugfs(); kern_unmount(dma_buf_mnt); } |