diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-03-04 19:51:39 +0000 |
---|---|---|
committer | David Bauer <mail@david-bauer.net> | 2021-03-05 20:35:01 +0100 |
commit | 3a187fa71835051d71dcc47ef151e4e61c12b6b0 (patch) | |
tree | 30f6a11c0547238e3df6b103eccea652b2289908 /target/linux/mvebu | |
parent | dc416983bb45f040700612891a9c46ca92e027ff (diff) | |
download | upstream-3a187fa71835051d71dcc47ef151e4e61c12b6b0.tar.gz upstream-3a187fa71835051d71dcc47ef151e4e61c12b6b0.tar.bz2 upstream-3a187fa71835051d71dcc47ef151e4e61c12b6b0.zip |
kernel: bump 5.10 to 5.10.20
Also add a new kconfig symbol (CONFIG_KCMP) to the generic config,
disabling the SYS_kcmp syscall (it was split from
CONFIG_CHECKPOINT_RESTORE, which is disabled by default, so the
previous behaviour is kept).
Removed (upstreamed) patches:
070-net-icmp-pass-zeroed-opts-from-icmp-v6-_ndo_send-bef.patch
081-wireguard-device-do-not-generate-ICMP-for-non-IP-pac.patch
082-wireguard-queueing-get-rid-of-per-peer-ring-buffers.patch
083-wireguard-kconfig-use-arm-chacha-even-with-no-neon.patch
830-v5.12-0002-usb-serial-option-update-interface-mapping-for-ZTE-P685M.patch
Manually rebased patches:
313-helios4-dts-status-led-alias.patch
104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch
Run tested:
ath79 (TL-WDR3600)
mvebu (Turris Omnia)
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/mvebu')
-rw-r--r-- | target/linux/mvebu/patches-5.10/313-helios4-dts-status-led-alias.patch | 6 | ||||
-rw-r--r-- | target/linux/mvebu/patches-5.10/700-mvneta-tx-queue-workaround.patch | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mvebu/patches-5.10/313-helios4-dts-status-led-alias.patch b/target/linux/mvebu/patches-5.10/313-helios4-dts-status-led-alias.patch index 4c4fbec764..607f436297 100644 --- a/target/linux/mvebu/patches-5.10/313-helios4-dts-status-led-alias.patch +++ b/target/linux/mvebu/patches-5.10/313-helios4-dts-status-led-alias.patch @@ -14,10 +14,10 @@ memory { device_type = "memory"; -@@ -70,10 +77,9 @@ +@@ -73,10 +80,9 @@ + pinctrl-names = "default"; + pinctrl-0 = <&helios_system_led_pins>; - system-leds { - compatible = "gpio-leds"; - status-led { + led_status: status-led { label = "helios4:green:status"; diff --git a/target/linux/mvebu/patches-5.10/700-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-5.10/700-mvneta-tx-queue-workaround.patch index 2e840fd787..da4705d90d 100644 --- a/target/linux/mvebu/patches-5.10/700-mvneta-tx-queue-workaround.patch +++ b/target/linux/mvebu/patches-5.10/700-mvneta-tx-queue-workaround.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -4896,6 +4896,14 @@ static int mvneta_ethtool_set_eee(struct +@@ -4903,6 +4903,14 @@ static int mvneta_ethtool_set_eee(struct return phylink_ethtool_set_eee(pp->phylink, eee); } @@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static const struct net_device_ops mvneta_netdev_ops = { .ndo_open = mvneta_open, .ndo_stop = mvneta_stop, -@@ -4906,6 +4914,7 @@ static const struct net_device_ops mvnet +@@ -4913,6 +4921,7 @@ static const struct net_device_ops mvnet .ndo_fix_features = mvneta_fix_features, .ndo_get_stats64 = mvneta_get_stats64, .ndo_do_ioctl = mvneta_ioctl, |