kernel: bump 6.12 to 6.12.39
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.39 All patches auto-refreshed. Signed-off-by: Leo Barsky <leobrsky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19448 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
3148a57758
commit
813470d04c
11 changed files with 20 additions and 20 deletions
|
@ -32,7 +32,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
#define USB_VENDOR_ID_BELKIN 0x050d
|
||||
#define USB_DEVICE_ID_FLIP_KVM 0x3201
|
||||
|
||||
@@ -1460,6 +1463,9 @@
|
||||
@@ -1463,6 +1466,9 @@
|
||||
#define USB_VENDOR_ID_XIAOMI 0x2717
|
||||
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|||
|
||||
--- a/drivers/irqchip/Kconfig
|
||||
+++ b/drivers/irqchip/Kconfig
|
||||
@@ -109,6 +109,14 @@ config I8259
|
||||
@@ -110,6 +110,14 @@ config I8259
|
||||
bool
|
||||
select IRQ_DOMAIN
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
drm_printf(p, "\tmode: " DRM_MODE_FMT "\n", DRM_MODE_ARG(&state->mode));
|
||||
--- a/drivers/gpu/drm/drm_framebuffer.c
|
||||
+++ b/drivers/gpu/drm/drm_framebuffer.c
|
||||
@@ -975,7 +975,7 @@ static int atomic_remove_fb(struct drm_f
|
||||
@@ -1002,7 +1002,7 @@ static int atomic_remove_fb(struct drm_f
|
||||
struct drm_connector *conn __maybe_unused;
|
||||
struct drm_connector_state *conn_state;
|
||||
int i, ret;
|
||||
|
|
|
@ -21,7 +21,7 @@ Signed-off-by: Stanimir Varbanov <svarbanov@suse.de>
|
|||
|
||||
--- a/drivers/irqchip/Kconfig
|
||||
+++ b/drivers/irqchip/Kconfig
|
||||
@@ -110,12 +110,20 @@ config I8259
|
||||
@@ -111,12 +111,20 @@ config I8259
|
||||
select IRQ_DOMAIN
|
||||
|
||||
config BCM2712_MIP
|
||||
|
|
|
@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||
+};
|
||||
--- a/drivers/irqchip/Kconfig
|
||||
+++ b/drivers/irqchip/Kconfig
|
||||
@@ -109,6 +109,10 @@ config I8259
|
||||
@@ -110,6 +110,10 @@ config I8259
|
||||
bool
|
||||
select IRQ_DOMAIN
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|||
BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
|
||||
--- a/drivers/irqchip/Kconfig
|
||||
+++ b/drivers/irqchip/Kconfig
|
||||
@@ -122,7 +122,6 @@ config BCM6345_L1_IRQ
|
||||
@@ -123,7 +123,6 @@ config BCM6345_L1_IRQ
|
||||
config BCM7038_L1_IRQ
|
||||
tristate "Broadcom STB 7038-style L1/L2 interrupt controller driver"
|
||||
depends on ARCH_BRCMSTB || BMIPS_GENERIC
|
||||
|
@ -51,7 +51,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|||
select GENERIC_IRQ_CHIP
|
||||
select IRQ_DOMAIN
|
||||
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
|
||||
@@ -130,14 +129,12 @@ config BCM7038_L1_IRQ
|
||||
@@ -131,14 +130,12 @@ config BCM7038_L1_IRQ
|
||||
config BCM7120_L2_IRQ
|
||||
tristate "Broadcom STB 7120-style L2 interrupt controller driver"
|
||||
depends on ARCH_BRCMSTB || BMIPS_GENERIC
|
||||
|
|
|
@ -469,7 +469,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||
{ PHY_ID_KSZ9131, MICREL_PHY_ID_MASK },
|
||||
--- a/drivers/net/phy/microchip.c
|
||||
+++ b/drivers/net/phy/microchip.c
|
||||
@@ -508,7 +508,7 @@ static struct phy_driver microchip_phy_d
|
||||
@@ -509,7 +509,7 @@ static struct phy_driver microchip_phy_d
|
||||
|
||||
module_phy_driver(microchip_phy_driver);
|
||||
|
||||
|
@ -579,7 +579,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||
{ PHY_ID_MATCH_MODEL(PHY_ID_TJA1102) },
|
||||
--- a/drivers/net/phy/qcom/at803x.c
|
||||
+++ b/drivers/net/phy/qcom/at803x.c
|
||||
@@ -1098,7 +1098,7 @@ static struct phy_driver at803x_driver[]
|
||||
@@ -1071,7 +1071,7 @@ static struct phy_driver at803x_driver[]
|
||||
|
||||
module_phy_driver(at803x_driver);
|
||||
|
||||
|
@ -645,7 +645,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||
};
|
||||
--- a/drivers/net/phy/smsc.c
|
||||
+++ b/drivers/net/phy/smsc.c
|
||||
@@ -837,7 +837,7 @@ MODULE_DESCRIPTION("SMSC PHY driver");
|
||||
@@ -884,7 +884,7 @@ MODULE_DESCRIPTION("SMSC PHY driver");
|
||||
MODULE_AUTHOR("Herbert Valerio Riedel");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
|
|
@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
if (!pe)
|
||||
--- a/mm/vmalloc.c
|
||||
+++ b/mm/vmalloc.c
|
||||
@@ -5066,6 +5066,9 @@ static int vmalloc_info_show(struct seq_
|
||||
@@ -5074,6 +5074,9 @@ static int vmalloc_info_show(struct seq_
|
||||
|
||||
static int __init proc_vmalloc_init(void)
|
||||
{
|
||||
|
|
|
@ -74,7 +74,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
+MODULE_LICENSE("GPL");
|
||||
--- a/kernel/sched/core.c
|
||||
+++ b/kernel/sched/core.c
|
||||
@@ -4428,6 +4428,7 @@ int wake_up_state(struct task_struct *p,
|
||||
@@ -4433,6 +4433,7 @@ int wake_up_state(struct task_struct *p,
|
||||
{
|
||||
return try_to_wake_up(p, state, 0);
|
||||
}
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
LINUX_VERSION-6.12 = .38
|
||||
LINUX_KERNEL_HASH-6.12.38 = f035fa8d83d59f793c76b23567b130cc42118f10696815fed03c16bb15670fcc
|
||||
LINUX_VERSION-6.12 = .39
|
||||
LINUX_KERNEL_HASH-6.12.39 = 6e562502a8fd11639f558e43b74f0df0d85fa85e60f5332acb275a75a35f5345
|
||||
|
|
|
@ -69,7 +69,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
|
|||
#include <dt-bindings/net/qca-ar803x.h>
|
||||
|
||||
#include "qcom.h"
|
||||
@@ -96,6 +101,8 @@
|
||||
@@ -93,6 +98,8 @@
|
||||
#define ATH8035_PHY_ID 0x004dd072
|
||||
#define AT8030_PHY_ID_MASK 0xffffffef
|
||||
|
||||
|
@ -78,7 +78,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
|
|||
#define QCA9561_PHY_ID 0x004dd042
|
||||
|
||||
#define AT803X_PAGE_FIBER 0
|
||||
@@ -108,6 +115,50 @@
|
||||
@@ -105,6 +112,50 @@
|
||||
/* disable hibernation mode */
|
||||
#define AT803X_DISABLE_HIBERNATION_MODE BIT(2)
|
||||
|
||||
|
@ -129,7 +129,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
|
|||
MODULE_DESCRIPTION("Qualcomm Atheros AR803x PHY driver");
|
||||
MODULE_AUTHOR("Matus Ujhelyi");
|
||||
MODULE_LICENSE("GPL");
|
||||
@@ -133,6 +184,11 @@ struct at803x_context {
|
||||
@@ -130,6 +181,11 @@ struct at803x_context {
|
||||
u16 led_control;
|
||||
};
|
||||
|
||||
|
@ -141,7 +141,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
|
|||
static int at803x_write_page(struct phy_device *phydev, int page)
|
||||
{
|
||||
int mask;
|
||||
@@ -987,6 +1043,105 @@ static int at8035_probe(struct phy_devic
|
||||
@@ -960,6 +1016,105 @@ static int at8035_probe(struct phy_devic
|
||||
return at8035_parse_dt(phydev);
|
||||
}
|
||||
|
||||
|
@ -247,7 +247,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
|
|||
static struct phy_driver at803x_driver[] = {
|
||||
{
|
||||
/* Qualcomm Atheros AR8035 */
|
||||
@@ -1079,6 +1234,19 @@ static struct phy_driver at803x_driver[]
|
||||
@@ -1052,6 +1207,19 @@ static struct phy_driver at803x_driver[]
|
||||
.soft_reset = genphy_soft_reset,
|
||||
.config_aneg = at803x_config_aneg,
|
||||
}, {
|
||||
|
@ -267,7 +267,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
|
|||
/* Qualcomm Atheros QCA9561 */
|
||||
PHY_ID_MATCH_EXACT(QCA9561_PHY_ID),
|
||||
.name = "Qualcomm Atheros QCA9561 built-in PHY",
|
||||
@@ -1104,6 +1272,7 @@ static const struct mdio_device_id __may
|
||||
@@ -1077,6 +1245,7 @@ static const struct mdio_device_id __may
|
||||
{ PHY_ID_MATCH_EXACT(ATH8032_PHY_ID) },
|
||||
{ PHY_ID_MATCH_EXACT(ATH8035_PHY_ID) },
|
||||
{ PHY_ID_MATCH_EXACT(ATH9331_PHY_ID) },
|
||||
|
|
Loading…
Reference in a new issue