Skip to content

Commit

Permalink
Revert "kernel: bump 5.10 to 5.10.58 (#7649)" (#7687)
Browse files Browse the repository at this point in the history
This reverts commit 988ddf5.
  • Loading branch information
asushugo committed Aug 16, 2021
1 parent 0dc87d2 commit e71ffdf
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 65 deletions.
4 changes: 2 additions & 2 deletions include/kernel-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif

LINUX_VERSION-5.4 = .138
LINUX_VERSION-5.10 = .58
LINUX_VERSION-5.10 = .57

LINUX_KERNEL_HASH-5.4.138 = a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657
LINUX_KERNEL_HASH-5.10.58 = 732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
LINUX_KERNEL_HASH-5.10.57 = 00bbaeaac17f82d9a6d93cbc42cafd39d3b2fa3a6087333503d2344fa5e3142d

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
Expand Down
11 changes: 0 additions & 11 deletions target/linux/generic/hack-5.10/205-kconfig-exit.patch

This file was deleted.

2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3049,6 +3049,7 @@ int wake_up_state(struct task_struct *p,
@@ -3051,6 +3051,7 @@ int wake_up_state(struct task_struct *p,
{
return try_to_wake_up(p, state, 0);
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ Signed-off-by: John Crispin <[email protected]>
netif_trans_update(dev);
netif_wake_queue(dev);
return;
@@ -618,14 +822,18 @@ static const struct net_device_ops ltq_e
@@ -618,14 +822,19 @@ static const struct net_device_ops ltq_e
.ndo_tx_timeout = ltq_etop_tx_timeout,
};

Expand All @@ -733,6 +733,7 @@ Signed-off-by: John Crispin <[email protected]>
struct ltq_etop_priv *priv;
- struct resource *res;
+ struct resource *res, *gbit_res, irqres[2];
+ const u8 *mac;
int err;
- int i;
+
Expand All @@ -744,7 +745,7 @@ Signed-off-by: John Crispin <[email protected]>

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
@@ -651,31 +859,62 @@ ltq_etop_probe(struct platform_device *p
@@ -651,31 +860,64 @@ ltq_etop_probe(struct platform_device *p
goto err_out;
}

Expand Down Expand Up @@ -784,7 +785,9 @@ Signed-off-by: John Crispin <[email protected]>
+ if (err)
+ pr_err("Can't find phy-mode for port\n");
+
+ of_get_mac_address(pdev->dev.of_node, priv->mac);
+ mac = of_get_mac_address(pdev->dev.of_node);
+ if (mac)
+ memcpy(priv->mac, mac, ETH_ALEN);
+
+ priv->clk_ppe = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(priv->clk_ppe))
Expand Down Expand Up @@ -822,7 +825,7 @@ Signed-off-by: John Crispin <[email protected]>

err = register_netdev(dev);
if (err)
@@ -704,31 +943,22 @@ ltq_etop_remove(struct platform_device *
@@ -704,31 +946,22 @@ ltq_etop_remove(struct platform_device *
return 0;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
[PORT_NPCM] = {
.name = "Nuvoton 16550",
@@ -2718,6 +2718,11 @@ serial8250_do_set_termios(struct uart_po
@@ -2712,6 +2712,11 @@ serial8250_do_set_termios(struct uart_po
unsigned long flags;
unsigned int baud, quot, frac = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,21 @@ Tested-by: Johannes Kimmel <[email protected]>
Signed-off-by: Roman Kuzmitskii <[email protected]>
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -407,8 +407,12 @@ static int cvm_oct_common_set_mac_addres
int cvm_oct_common_init(struct net_device *dev)
@@ -408,9 +408,12 @@ int cvm_oct_common_init(struct net_devic
{
struct octeon_ethernet *priv = netdev_priv(dev);
const u8 *mac = NULL;
+ const u8 *label = NULL;
int ret;

+ if (priv->of_node)
- if (priv->of_node)
+ if (priv->of_node) {
mac = of_get_mac_address(priv->of_node);
+ label = of_get_property(priv->of_node, "label", NULL);
+
ret = of_get_mac_address(priv->of_node, dev->dev_addr);
if (ret)
eth_hw_addr_random(dev);
@@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic
+ }

if (!IS_ERR_OR_NULL(mac))
ether_addr_copy(dev->dev_addr, mac);
@@ -445,6 +448,9 @@ int cvm_oct_common_init(struct net_devic
if (dev->netdev_ops->ndo_stop)
dev->netdev_ops->ndo_stop(dev);

Expand Down

0 comments on commit e71ffdf

Please sign in to comment.