kernel: bump 5.10 to 5.10.117 (#9419)

Remove:
target/linux/generic/backport-5.10/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch [1]
target/linux/generic/backport-5.10/900-regulator-consumer-Add-missing-stubs-to-regulator-co.patch [2]

[1] 3abbfac1ab
[2] a71658c7db

Signed-off-by: José Hwong <josehwong@hotmail.com>

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .115
+LINUX_VERSION-5.10 = .117
-LINUX_KERNEL_HASH-5.10.115 = f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71
+LINUX_KERNEL_HASH-5.10.117 = 703ef7112cdf889950dd864ba482d04bd87d83d3df3a98ab8d4ba8a7ab1ddcc7

target/linux/bcm27xx/patches-5.10/950-0131-bcmgenet-Better-coalescing-parameter-defaults.patch

@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  	/* Disable rate control for now */
  	bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
  				  TDMA_FLOW_PERIOD);
-@@ -4069,9 +4069,12 @@ static int bcmgenet_probe(struct platfor
+@@ -4073,9 +4073,12 @@ static int bcmgenet_probe(struct platfor
  	netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
  
  	/* Set default coalescing parameters */

target/linux/bcm27xx/patches-5.10/950-0334-net-bcmgenet-Reset-RBUF-on-first-open.patch

@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
  	/* Reinitialize TDMA and RDMA and SW housekeeping */
  	ret = bcmgenet_init_dma(priv);
-@@ -4198,7 +4206,7 @@ static int bcmgenet_resume(struct device
+@@ -4202,7 +4210,7 @@ static int bcmgenet_resume(struct device
  			bcmgenet_hfb_create_rxnfc_filter(priv, rule);
  
  	/* Disable RX/TX DMA and flush TX queues */

target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch

@@ -19,8 +19,6 @@ Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
  fs/nfsd/Kconfig         |  1 +
  6 files changed, 22 insertions(+), 3 deletions(-)
 
-diff --git a/fs/Kconfig b/fs/Kconfig
-index aa4c122823018b..a55bda4233bbea 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 @@ -333,6 +333,10 @@ config NFS_COMMON
@@ -34,11 +32,9 @@ index aa4c122823018b..a55bda4233bbea 100644
  source "net/sunrpc/Kconfig"
  source "fs/ceph/Kconfig"
  source "fs/cifs/Kconfig"
-diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
-index 57b3821d975a35..441a2fa073c8f2 100644
 --- a/fs/nfs/nfs4file.c
 +++ b/fs/nfs/nfs4file.c
-@@ -420,7 +420,9 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = {
+@@ -422,7 +422,9 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = {
   */
  void nfs42_ssc_register_ops(void)
  {
@@ -48,7 +44,7 @@ index 57b3821d975a35..441a2fa073c8f2 100644
  }
  
  /**
-@@ -431,7 +433,9 @@ void nfs42_ssc_register_ops(void)
+@@ -433,7 +435,9 @@ void nfs42_ssc_register_ops(void)
   */
  void nfs42_ssc_unregister_ops(void)
  {
@@ -58,8 +54,6 @@ index 57b3821d975a35..441a2fa073c8f2 100644
  }
  #endif /* CONFIG_NFS_V4_2 */
  
-diff --git a/fs/nfs/super.c b/fs/nfs/super.c
-index 4034102010f055..c7a924580eec9c 100644
 --- a/fs/nfs/super.c
 +++ b/fs/nfs/super.c
 @@ -86,9 +86,11 @@ const struct super_operations nfs_sops = {
@@ -116,8 +110,6 @@ index 4034102010f055..c7a924580eec9c 100644
  	unregister_filesystem(&nfs_fs_type);
  }
  
-diff --git a/fs/nfs_common/Makefile b/fs/nfs_common/Makefile
-index fa82f5aaa6d95b..119c75ab9fd08e 100644
 --- a/fs/nfs_common/Makefile
 +++ b/fs/nfs_common/Makefile
 @@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o
@@ -126,8 +118,6 @@ index fa82f5aaa6d95b..119c75ab9fd08e 100644
  obj-$(CONFIG_GRACE_PERIOD) += grace.o
 -obj-$(CONFIG_GRACE_PERIOD) += nfs_ssc.o
 +obj-$(CONFIG_NFS_V4_2_SSC_HELPER) += nfs_ssc.o
-diff --git a/fs/nfs_common/nfs_ssc.c b/fs/nfs_common/nfs_ssc.c
-index f43bbb3739134b..7c1509e968c817 100644
 --- a/fs/nfs_common/nfs_ssc.c
 +++ b/fs/nfs_common/nfs_ssc.c
 @@ -1,7 +1,5 @@
@@ -138,8 +128,6 @@ index f43bbb3739134b..7c1509e968c817 100644
   * Helper for knfsd's SSC to access ops in NFS client modules
   *
   * Author: Dai Ngo <dai.ngo@oracle.com>
-diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
-index dbbc583d627306..821e5913faee49 100644
 --- a/fs/nfsd/Kconfig
 +++ b/fs/nfsd/Kconfig
 @@ -77,6 +77,7 @@ config NFSD_V4

target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch

@@ -17,8 +17,6 @@ Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
  fs/nfsd/Kconfig   | 2 +-
  4 files changed, 3 insertions(+), 11 deletions(-)
 
-diff --git a/fs/Kconfig b/fs/Kconfig
-index a55bda4233bbea..afa585e62332bf 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 @@ -334,8 +334,8 @@ config NFS_COMMON
@@ -32,11 +30,9 @@ index a55bda4233bbea..afa585e62332bf 100644
  
  source "net/sunrpc/Kconfig"
  source "fs/ceph/Kconfig"
-diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
-index 441a2fa073c8f2..57b3821d975a35 100644
 --- a/fs/nfs/nfs4file.c
 +++ b/fs/nfs/nfs4file.c
-@@ -420,9 +420,7 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = {
+@@ -422,9 +422,7 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = {
   */
  void nfs42_ssc_register_ops(void)
  {
@@ -46,7 +42,7 @@ index 441a2fa073c8f2..57b3821d975a35 100644
  }
  
  /**
-@@ -433,9 +431,7 @@ void nfs42_ssc_register_ops(void)
+@@ -435,9 +433,7 @@ void nfs42_ssc_register_ops(void)
   */
  void nfs42_ssc_unregister_ops(void)
  {
@@ -56,8 +52,6 @@ index 441a2fa073c8f2..57b3821d975a35 100644
  }
  #endif /* CONFIG_NFS_V4_2 */
  
-diff --git a/fs/nfs/super.c b/fs/nfs/super.c
-index 13a650750f04a8..5bfcc25571879a 100644
 --- a/fs/nfs/super.c
 +++ b/fs/nfs/super.c
 @@ -116,16 +116,12 @@ static void unregister_nfs4_fs(void)
@@ -77,8 +71,6 @@ index 13a650750f04a8..5bfcc25571879a 100644
  }
  #endif /* CONFIG_NFS_V4_2 */
  
-diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
-index d6cff5fbe705b4..c5346196c46f7e 100644
 --- a/fs/nfsd/Kconfig
 +++ b/fs/nfsd/Kconfig
 @@ -138,7 +138,7 @@ config NFSD_FLEXFILELAYOUT

target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

@@ -1641,7 +1641,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;
 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
 +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
-@@ -1122,7 +1122,6 @@ static int xemaclite_of_probe(struct pla
+@@ -1107,7 +1107,6 @@ static int xemaclite_of_probe(struct pla
  	struct net_device *ndev = NULL;
  	struct net_local *lp = NULL;
  	struct device *dev = &ofdev->dev;
@@ -1649,7 +1649,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	int rc = 0;
  
-@@ -1164,12 +1163,9 @@ static int xemaclite_of_probe(struct pla
+@@ -1149,12 +1148,9 @@ static int xemaclite_of_probe(struct pla
  	lp->next_rx_buf_to_use = 0x0;
  	lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong");
  	lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");

target/linux/generic/backport-5.10/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch

@@ -1,56 +0,0 @@
-From f81d97cb646ab8b90fb181d66fccaf9589990de6 Mon Sep 17 00:00:00 2001
-From: Matthew Hagan <mnhagan88@gmail.com>
-Date: Sat, 30 Apr 2022 11:00:49 +0100
-Subject: [PATCH v2] net: sfp: Add tx-fault workaround for Huawei MA5671A SFP
- ONT
-
-As noted elsewhere, various GPON SFP modules exhibit non-standard
-TX-fault behaviour. In the tested case, the Huawei MA5671A, when used
-in combination with a Marvell mv88e6085 switch, was found to
-persistently assert TX-fault, resulting in the module being disabled.
-
-This patch adds a quirk to ignore the SFP_F_TX_FAULT state, allowing the
-module to function.
-
-Change from v1: removal of erroneous return statment (Andrew Lunn)
-
-Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
----
- drivers/net/phy/sfp.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
---- a/drivers/net/phy/sfp.c
-+++ b/drivers/net/phy/sfp.c
-@@ -249,6 +249,7 @@ struct sfp {
- 	struct sfp_eeprom_id id;
- 	unsigned int module_power_mW;
- 	unsigned int module_t_start_up;
-+	bool tx_fault_ignore;
- 
- #if IS_ENABLED(CONFIG_HWMON)
- 	struct sfp_diag diag;
-@@ -1893,6 +1894,12 @@ static int sfp_sm_mod_probe(struct sfp *
- 	else
- 		sfp->module_t_start_up = T_START_UP;
- 
-+	if (!memcmp(id.base.vendor_name, "HUAWEI          ", 16) &&
-+	    !memcmp(id.base.vendor_pn, "MA5671A         ", 16))
-+		sfp->tx_fault_ignore = true;
-+	else
-+		sfp->tx_fault_ignore = false;
-+
- 	return 0;
- }
- 
-@@ -2320,7 +2327,10 @@ static void sfp_check_state(struct sfp *
- 	mutex_lock(&sfp->st_mutex);
- 	state = sfp_get_state(sfp);
- 	changed = state ^ sfp->state;
--	changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
-+	if (sfp->tx_fault_ignore)
-+		changed &= SFP_F_PRESENT | SFP_F_LOS;
-+	else
-+		changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
- 
- 	for (i = 0; i < GPIO_MAX; i++)
- 		if (changed & BIT(i))

target/linux/generic/backport-5.10/900-regulator-consumer-Add-missing-stubs-to-regulator-co.patch

@@ -1,79 +0,0 @@
-From a71658c7db0b2be9fcab3522aeabe11792a4f481 Mon Sep 17 00:00:00 2001
-From: Dmitry Osipenko <digetx@gmail.com>
-Date: Wed, 20 Jan 2021 23:58:44 +0300
-Subject: [PATCH] regulator: consumer: Add missing stubs to
- regulator/consumer.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 51dfb6ca3728bd0a0a3c23776a12d2a15a1d2457 upstream.
-
-Add missing stubs to regulator/consumer.h in order to fix COMPILE_TEST
-of the kernel. In particular this should fix compile-testing of OPP core
-because of a missing stub for regulator_sync_voltage().
-
-Reported-by: kernel test robot <lkp@intel.com>
-Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
-Link: https://lore.kernel.org/r/20210120205844.12658-1-digetx@gmail.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Cc: Bjørn Mork <bjorn@mork.no>
-Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/linux/regulator/consumer.h | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
---- a/include/linux/regulator/consumer.h
-+++ b/include/linux/regulator/consumer.h
-@@ -332,6 +332,12 @@ regulator_get_exclusive(struct device *d
- }
- 
- static inline struct regulator *__must_check
-+devm_regulator_get_exclusive(struct device *dev, const char *id)
-+{
-+	return ERR_PTR(-ENODEV);
-+}
-+
-+static inline struct regulator *__must_check
- regulator_get_optional(struct device *dev, const char *id)
- {
- 	return ERR_PTR(-ENODEV);
-@@ -486,6 +492,11 @@ static inline int regulator_get_voltage(
- 	return -EINVAL;
- }
- 
-+static inline int regulator_sync_voltage(struct regulator *regulator)
-+{
-+	return -EINVAL;
-+}
-+
- static inline int regulator_is_supported_voltage(struct regulator *regulator,
- 				   int min_uV, int max_uV)
- {
-@@ -578,6 +589,25 @@ static inline int devm_regulator_unregis
- 	return 0;
- }
- 
-+static inline int regulator_suspend_enable(struct regulator_dev *rdev,
-+					   suspend_state_t state)
-+{
-+	return -EINVAL;
-+}
-+
-+static inline int regulator_suspend_disable(struct regulator_dev *rdev,
-+					    suspend_state_t state)
-+{
-+	return -EINVAL;
-+}
-+
-+static inline int regulator_set_suspend_voltage(struct regulator *regulator,
-+						int min_uV, int max_uV,
-+						suspend_state_t state)
-+{
-+	return -EINVAL;
-+}
-+
- static inline void *regulator_get_drvdata(struct regulator *regulator)
- {
- 	return NULL;

target/linux/generic/hack-5.10/220-arm-gc_sections.patch

@@ -12,14 +12,14 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 ---
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -114,6 +114,7 @@ config ARM
+@@ -99,6 +99,7 @@ config ARM
- 	select HAVE_UID16
+ 	select HAVE_KERNEL_XZ
- 	select HAVE_VIRT_CPU_ACCOUNTING_GEN
+ 	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M
- 	select IRQ_FORCED_THREADING
+ 	select HAVE_KRETPROBES if HAVE_KPROBES
 +	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
- 	select MODULES_USE_ELF_REL
+ 	select HAVE_MOD_ARCH_SPECIFIC
- 	select NEED_DMA_MAP_STATE
+ 	select HAVE_NMI
- 	select OF_EARLY_FLATTREE if OF
+ 	select HAVE_OPROFILE if HAVE_PERF_EVENTS
 --- a/arch/arm/boot/compressed/Makefile
 +++ b/arch/arm/boot/compressed/Makefile
 @@ -100,6 +100,7 @@ $(foreach o, $(libfdt_objs) atags_to_fdt

target/linux/generic/hack-5.10/650-netfilter-add-xt_FLOWOFFLOAD-target.patch

@@ -816,4 +816,4 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +
  void nf_flow_snat_port(const struct flow_offload *flow,
  		       struct sk_buff *skb, unsigned int thoff,
- 		       u8 protocol, enum flow_offload_tuple_dir dir);
+ 		       u8 protocol, enum flow_offload_tuple_dir dir);

target/linux/generic/hack-5.10/902-debloat_proc.patch

@@ -246,7 +246,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  				&vmalloc_op,
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -2044,10 +2044,12 @@ void __init init_mm_internals(void)
+@@ -2040,10 +2040,12 @@ void __init init_mm_internals(void)
  	start_shepherd_timer();
  #endif
  #ifdef CONFIG_PROC_FS

target/linux/generic/hack-5.10/904-debloat_dma_buf.patch

@@ -89,4 +89,4 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +EXPORT_SYMBOL_GPL(dynamic_dname);
  
  char *simple_dname(struct dentry *dentry, char *buffer, int buflen)
- {
+ {

target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch

@@ -64,7 +64,7 @@ Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
  	mutex_lock(&mtd_table_mutex);
 --- a/include/linux/mtd/mtd.h
 +++ b/include/linux/mtd/mtd.h
-@@ -696,6 +696,8 @@ extern struct mtd_info *get_mtd_device(s
+@@ -694,6 +694,8 @@ extern struct mtd_info *get_mtd_device(s
  extern int __get_mtd_device(struct mtd_info *mtd);
  extern void __put_mtd_device(struct mtd_info *mtd);
  extern struct mtd_info *get_mtd_device_nm(const char *name);

target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch

@@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
  	  The command-line arguments provided by the boot loader will be
  	  appended to the the device tree bootargs property.
  

target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch

@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1827,6 +1827,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
  	  The command-line arguments provided by the boot loader will be
  	  appended to the the device tree bootargs property.
  

target/linux/ramips/patches-5.10/721-NET-no-auto-carrier-off-support.patch

@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -709,7 +709,10 @@ static int phy_check_link_status(struct
+@@ -714,7 +714,10 @@ static int phy_check_link_status(struct
  		phy_link_up(phydev);
  	} else if (!phydev->link && phydev->state != PHY_NOLINK) {
  		phydev->state = PHY_NOLINK;
@@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  	}
  
  	return 0;
-@@ -1191,7 +1194,10 @@ void phy_state_machine(struct work_struc
+@@ -1226,7 +1229,10 @@ void phy_state_machine(struct work_struc
  	case PHY_HALTED:
  		if (phydev->link) {
  			phydev->link = 0;

target/linux/ramips/patches-5.10/835-asoc-add-mt7620-support.patch

@@ -5,7 +5,6 @@ Subject: [PATCH 48/53] asoc: add mt7620 support
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
 ---
- arch/mips/ralink/of.c            |    2 +
  sound/soc/Kconfig                |    1 +
  sound/soc/Makefile               |    1 +
  sound/soc/ralink/Kconfig         |   15 ++