提交 4b3e3c3f 编写于 作者: J John Audia 提交者: Hauke Mehrtens

kernel: bump 6.1 to 6.1.47

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.47

All patches automatically rebased.

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne
Signed-off-by: NJohn Audia <therealgraysky@proton.me>
上级 adcd0326
LINUX_VERSION-6.1 = .46 LINUX_VERSION-6.1 = .47
LINUX_KERNEL_HASH-6.1.46 = f5f67bcfccd47f8d9db2d5ba24e33af7778f40a777577d1fba424f4a1712a296 LINUX_KERNEL_HASH-6.1.47 = 93d58b6af007a5f44dd26831ff310707deb1ab9380c5136a534287eb3fddfcab
...@@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> ...@@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
static inline int mmc_blk_part_switch(struct mmc_card *card, static inline int mmc_blk_part_switch(struct mmc_card *card,
unsigned int part_type); unsigned int part_type);
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
@@ -2969,6 +2976,8 @@ static int mmc_blk_probe(struct mmc_card @@ -2970,6 +2977,8 @@ static int mmc_blk_probe(struct mmc_card
{ {
struct mmc_blk_data *md; struct mmc_blk_data *md;
int ret = 0; int ret = 0;
...@@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> ...@@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
/* /*
* Check that the card supports the command class(es) we need. * Check that the card supports the command class(es) we need.
@@ -2976,7 +2985,16 @@ static int mmc_blk_probe(struct mmc_card @@ -2977,7 +2986,16 @@ static int mmc_blk_probe(struct mmc_card
if (!(card->csd.cmdclass & CCC_BLOCK_READ)) if (!(card->csd.cmdclass & CCC_BLOCK_READ))
return -ENODEV; return -ENODEV;
...@@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> ...@@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
card->complete_wq = alloc_workqueue("mmc_complete", card->complete_wq = alloc_workqueue("mmc_complete",
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
@@ -2991,6 +3009,17 @@ static int mmc_blk_probe(struct mmc_card @@ -2992,6 +3010,17 @@ static int mmc_blk_probe(struct mmc_card
goto out_free; goto out_free;
} }
......
...@@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> ...@@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
return; return;
val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3); val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3);
@@ -894,7 +895,7 @@ static struct phy_driver broadcom_driver @@ -905,7 +906,7 @@ static struct phy_driver broadcom_driver
.link_change_notify = bcm54xx_link_change_notify, .link_change_notify = bcm54xx_link_change_notify,
}, { }, {
.phy_id = PHY_ID_BCM54210E, .phy_id = PHY_ID_BCM54210E,
...@@ -35,7 +35,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> ...@@ -35,7 +35,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
.name = "Broadcom BCM54210E", .name = "Broadcom BCM54210E",
/* PHY_GBIT_FEATURES */ /* PHY_GBIT_FEATURES */
.get_sset_count = bcm_phy_get_sset_count, .get_sset_count = bcm_phy_get_sset_count,
@@ -908,6 +909,13 @@ static struct phy_driver broadcom_driver @@ -919,6 +920,13 @@ static struct phy_driver broadcom_driver
.suspend = bcm54xx_suspend, .suspend = bcm54xx_suspend,
.resume = bcm54xx_resume, .resume = bcm54xx_resume,
}, { }, {
...@@ -49,7 +49,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> ...@@ -49,7 +49,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
.phy_id = PHY_ID_BCM5461, .phy_id = PHY_ID_BCM5461,
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5461", .name = "Broadcom BCM5461",
@@ -1142,7 +1150,8 @@ module_phy_driver(broadcom_drivers); @@ -1155,7 +1163,8 @@ module_phy_driver(broadcom_drivers);
static struct mdio_device_id __maybe_unused broadcom_tbl[] = { static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
{ PHY_ID_BCM5411, 0xfffffff0 }, { PHY_ID_BCM5411, 0xfffffff0 },
{ PHY_ID_BCM5421, 0xfffffff0 }, { PHY_ID_BCM5421, 0xfffffff0 },
......
...@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> ...@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
--- a/drivers/net/phy/broadcom.c --- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c
@@ -921,8 +921,14 @@ static struct phy_driver broadcom_driver @@ -932,8 +932,14 @@ static struct phy_driver broadcom_driver
.phy_id_mask = 0xffffffff, .phy_id_mask = 0xffffffff,
.name = "Broadcom BCM54213PE", .name = "Broadcom BCM54213PE",
/* PHY_GBIT_FEATURES */ /* PHY_GBIT_FEATURES */
......
...@@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ...@@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/** /**
* fwnode_mdio_find_device - Given a fwnode, find the mdio_device * fwnode_mdio_find_device - Given a fwnode, find the mdio_device
* @fwnode: pointer to the mdio_device's fwnode * @fwnode: pointer to the mdio_device's fwnode
@@ -3107,6 +3178,11 @@ static int phy_probe(struct device *dev) @@ -3109,6 +3180,11 @@ static int phy_probe(struct device *dev)
/* Set the state to READY by default */ /* Set the state to READY by default */
phydev->state = PHY_READY; phydev->state = PHY_READY;
......
...@@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> ...@@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tristate "MDIO Bus/PHY emulation with fixed speed/link PHYs" tristate "MDIO Bus/PHY emulation with fixed speed/link PHYs"
--- a/drivers/net/phy/phy_device.c --- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c
@@ -3208,7 +3208,8 @@ static int phy_probe(struct device *dev) @@ -3210,7 +3210,8 @@ static int phy_probe(struct device *dev)
/* Get the LEDs from the device tree, and instantiate standard /* Get the LEDs from the device tree, and instantiate standard
* LEDs for them. * LEDs for them.
*/ */
......
...@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ...@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return err; return err;
} }
} }
@@ -3229,6 +3239,9 @@ static int phy_remove(struct device *dev @@ -3231,6 +3241,9 @@ static int phy_remove(struct device *dev
cancel_delayed_work_sync(&phydev->state_queue); cancel_delayed_work_sync(&phydev->state_queue);
......
...@@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation ...@@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation
--- a/drivers/net/dsa/mv88e6xxx/chip.c --- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3472,6 +3472,9 @@ static int mv88e6xxx_setup_port(struct m @@ -3480,6 +3480,9 @@ static int mv88e6xxx_setup_port(struct m
else else
reg = 1 << port; reg = 1 << port;
......
...@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com> ...@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
--- a/drivers/net/dsa/mv88e6xxx/chip.c --- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -6980,6 +6980,7 @@ static int mv88e6xxx_register_switch(str @@ -6988,6 +6988,7 @@ static int mv88e6xxx_register_switch(str
ds->ops = &mv88e6xxx_switch_ops; ds->ops = &mv88e6xxx_switch_ops;
ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_min = chip->info->age_time_coeff;
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
......
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -382,6 +382,12 @@ config ROCKCHIP_PHY @@ -389,6 +389,12 @@ config ROCKCHIP_PHY
help help
Currently supports the integrated Ethernet PHY. Currently supports the integrated Ethernet PHY.
......
...@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ...@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -307,6 +307,18 @@ config MEDIATEK_GE_PHY @@ -314,6 +314,18 @@ config MEDIATEK_GE_PHY
help help
Supports the MediaTek Gigabit Ethernet PHYs. Supports the MediaTek Gigabit Ethernet PHYs.
......
...@@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> ...@@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -319,6 +319,13 @@ config MEDIATEK_GE_SOC_PHY @@ -326,6 +326,13 @@ config MEDIATEK_GE_SOC_PHY
present in the SoCs efuse and will dynamically calibrate VCM present in the SoCs efuse and will dynamically calibrate VCM
(common-mode voltage) during startup. (common-mode voltage) during startup.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册