diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-06 19:29:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-07 01:10:53 +0100 |
commit | 0b7311300b01d9975e9996327ee469e4f66fb2ec (patch) | |
tree | 69c7696ae97c3478df893c55458759a8dc0032ba /target/linux/generic/hack-5.4 | |
parent | 2f04012b20515eec74563de74d0528e603aa6f89 (diff) | |
download | upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.gz upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.bz2 upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.zip |
kernel: bump 5.4 to 5.4.158
Removed upstreamed:
generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-5.4')
-rw-r--r-- | target/linux/generic/hack-5.4/220-gc_sections.patch | 2 | ||||
-rw-r--r-- | target/linux/generic/hack-5.4/721-phy_packets.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.4/220-gc_sections.patch b/target/linux/generic/hack-5.4/220-gc_sections.patch index 6207eb0ec9..fdfaf51406 100644 --- a/target/linux/generic/hack-5.4/220-gc_sections.patch +++ b/target/linux/generic/hack-5.4/220-gc_sections.patch @@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -111,6 +111,7 @@ config ARM +@@ -112,6 +112,7 @@ config ARM select HAVE_UID16 select HAVE_VIRT_CPU_ACCOUNTING_GEN select IRQ_FORCED_THREADING 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 836fc54ba2..bc9b3a4783 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 -@@ -3192,10 +3192,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -3198,10 +3198,20 @@ static int xmit_one(struct sk_buff *skb, if (dev_nit_active(dev)) dev_queue_xmit_nit(skb, dev); |