kernel: bump 6.1 to 6.1.61

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

Removed upstreamed:
  generic/backport-6.1/814-v6.6-0018-nvmem-imx-correct-nregs-for-i.MX6SLL.patch[1]
  generic/backport-6.1/814-v6.6-0019-nvmem-imx-correct-nregs-for-i.MX6UL.patch[2]
  generic/backport-6.1/814-v6.6-0020-nvmem-imx-correct-nregs-for-i.MX6ULL.patch[3]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.61&id=b90b8633ef62314f3a5f5675106e6dcdec981b6f
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.61&id=37495846b1efc23c1767b17ddd6645cc0ccb9946
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.61&id=116671d25915b913374ccdb2956b5fdaff939dc9

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne

Signed-off-by: John Audia <[email protected]>

include/kernel-6.1

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .60
-LINUX_KERNEL_HASH-6.1.60 = 58520e7ae5a6af254ddf7ddbfc42e4373b0d36c67d467f6e35a3bd1672f5fb0a
+LINUX_VERSION-6.1 = .61
+LINUX_KERNEL_HASH-6.1.61 = ad2c9d12fc36e2dde4796a3eec8f4ddca2e278098f4e555b6e6f5f03ef6964ce

target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch

@@ -750,7 +750,7 @@ SVN-Revision: 35130
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4178,14 +4178,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4179,14 +4179,16 @@ static bool tcp_parse_aligned_timestamp(
  {
  	const __be32 *ptr = (const __be32 *)(th + 1);
  

target/linux/bcm27xx/patches-6.1/950-0081-smsx95xx-fix-crimes-against-truesize.patch

@@ -25,7 +25,7 @@ Signed-off-by: Steve Glendinning <[email protected]>
  static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					  u32 *data)
  {
-@@ -1868,7 +1872,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1870,7 +1874,8 @@ static int smsc95xx_rx_fixup(struct usbn
  				if (dev->net->features & NETIF_F_RXCSUM)
  					smsc95xx_rx_csum_offload(skb);
  				skb_trim(skb, skb->len - 4); /* remove fcs */
@@ -35,7 +35,7 @@ Signed-off-by: Steve Glendinning <[email protected]>
  
  				return 1;
  			}
-@@ -1886,7 +1891,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1888,7 +1893,8 @@ static int smsc95xx_rx_fixup(struct usbn
  			if (dev->net->features & NETIF_F_RXCSUM)
  				smsc95xx_rx_csum_offload(ax_skb);
  			skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */

target/linux/bcm27xx/patches-6.1/950-0082-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch

@@ -22,7 +22,7 @@ See: http://forum.kodi.tv/showthread.php?tid=285288
  static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					  u32 *data)
  {
-@@ -934,13 +938,13 @@ static int smsc95xx_reset(struct usbnet
+@@ -936,13 +940,13 @@ static int smsc95xx_reset(struct usbnet
  
  	if (!turbo_mode) {
  		burst_cap = 0;

target/linux/bcm27xx/patches-6.1/950-0083-Allow-mac-address-to-be-set-in-smsc95xx.patch

@@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					  u32 *data)
  {
-@@ -807,6 +811,52 @@ static int smsc95xx_ioctl(struct net_dev
+@@ -809,6 +813,52 @@ static int smsc95xx_ioctl(struct net_dev
  	return phy_mii_ioctl(netdev->phydev, rq, cmd);
  }
  
@@ -86,7 +86,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  static void smsc95xx_init_mac_address(struct usbnet *dev)
  {
  	u8 addr[ETH_ALEN];
-@@ -830,6 +880,10 @@ static void smsc95xx_init_mac_address(st
+@@ -832,6 +882,10 @@ static void smsc95xx_init_mac_address(st
  		}
  	}
  

target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch

@@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  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,
-@@ -2970,6 +2977,8 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2994,6 +3001,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 <[email protected]>
  
  	/*
  	 * Check that the card supports the command class(es) we need.
-@@ -2977,7 +2986,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3001,7 +3010,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 <[email protected]>
  
  	card->complete_wq = alloc_workqueue("mmc_complete",
  					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -2992,6 +3010,17 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3016,6 +3034,17 @@ static int mmc_blk_probe(struct mmc_card
  		goto out_free;
  	}
  

target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch

@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -1902,7 +1902,7 @@ static void mmc_blk_mq_rw_recovery(struc
+@@ -1926,7 +1926,7 @@ static void mmc_blk_mq_rw_recovery(struc
  		return;
  	}
  

target/linux/generic/backport-6.1/814-v6.6-0018-nvmem-imx-correct-nregs-for-i.MX6SLL.patch

@@ -1,28 +0,0 @@
-From 414a98abbefd82d591f4e2d1efd2917bcd3b6f6d Mon Sep 17 00:00:00 2001
-From: Peng Fan <[email protected]>
-Date: Fri, 13 Oct 2023 13:49:02 +0100
-Subject: [PATCH] nvmem: imx: correct nregs for i.MX6SLL
-
-The nregs for i.MX6SLL should be 80 per fuse map, correct it.
-
-Fixes: 6da27821a6f5 ("nvmem: imx-ocotp: add support for imx6sll")
-Cc: [email protected]
-Signed-off-by: Peng Fan <[email protected]>
-Signed-off-by: Srinivas Kandagatla <[email protected]>
-Link: https://lore.kernel.org/r/[email protected]
-Signed-off-by: Greg Kroah-Hartman <[email protected]>
----
- drivers/nvmem/imx-ocotp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/nvmem/imx-ocotp.c
-+++ b/drivers/nvmem/imx-ocotp.c
-@@ -499,7 +499,7 @@ static const struct ocotp_params imx6sl_
- };
- 
- static const struct ocotp_params imx6sll_params = {
--	.nregs = 128,
-+	.nregs = 80,
- 	.bank_address_words = 0,
- 	.set_timing = imx_ocotp_set_imx6_timing,
- 	.ctrl = IMX_OCOTP_BM_CTRL_DEFAULT,

target/linux/generic/backport-6.1/814-v6.6-0019-nvmem-imx-correct-nregs-for-i.MX6UL.patch

@@ -1,28 +0,0 @@
-From 7d6e10f5d254681983b53d979422c8de3fadbefb Mon Sep 17 00:00:00 2001
-From: Peng Fan <[email protected]>
-Date: Fri, 13 Oct 2023 13:49:03 +0100
-Subject: [PATCH] nvmem: imx: correct nregs for i.MX6UL
-
-The nregs for i.MX6UL should be 144 per fuse map, correct it.
-
-Fixes: 4aa2b4802046 ("nvmem: octop: Add support for imx6ul")
-Cc: [email protected]
-Signed-off-by: Peng Fan <[email protected]>
-Signed-off-by: Srinivas Kandagatla <[email protected]>
-Link: https://lore.kernel.org/r/[email protected]
-Signed-off-by: Greg Kroah-Hartman <[email protected]>
----
- drivers/nvmem/imx-ocotp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/nvmem/imx-ocotp.c
-+++ b/drivers/nvmem/imx-ocotp.c
-@@ -513,7 +513,7 @@ static const struct ocotp_params imx6sx_
- };
- 
- static const struct ocotp_params imx6ul_params = {
--	.nregs = 128,
-+	.nregs = 144,
- 	.bank_address_words = 0,
- 	.set_timing = imx_ocotp_set_imx6_timing,
- 	.ctrl = IMX_OCOTP_BM_CTRL_DEFAULT,

target/linux/generic/backport-6.1/814-v6.6-0020-nvmem-imx-correct-nregs-for-i.MX6ULL.patch

@@ -1,28 +0,0 @@
-From 2382c1b044231fd49eaf9aa82bc7113fc55487b8 Mon Sep 17 00:00:00 2001
-From: Peng Fan <[email protected]>
-Date: Fri, 13 Oct 2023 13:49:04 +0100
-Subject: [PATCH] nvmem: imx: correct nregs for i.MX6ULL
-
-The nregs for i.MX6ULL should be 80 per fuse map, correct it.
-
-Fixes: ffbc34bf0e9c ("nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support")
-Cc: [email protected]
-Signed-off-by: Peng Fan <[email protected]>
-Signed-off-by: Srinivas Kandagatla <[email protected]>
-Link: https://lore.kernel.org/r/[email protected]
-Signed-off-by: Greg Kroah-Hartman <[email protected]>
----
- drivers/nvmem/imx-ocotp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/nvmem/imx-ocotp.c
-+++ b/drivers/nvmem/imx-ocotp.c
-@@ -520,7 +520,7 @@ static const struct ocotp_params imx6ul_
- };
- 
- static const struct ocotp_params imx6ull_params = {
--	.nregs = 64,
-+	.nregs = 80,
- 	.bank_address_words = 0,
- 	.set_timing = imx_ocotp_set_imx6_timing,
- 	.ctrl = IMX_OCOTP_BM_CTRL_DEFAULT,