Skip to content

[23.05]: kernel: Update to version 5.15.180 #18012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/kernel-5.15
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .173
LINUX_KERNEL_HASH-5.15.173 = 8a4b2a47ccc9b208b2b6ed9a216ea1a5eb12852c723bec1a04de9e671a1d7da8
LINUX_VERSION-5.15 = .180
LINUX_KERNEL_HASH-5.15.180 = f51f68b8bbe60aca5e1ff3781f7e5d2ca6a31dd299c8446c39bf880bfff1cd39
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ SVN-Revision: 35130
#endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1490,8 +1490,8 @@ struct sk_buff *inet_gro_receive(struct
@@ -1488,8 +1488,8 @@ struct sk_buff *inet_gro_receive(struct
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out;

Expand Down Expand Up @@ -858,7 +858,7 @@ SVN-Revision: 35130

--- a/net/ipv4/tcp_offload.c
+++ b/net/ipv4/tcp_offload.c
@@ -226,7 +226,7 @@ struct sk_buff *tcp_gro_receive(struct l
@@ -229,7 +229,7 @@ struct sk_buff *tcp_gro_receive(struct l

th2 = tcp_hdr(p);

Expand All @@ -867,7 +867,7 @@ SVN-Revision: 35130
NAPI_GRO_CB(p)->same_flow = 0;
continue;
}
@@ -244,8 +244,8 @@ found:
@@ -247,8 +247,8 @@ found:
~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH));
flush |= (__force int)(th->ack_seq ^ th2->ack_seq);
for (i = sizeof(*th); i < thlen; i += 4)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>

--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5890,6 +5890,9 @@ int __init cgroup_init_early(void)
@@ -5889,6 +5889,9 @@ int __init cgroup_init_early(void)
return 0;
}

Expand All @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/**
* cgroup_init - cgroup initialization
*
@@ -5928,6 +5931,12 @@ int __init cgroup_init(void)
@@ -5927,6 +5930,12 @@ int __init cgroup_init(void)

mutex_unlock(&cgroup_mutex);

Expand All @@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
@@ -6520,6 +6529,10 @@ static int __init cgroup_disable(char *s
@@ -6527,6 +6536,10 @@ static int __init cgroup_disable(char *s
strcmp(token, ss->legacy_name))
continue;

Expand All @@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static_branch_disable(cgroup_subsys_enabled_key[i]);
pr_info("Disabling %s control group subsystem\n",
ss->name);
@@ -6538,6 +6551,31 @@ static int __init cgroup_disable(char *s
@@ -6545,6 +6558,31 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>

--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -2691,6 +2691,11 @@ static int lan78xx_reset(struct lan78xx_
@@ -2692,6 +2692,11 @@ static int lan78xx_reset(struct lan78xx_
int ret;
u32 buf;
u8 sig;
Expand All @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>

ret = lan78xx_read_reg(dev, HW_CFG, &buf);
if (ret < 0)
@@ -2772,6 +2777,10 @@ static int lan78xx_reset(struct lan78xx_
@@ -2773,6 +2778,10 @@ static int lan78xx_reset(struct lan78xx_

buf |= HW_CFG_MEF_;

Expand All @@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
ret = lan78xx_write_reg(dev, HW_CFG, buf);
if (ret < 0)
return ret;
@@ -2871,6 +2880,9 @@ static int lan78xx_reset(struct lan78xx_
@@ -2872,6 +2881,9 @@ static int lan78xx_reset(struct lan78xx_
buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use the same logic.

--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2752,7 +2752,12 @@ static int pl011_setup_port(struct devic
@@ -2759,7 +2759,12 @@ static int pl011_setup_port(struct devic
if (IS_ERR(base))
return PTR_ERR(base);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>

/* Clear pending error and receive interrupts */
pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
@@ -2448,7 +2465,7 @@ static int pl011_console_setup(struct co
@@ -2455,7 +2472,7 @@ static int pl011_console_setup(struct co
plat->init();
}

Expand All @@ -68,15 +68,15 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>

if (uap->vendor->fixed_options) {
baud = uap->fixed_baud;
@@ -2665,6 +2682,7 @@ static struct uart_driver amba_reg = {
@@ -2672,6 +2689,7 @@ static struct uart_driver amba_reg = {
.cons = AMBA_CONSOLE,
};

+#if 0
static int pl011_probe_dt_alias(int index, struct device *dev)
{
struct device_node *np;
@@ -2696,6 +2714,7 @@ static int pl011_probe_dt_alias(int inde
@@ -2703,6 +2721,7 @@ static int pl011_probe_dt_alias(int inde

return ret;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
- reg
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2843,6 +2843,11 @@ static int pl011_probe(struct amba_devic
@@ -2850,6 +2850,11 @@ static int pl011_probe(struct amba_devic
if (IS_ERR(uap->clk))
return PTR_ERR(uap->clk);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
}
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -5677,7 +5677,7 @@ static void port_event(struct usb_hub *h
@@ -5689,7 +5689,7 @@ static void port_event(struct usb_hub *h
port_dev->over_current_count++;
port_over_current_notify(port_dev);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14196,7 +14196,7 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
config SND_SOC_TFA989X
tristate "NXP/Goodix TFA989X (TFA1) amplifiers"
depends on I2C
@@ -1944,4 +1962,8 @@ config SND_SOC_LPASS_TX_MACRO
@@ -1945,4 +1963,8 @@ config SND_SOC_LPASS_TX_MACRO
select REGMAP_MMIO
tristate "Qualcomm TX Macro in LPASS(Low Power Audio SubSystem)"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>

--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -2936,6 +2936,22 @@ static int lan78xx_open(struct net_devic
@@ -2937,6 +2937,22 @@ static int lan78xx_open(struct net_devic

netif_dbg(dev, ifup, dev->net, "phy initialised successfully");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
{
u32 *buf;
@@ -3265,8 +3274,14 @@ static int lan78xx_bind(struct lan78xx_n
@@ -3266,8 +3275,14 @@ static int lan78xx_bind(struct lan78xx_n
if (DEFAULT_RX_CSUM_ENABLE)
dev->net->features |= NETIF_F_RXCSUM;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>

--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -2252,6 +2252,22 @@ static int lan78xx_phy_init(struct lan78
@@ -2253,6 +2253,22 @@ static int lan78xx_phy_init(struct lan78
mii_adv_to_linkmode_adv_t(fc, mii_adv);
linkmode_or(phydev->advertising, fc, phydev->advertising);

Expand All @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if (phydev->mdio.dev.of_node) {
u32 reg;
int len;
@@ -2945,22 +2961,6 @@ static int lan78xx_open(struct net_devic
@@ -2946,22 +2962,6 @@ static int lan78xx_open(struct net_devic

netif_dbg(dev, ifup, dev->net, "phy initialised successfully");

Expand Down
Loading
Loading