kernel: bump 6.1 to 6.1.47
authorJohn Audia <therealgraysky@proton.me>
Wed, 23 Aug 2023 18:59:59 +0000 (14:59 -0400)
committerHauke Mehrtens <hauke@hauke-m.de>
Fri, 25 Aug 2023 22:07:16 +0000 (00:07 +0200)
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: John Audia <therealgraysky@proton.me>
12 files changed:
include/kernel-6.1
target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch
target/linux/generic/backport-6.1/801-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch
target/linux/generic/backport-6.1/820-v6.4-net-phy-fix-circular-LEDS_CLASS-dependencies.patch
target/linux/generic/backport-6.1/822-v6.4-net-phy-Manual-remove-LEDs-to-ensure-correct-orderin.patch
target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
target/linux/mediatek/patches-6.1/500-gsw-rtl8367s-mt7622-support.patch
target/linux/mediatek/patches-6.1/730-v6.5-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch
target/linux/mediatek/patches-6.1/733-net-phy-add-driver-for-MediaTek-2.5G-PHY.patch

index 580219c70f84f6c9b5ae8d697a0d7ae21cb1c130..61bad0e5ca7cf762fc78d25e03e67227a3c2c6ca 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .46
-LINUX_KERNEL_HASH-6.1.46 = f5f67bcfccd47f8d9db2d5ba24e33af7778f40a777577d1fba424f4a1712a296
+LINUX_VERSION-6.1 = .47
+LINUX_KERNEL_HASH-6.1.47 = 93d58b6af007a5f44dd26831ff310707deb1ab9380c5136a534287eb3fddfcab
index ace12078da7b2366fc8b63623cfddfc92124f91c..b1a5dbfe2df67330a159d0554908fa3671ee34c4 100644 (file)
@@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static inline int mmc_blk_part_switch(struct mmc_card *card,
                                      unsigned int part_type);
  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;
        int ret = 0;
@@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
        /*
         * 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))
                return -ENODEV;
  
@@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
        card->complete_wq = alloc_workqueue("mmc_complete",
                                        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;
        }
  
index 98f8350c4c9994406def6c5d8ad482666b5ce97d..ec4cd0993e311afe347262ffd7e0faef723e79d0 100644 (file)
@@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
                return;
  
        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,
  }, {
        .phy_id         = PHY_ID_BCM54210E,
@@ -35,7 +35,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
        .name           = "Broadcom BCM54210E",
        /* PHY_GBIT_FEATURES */
        .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,
        .resume         = bcm54xx_resume,
  }, {
@@ -49,7 +49,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
        .phy_id         = PHY_ID_BCM5461,
        .phy_id_mask    = 0xfffffff0,
        .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[] = {
        { PHY_ID_BCM5411, 0xfffffff0 },
        { PHY_ID_BCM5421, 0xfffffff0 },
index 5eeeda4eac73046e2eed86105746646d1aa6a0ef..18e654071c32c182c651421f5e207afc92f2ca3d 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
 
 --- a/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,
        .name           = "Broadcom BCM54213PE",
        /* PHY_GBIT_FEATURES */
index 8df0ed1f7f5d7457facf6217027328b6c7ae7bd9..a3184513ee3886d21c1a38650ead3ff5d1d5e21e 100644 (file)
@@ -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: 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 */
        phydev->state = PHY_READY;
  
index 09a84201b59e56a124c14c3dc77e91e271d996dc..1de086417b6112570333620068338ac7e87d1666 100644 (file)
@@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        tristate "MDIO Bus/PHY emulation with fixed speed/link PHYs"
 --- a/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
         * LEDs for them.
         */
index 04939deb6e33afeb95cf8bb7437b066ba0d6f604..8f076be640c9c4d07db6de57b84fca04cb880c45 100644 (file)
@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        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);
  
index 59235ea00a2c6f82b1a2382c93e8b2e80b968754..9c45115ebb09dcef2bb7a41bc2515bad020235aa 100644 (file)
@@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation
 
 --- a/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
                reg = 1 << port;
  
index 230ad2d036a905686acb349426accb4ea9802493..ac59b4b5ea61629f66e94dc1faee9970b819bac4 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 
 --- a/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->ageing_time_min = chip->info->age_time_coeff;
        ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
index cdfe79ebad77794623c7e11c74d70b3a413c5101..e37705f388c1b31221f9f80f067fb027a068a830 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -382,6 +382,12 @@ config ROCKCHIP_PHY
+@@ -389,6 +389,12 @@ config ROCKCHIP_PHY
        help
          Currently supports the integrated Ethernet PHY.
  
index cba76ad77c39e4bdb18e37cc6329699173fda68a..eb2a40f5c1f58ec0c3a7c82d2945410eac92693a 100644 (file)
@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  L:    linux-i2c@vger.kernel.org
 --- a/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
          Supports the MediaTek Gigabit Ethernet PHYs.
  
index c3baafa2bbb6fef414d0c603432061ccc3d117a4..125bd9b0b38f49df54ff872b1c5c0d180071b01d 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/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
          (common-mode voltage) during startup.