diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-06-12 12:32:11 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-06-16 23:36:26 +0200 |
| commit | 90f930e0c2fafe7c7b0b122ae932a9a2c007aead (patch) | |
| tree | 7da73bcf0145888c7d1e6f9c43414c69312d6e0f /target/linux | |
| parent | 014c101e0b4c50c13f3c64e6c716827095afa46e (diff) | |
| download | upstream-90f930e0c2fafe7c7b0b122ae932a9a2c007aead.tar.gz upstream-90f930e0c2fafe7c7b0b122ae932a9a2c007aead.tar.bz2 upstream-90f930e0c2fafe7c7b0b122ae932a9a2c007aead.zip | |
kernel: bump 5.4 to 5.4.46
Refreshed patches.
Run tested: qemu-x86-64, wrt3200acm
Build tested: x86/64, imx6, mvebu/cortexa9, sunxi/a53
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux')
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch b/target/linux/layerscape/patches-5.4/701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch index f26850035a..38d9e0b5bd 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch @@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> struct packet_type; --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig -@@ -79,6 +79,13 @@ config NET_DSA_TAG_KSZ +@@ -80,6 +80,13 @@ config NET_DSA_TAG_KSZ Say Y if you want to enable support for tagging frames for the Microchip 8795/9477/9893 families of switches. diff --git a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch index 69e3c296ca..206826c1b2 100644 --- a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch @@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2779,6 +2779,7 @@ static const struct net_device_ops mtk_n +@@ -2784,6 +2784,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com> const __be32 *_id = of_get_property(np, "reg", NULL); struct phylink *phylink; int phy_mode, id, err; -@@ -2869,6 +2870,9 @@ static int mtk_add_mac(struct mtk_eth *e +@@ -2874,6 +2875,9 @@ static int mtk_add_mac(struct mtk_eth *e eth->netdev[id]->irq = eth->irq[0]; eth->netdev[id]->dev.of_node = np; |