diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-06-15 14:21:04 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-06-15 14:26:41 +0200 |
commit | 287303b0628b7b448cb7705b087ece7fbc5b97c3 (patch) | |
tree | 8e74973039d5d30f61f1b25f9b3202ec0900f361 /target/linux/generic/backport-5.10/610-v5.13-27-netfilter-flowtable-bridge-vlan-hardware-offload-and.patch | |
parent | 920f2d92375de88151d8f836bdc778be85c7b552 (diff) | |
download | upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.gz upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.bz2 upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.zip |
kernel: bump 5.10 to 5.10.184
Manually rebased:
generic/pending-5.10/851-0004-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch
All other patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.10/610-v5.13-27-netfilter-flowtable-bridge-vlan-hardware-offload-and.patch')
-rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-27-netfilter-flowtable-bridge-vlan-hardware-offload-and.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-27-netfilter-flowtable-bridge-vlan-hardware-offload-and.patch b/target/linux/generic/backport-5.10/610-v5.13-27-netfilter-flowtable-bridge-vlan-hardware-offload-and.patch index 08c92d731a..f05386ccb5 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-27-netfilter-flowtable-bridge-vlan-hardware-offload-and.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-27-netfilter-flowtable-bridge-vlan-hardware-offload-and.patch @@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -872,6 +872,7 @@ struct net_device_path { +@@ -875,6 +875,7 @@ struct net_device_path { DEV_PATH_BR_VLAN_KEEP, DEV_PATH_BR_VLAN_TAG, DEV_PATH_BR_VLAN_UNTAG, |