kernel: bump 6.6 to 6.6.19 (#11933)

This commit is contained in:
Beginner 2024-03-02 15:25:33 +08:00 committed by GitHub
parent e15446b4ce
commit ca1355ce87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 20 additions and 20 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .18 LINUX_VERSION-6.6 = .19
LINUX_KERNEL_HASH-6.6.18 = 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d LINUX_KERNEL_HASH-6.6.19 = b5637e6b72c2b4b12e7db790bc155d141a9c2fe4b25f7b215410107e8747139a

View File

@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/nf_tables_api.c --- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c
@@ -8210,7 +8210,7 @@ static int nft_register_flowtable_net_ho @@ -8213,7 +8213,7 @@ static int nft_register_flowtable_net_ho
err = flowtable->data.type->setup(&flowtable->data, err = flowtable->data.type->setup(&flowtable->data,
hook->ops.dev, hook->ops.dev,
FLOW_BLOCK_BIND); FLOW_BLOCK_BIND);

View File

@ -39,7 +39,7 @@ Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
#define RTL8366RB_POWER_SAVE 0x15 #define RTL8366RB_POWER_SAVE 0x15
#define RTL8366RB_POWER_SAVE_ON BIT(12) #define RTL8366RB_POWER_SAVE_ON BIT(12)
@@ -877,6 +886,43 @@ static irqreturn_t rtl9000a_handle_inter @@ -879,6 +888,43 @@ static irqreturn_t rtl9000a_handle_inter
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -83,7 +83,7 @@ Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
static struct phy_driver realtek_drvs[] = { static struct phy_driver realtek_drvs[] = {
{ {
PHY_ID_MATCH_EXACT(0x00008201), PHY_ID_MATCH_EXACT(0x00008201),
@@ -1031,6 +1077,7 @@ static struct phy_driver realtek_drvs[] @@ -1033,6 +1079,7 @@ static struct phy_driver realtek_drvs[]
PHY_ID_MATCH_EXACT(0x001cc849), PHY_ID_MATCH_EXACT(0x001cc849),
.name = "RTL8221B-VB-CG 2.5Gbps PHY", .name = "RTL8221B-VB-CG 2.5Gbps PHY",
.get_features = rtl822x_get_features, .get_features = rtl822x_get_features,
@ -91,7 +91,7 @@ Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
.config_aneg = rtl822x_config_aneg, .config_aneg = rtl822x_config_aneg,
.read_status = rtl822x_read_status, .read_status = rtl822x_read_status,
.suspend = genphy_suspend, .suspend = genphy_suspend,
@@ -1042,6 +1089,7 @@ static struct phy_driver realtek_drvs[] @@ -1044,6 +1091,7 @@ static struct phy_driver realtek_drvs[]
.name = "RTL8221B-VM-CG 2.5Gbps PHY", .name = "RTL8221B-VM-CG 2.5Gbps PHY",
.get_features = rtl822x_get_features, .get_features = rtl822x_get_features,
.config_aneg = rtl822x_config_aneg, .config_aneg = rtl822x_config_aneg,

View File

@ -16,7 +16,7 @@ Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
--- a/drivers/net/phy/realtek.c --- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c
@@ -712,6 +712,25 @@ static int rtl822x_config_aneg(struct ph @@ -714,6 +714,25 @@ static int rtl822x_config_aneg(struct ph
return __genphy_config_aneg(phydev, ret); return __genphy_config_aneg(phydev, ret);
} }
@ -42,7 +42,7 @@ Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
static int rtl822x_read_status(struct phy_device *phydev) static int rtl822x_read_status(struct phy_device *phydev)
{ {
int ret; int ret;
@@ -730,11 +749,14 @@ static int rtl822x_read_status(struct ph @@ -732,11 +751,14 @@ static int rtl822x_read_status(struct ph
phydev->lp_advertising, lpadv & RTL_LPADV_2500FULL); phydev->lp_advertising, lpadv & RTL_LPADV_2500FULL);
} }

View File

@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/net/phy/realtek.c --- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c
@@ -1063,6 +1063,7 @@ static struct phy_driver realtek_drvs[] @@ -1065,6 +1065,7 @@ static struct phy_driver realtek_drvs[]
.write_page = rtl821x_write_page, .write_page = rtl821x_write_page,
.read_mmd = rtl822x_read_mmd, .read_mmd = rtl822x_read_mmd,
.write_mmd = rtl822x_write_mmd, .write_mmd = rtl822x_write_mmd,
@ -23,7 +23,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
}, { }, {
PHY_ID_MATCH_EXACT(0x001cc840), PHY_ID_MATCH_EXACT(0x001cc840),
.name = "RTL8226B_RTL8221B 2.5Gbps PHY", .name = "RTL8226B_RTL8221B 2.5Gbps PHY",
@@ -1075,6 +1076,7 @@ static struct phy_driver realtek_drvs[] @@ -1077,6 +1078,7 @@ static struct phy_driver realtek_drvs[]
.write_page = rtl821x_write_page, .write_page = rtl821x_write_page,
.read_mmd = rtl822x_read_mmd, .read_mmd = rtl822x_read_mmd,
.write_mmd = rtl822x_write_mmd, .write_mmd = rtl822x_write_mmd,
@ -31,7 +31,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
}, { }, {
PHY_ID_MATCH_EXACT(0x001cc838), PHY_ID_MATCH_EXACT(0x001cc838),
.name = "RTL8226-CG 2.5Gbps PHY", .name = "RTL8226-CG 2.5Gbps PHY",
@@ -1085,6 +1087,7 @@ static struct phy_driver realtek_drvs[] @@ -1087,6 +1089,7 @@ static struct phy_driver realtek_drvs[]
.resume = rtlgen_resume, .resume = rtlgen_resume,
.read_page = rtl821x_read_page, .read_page = rtl821x_read_page,
.write_page = rtl821x_write_page, .write_page = rtl821x_write_page,
@ -39,7 +39,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
}, { }, {
PHY_ID_MATCH_EXACT(0x001cc848), PHY_ID_MATCH_EXACT(0x001cc848),
.name = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY", .name = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY",
@@ -1095,6 +1098,7 @@ static struct phy_driver realtek_drvs[] @@ -1097,6 +1100,7 @@ static struct phy_driver realtek_drvs[]
.resume = rtlgen_resume, .resume = rtlgen_resume,
.read_page = rtl821x_read_page, .read_page = rtl821x_read_page,
.write_page = rtl821x_write_page, .write_page = rtl821x_write_page,
@ -47,7 +47,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
}, { }, {
PHY_ID_MATCH_EXACT(0x001cc849), PHY_ID_MATCH_EXACT(0x001cc849),
.name = "RTL8221B-VB-CG 2.5Gbps PHY", .name = "RTL8221B-VB-CG 2.5Gbps PHY",
@@ -1106,6 +1110,7 @@ static struct phy_driver realtek_drvs[] @@ -1108,6 +1112,7 @@ static struct phy_driver realtek_drvs[]
.resume = rtlgen_resume, .resume = rtlgen_resume,
.read_page = rtl821x_read_page, .read_page = rtl821x_read_page,
.write_page = rtl821x_write_page, .write_page = rtl821x_write_page,
@ -55,7 +55,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
}, { }, {
PHY_ID_MATCH_EXACT(0x001cc84a), PHY_ID_MATCH_EXACT(0x001cc84a),
.name = "RTL8221B-VM-CG 2.5Gbps PHY", .name = "RTL8221B-VM-CG 2.5Gbps PHY",
@@ -1117,6 +1122,7 @@ static struct phy_driver realtek_drvs[] @@ -1119,6 +1124,7 @@ static struct phy_driver realtek_drvs[]
.resume = rtlgen_resume, .resume = rtlgen_resume,
.read_page = rtl821x_read_page, .read_page = rtl821x_read_page,
.write_page = rtl821x_write_page, .write_page = rtl821x_write_page,

View File

@ -19,7 +19,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/net/phy/realtek.c --- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c
@@ -911,6 +911,7 @@ static irqreturn_t rtl9000a_handle_inter @@ -913,6 +913,7 @@ static irqreturn_t rtl9000a_handle_inter
static int rtl8221b_config_init(struct phy_device *phydev) static int rtl8221b_config_init(struct phy_device *phydev)
{ {
u16 option_mode; u16 option_mode;
@ -27,7 +27,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
switch (phydev->interface) { switch (phydev->interface) {
case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_SGMII:
@@ -942,6 +943,13 @@ static int rtl8221b_config_init(struct p @@ -944,6 +945,13 @@ static int rtl8221b_config_init(struct p
break; break;
} }

View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/** /**
* ata_build_rw_tf - Build ATA taskfile for given read/write request * ata_build_rw_tf - Build ATA taskfile for given read/write request
* @qc: Metadata associated with the taskfile to build * @qc: Metadata associated with the taskfile to build
@@ -4767,6 +4780,9 @@ void __ata_qc_complete(struct ata_queued @@ -4771,6 +4784,9 @@ void __ata_qc_complete(struct ata_queued
link->active_tag = ATA_TAG_POISON; link->active_tag = ATA_TAG_POISON;
ap->nr_active_links--; ap->nr_active_links--;
} }
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/* clear exclusive status */ /* clear exclusive status */
if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL && if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL &&
@@ -5490,6 +5506,9 @@ struct ata_port *ata_port_alloc(struct a @@ -5494,6 +5510,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1; ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1; ap->stats.idle_irq = 1;
#endif #endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap); ata_sff_port_init(ap);
return ap; return ap;
@@ -5526,6 +5545,12 @@ static void ata_host_release(struct kref @@ -5530,6 +5549,12 @@ static void ata_host_release(struct kref
kfree(ap->pmp_link); kfree(ap->pmp_link);
kfree(ap->slave_link); kfree(ap->slave_link);
kfree(ap->ncq_sense_buf); kfree(ap->ncq_sense_buf);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap); kfree(ap);
host->ports[i] = NULL; host->ports[i] = NULL;
} }
@@ -5916,7 +5941,23 @@ int ata_host_register(struct ata_host *h @@ -5920,7 +5945,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1; host->ports[i]->local_port_no = i + 1;
} }