aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2023-08-11 15:09:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2023-08-11 22:19:43 +0200
commitf6b6d4b2f0cb3ba12c18d5a89560fb658a954d22 (patch)
treef59bdeda00a83c78cc46d0cad2b33114e3c67378 /target/linux/generic/pending-5.10
parent77f7f697391b93dcde6817749589fa33e493588e (diff)
downloadupstream-f6b6d4b2f0cb3ba12c18d5a89560fb658a954d22.tar.gz
upstream-f6b6d4b2f0cb3ba12c18d5a89560fb658a954d22.tar.bz2
upstream-f6b6d4b2f0cb3ba12c18d5a89560fb658a954d22.zip
kernel: bump 5.10 to 5.10.188
Manually rebased: bcm27xx/patches-5.10/950-0355-xhci-quirks-add-link-TRB-quirk-for-VL805.patch bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch Removed because already in upstream: bcm53xx/patches-5.10/039-v6.5-0003-ARM-dts-BCM5301X-Drop-clock-names-from-the-SPI-node.patch bcm53xx/patches-5.10/039-v6.5-0015-ARM-dts-BCM5301X-fix-duplex-full-full-duplex.patch generic/backport-5.10/765-v6.5-net-bgmac-postpone-turning-IRQs-off-to-avoid-SoC-han.patch All other patches automatically rebased. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.10')
-rw-r--r--target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
index eb0478e0c6..c1351ba6a2 100644
--- a/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
+++ b/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
@@ -164,7 +164,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct rtnl_link {
rtnl_doit_func doit;
-@@ -4684,7 +4684,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -4690,7 +4690,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
brport_nla_put_flag(skb, flags, mask,
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
brport_nla_put_flag(skb, flags, mask,