kernel: bump 5.15 to 5.15.118

All patches automatically rebased.

Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod

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

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .117
-LINUX_KERNEL_HASH-5.15.117 = a9a8331f3c0e004b40a41f30d688b53bf85405597ac41c2c89be7f4fbcf7239f
+LINUX_VERSION-5.15 = .118
+LINUX_KERNEL_HASH-5.15.118 = 4e6bf4dadb04d5d11d1d4cc37c0eabcf33bc333b7dd3dc2143c3099a823eb5b3

target/linux/ath25/patches-5.15/107-ar5312_gpio.patch

@@ -202,7 +202,7 @@
 +subsys_initcall(ar5312_gpio_init);
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -230,6 +230,7 @@ config ATH25
+@@ -231,6 +231,7 @@ config ATH25
  	select CEVT_R4K
  	select CSRC_R4K
  	select DMA_NONCOHERENT

target/linux/ath79/patches-5.15/0032-MIPS-ath79-sanitize-symbols.patch

@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -256,6 +256,8 @@ config ATH79
+@@ -257,6 +257,8 @@ config ATH79
  	select SYS_SUPPORTS_BIG_ENDIAN
  	select SYS_SUPPORTS_MIPS16
  	select SYS_SUPPORTS_ZBOOT_UART_PROM

target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch

@@ -784,7 +784,7 @@ SVN-Revision: 35130
 
 --- a/include/net/neighbour.h
 +++ b/include/net/neighbour.h
-@@ -275,8 +275,10 @@ static inline bool neigh_key_eq128(const
+@@ -270,8 +270,10 @@ static inline bool neigh_key_eq128(const
  	const u32 *n32 = (const u32 *)n->primary_key;
  	const u32 *p32 = pkey;
 

target/linux/bcm63xx/patches-5.15/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch

@@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -331,6 +331,9 @@ config BCM63XX
+@@ -332,6 +332,9 @@ config BCM63XX
  	select SYNC_R4K
  	select DMA_NONCOHERENT
  	select IRQ_MIPS_CPU

target/linux/bmips/patches-5.15/202-mips-bmips-tweak-Kconfig-options.patch

@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -274,25 +274,20 @@ config BMIPS_GENERIC
+@@ -275,25 +275,20 @@ config BMIPS_GENERIC
  	select SYNC_R4K
  	select COMMON_CLK
  	select BCM6345_L1_IRQ

target/linux/bmips/patches-5.15/600-mips-bmips-add-pci-support.patch

@@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -274,6 +274,7 @@ config BMIPS_GENERIC
+@@ -275,6 +275,7 @@ config BMIPS_GENERIC
  	select SYNC_R4K
  	select COMMON_CLK
  	select BCM6345_L1_IRQ

target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch

@@ -65,7 +65,7 @@ Signed-off-by: David S. Miller <[email protected]>
  struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp);
 --- a/net/Kconfig
 +++ b/net/Kconfig
-@@ -434,6 +434,19 @@ config NET_DEVLINK
+@@ -432,6 +432,19 @@ config NET_DEVLINK
  config PAGE_POOL
  	bool
 

target/linux/generic/backport-5.15/707-v6.3-net-pcs-add-driver-for-MediaTek-SGMII-PCS.patch

@@ -32,7 +32,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -11789,6 +11789,14 @@ L:	[email protected]
+@@ -11782,6 +11782,14 @@ L:	[email protected]
  S:	Maintained
  F:	drivers/net/ethernet/mediatek/
 

target/linux/generic/backport-5.15/790-v6.4-0011-net-dsa-mt7530-introduce-separate-MDIO-driver.patch

@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -11901,6 +11901,7 @@ M:	Landen Chao <[email protected]
+@@ -11894,6 +11894,7 @@ M:	Landen Chao <[email protected]
  M:	DENG Qingfang <[email protected]>
  L:	[email protected]
  S:	Maintained

target/linux/generic/backport-5.15/790-v6.4-0013-net-dsa-mt7530-introduce-driver-for-MT7988-built-in-.patch

@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -11899,9 +11899,11 @@ MEDIATEK SWITCH DRIVER
+@@ -11892,9 +11892,11 @@ MEDIATEK SWITCH DRIVER
  M:	Sean Wang <[email protected]>
  M:	Landen Chao <[email protected]>
  M:	DENG Qingfang <[email protected]>

target/linux/generic/backport-5.15/791-v6.2-01-net-phy-Add-driver-for-Motorcomm-yt8521-gigabit-ethernet.patch

@@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -12700,6 +12700,7 @@ F:	include/uapi/linux/meye.h
+@@ -12693,6 +12693,7 @@ F:	include/uapi/linux/meye.h
 
  MOTORCOMM PHY DRIVER
  M:	Peter Geis <[email protected]>

target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch

@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17965,6 +17965,11 @@ L:	[email protected]
+@@ -17958,6 +17958,11 @@ L:	[email protected]
  S:	Maintained
  F:	drivers/net/ethernet/dlink/sundance.c
 

target/linux/generic/backport-5.15/806-v6.0-0001-nvmem-microchip-otpc-add-support.patch

@@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -12364,6 +12364,14 @@ S:	Supported
+@@ -12357,6 +12357,14 @@ S:	Supported
  F:	Documentation/devicetree/bindings/mtd/atmel-nand.txt
  F:	drivers/mtd/nand/raw/atmel/*
 

target/linux/generic/backport-5.15/810-v5.17-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch

@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1314,6 +1314,7 @@ static const struct usb_device_id produc
+@@ -1316,6 +1316,7 @@ static const struct usb_device_id produc
  	{QMI_FIXED_INTF(0x19d2, 0x1426, 2)},	/* ZTE MF91 */
  	{QMI_FIXED_INTF(0x19d2, 0x1428, 2)},	/* Telewell TW-LTE 4G v2 */
  	{QMI_FIXED_INTF(0x19d2, 0x1432, 3)},	/* ZTE ME3620 */

target/linux/generic/hack-5.15/251-kconfig.patch

@@ -199,7 +199,7 @@ Signed-off-by: John Crispin <[email protected]>
  	bool
 --- a/net/Kconfig
 +++ b/net/Kconfig
-@@ -432,7 +432,7 @@ config NET_DEVLINK
+@@ -430,7 +430,7 @@ config NET_DEVLINK
  	default n
 
  config PAGE_POOL

target/linux/generic/hack-5.15/280-rfkill-stubs.patch

@@ -26,7 +26,7 @@ Signed-off-by: John Crispin <[email protected]>
   * @name: name of the struct -- the string is not copied internally
 --- a/net/Makefile
 +++ b/net/Makefile
-@@ -52,7 +52,7 @@ obj-$(CONFIG_TIPC)		+= tipc/
+@@ -51,7 +51,7 @@ obj-$(CONFIG_TIPC)		+= tipc/
  obj-$(CONFIG_NETLABEL)		+= netlabel/
  obj-$(CONFIG_IUCV)		+= iucv/
  obj-$(CONFIG_SMC)		+= smc/

target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch

@@ -38,15 +38,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
  /* Specifies the type of the struct net_device::ml_priv pointer */
  enum netdev_ml_priv_type {
-@@ -2015,6 +2020,7 @@ struct net_device {
+@@ -2014,6 +2019,7 @@ struct net_device {
  	/* Read-mostly cache-line for fast-path access */
  	unsigned int		flags;
  	unsigned int		priv_flags;
 +	unsigned int		extra_priv_flags;
  	const struct net_device_ops *netdev_ops;
  	int			ifindex;
  	unsigned short		gflags;
-@@ -2075,6 +2081,11 @@ struct net_device {
+@@ -2074,6 +2080,11 @@ struct net_device {
  	const struct tlsdev_ops *tlsdev_ops;
  #endif
 
@@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	const struct header_ops *header_ops;
 
  	unsigned char		operstate;
-@@ -2149,6 +2160,10 @@ struct net_device {
+@@ -2145,6 +2156,10 @@ struct net_device {
  	struct mctp_dev __rcu	*mctp_ptr;
  #endif
 

target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch

@@ -29,7 +29,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
 
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1169,6 +1171,11 @@ static const struct usb_device_id option
+@@ -1173,6 +1175,11 @@ static const struct usb_device_id option
  	  .driver_info = ZLP },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },

target/linux/generic/pending-5.15/300-mips_expose_boot_raw.patch

@@ -9,7 +9,7 @@ Acked-by: Rob Landley <[email protected]>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1100,9 +1100,6 @@ config FW_ARC
+@@ -1101,9 +1101,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
  	bool
 
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <[email protected]>
  config CEVT_BCM1480
  	bool
 
-@@ -3182,6 +3179,18 @@ choice
+@@ -3183,6 +3180,18 @@ choice
  		bool "Extend builtin kernel arguments with bootloader arguments"
  endchoice
 

target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch

@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -2101,6 +2101,8 @@ struct net_device {
+@@ -2100,6 +2100,8 @@ struct net_device {
  	struct netdev_hw_addr_list	mc;
  	struct netdev_hw_addr_list	dev_addrs;
 

target/linux/generic/pending-5.15/760-net-core-add-optional-threading-for-backlog-processi.patch

@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
  /**
   *	napi_disable - prevent NAPI from scheduling
-@@ -3368,6 +3369,7 @@ struct softnet_data {
+@@ -3364,6 +3365,7 @@ struct softnet_data {
  	unsigned int		processed;
  	unsigned int		time_squeeze;
  	unsigned int		received_rps;
@@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
  		    int (*poll)(struct napi_struct *, int), int weight)
  {
-@@ -11371,6 +11446,9 @@ static int dev_cpu_dead(unsigned int old
+@@ -11369,6 +11444,9 @@ static int dev_cpu_dead(unsigned int old
  	raise_softirq_irqoff(NET_TX_SOFTIRQ);
  	local_irq_enable();
 
@@ -172,7 +172,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #ifdef CONFIG_RPS
  	remsd = oldsd->rps_ipi_list;
  	oldsd->rps_ipi_list = NULL;
-@@ -11710,6 +11788,7 @@ static int __init net_dev_init(void)
+@@ -11708,6 +11786,7 @@ static int __init net_dev_init(void)
  		sd->cpu = i;
  #endif
 

target/linux/lantiq/patches-5.15/0152-lantiq-VPE.patch

@@ -15,7 +15,7 @@ Signed-off-by: Stefan Koch <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -2429,6 +2429,12 @@ config MIPS_VPE_LOADER
+@@ -2430,6 +2430,12 @@ config MIPS_VPE_LOADER
  	  Includes a loader for loading an elf relocatable object
  	  onto another VPE and running it.
 

target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch

@@ -854,7 +854,7 @@ Signed-off-by: Pawel Dembicki <[email protected]>
 +};
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -7526,6 +7526,14 @@ F:	drivers/ptp/ptp_qoriq.c
+@@ -7519,6 +7519,14 @@ F:	drivers/ptp/ptp_qoriq.c
  F:	drivers/ptp/ptp_qoriq_debugfs.c
  F:	include/linux/fsl/ptp_qoriq.h
 

target/linux/mediatek/patches-5.15/730-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch

@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -11797,6 +11797,15 @@ S:	Maintained
+@@ -11790,6 +11790,15 @@ S:	Maintained
  F:	drivers/net/pcs/pcs-mtk-lynxi.c
  F:	include/linux/pcs/pcs-mtk-lynxi.h
 

target/linux/mvebu/patches-5.15/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch

@@ -16,7 +16,7 @@ Cc: Robert Marko <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -9063,6 +9063,22 @@ F:	include/net/nl802154.h
+@@ -9056,6 +9056,22 @@ F:	include/net/nl802154.h
  F:	net/ieee802154/
  F:	net/mac802154/
 

target/linux/octeon/patches-5.15/100-mips_image_cmdline_hack.patch

@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1180,6 +1180,10 @@ config MIPS_MSC
+@@ -1181,6 +1181,10 @@ config MIPS_MSC
  config SYNC_R4K
  	bool
 

target/linux/ramips/patches-5.15/314-MIPS-add-bootargs-override-property.patch

@@ -17,7 +17,7 @@ Signed-off-by: David Bauer <[email protected]>
 
 --- a/arch/mips/kernel/setup.c
 +++ b/arch/mips/kernel/setup.c
-@@ -544,8 +544,28 @@ static int __init bootcmdline_scan_chose
+@@ -545,8 +545,28 @@ static int __init bootcmdline_scan_chose
 
  #endif /* CONFIG_OF_EARLY_FLATTREE */
 
@@ -46,7 +46,7 @@ Signed-off-by: David Bauer <[email protected]>
  	bool dt_bootargs = false;
 
  	/*
-@@ -559,6 +579,14 @@ static void __init bootcmdline_init(void
+@@ -560,6 +580,14 @@ static void __init bootcmdline_init(void
  	}
 
  	/*

target/linux/ramips/patches-5.15/315-owrt-hack-fix-mt7688-cache-issue.patch

@@ -10,15 +10,15 @@ Signed-off-by: John Crispin <[email protected]>
 
 --- a/arch/mips/kernel/setup.c
 +++ b/arch/mips/kernel/setup.c
-@@ -686,7 +686,6 @@ static void __init arch_mem_init(char **
+@@ -687,7 +687,6 @@ static void __init arch_mem_init(char **
  	mips_reserve_vmcore();
 
  	mips_parse_crashkernel();
 -	device_tree_init();
 
  	/*
  	 * In order to reduce the possibility of kernel panic when failed to
-@@ -803,6 +802,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -804,6 +803,7 @@ void __init setup_arch(char **cmdline_p)
 
  	cpu_cache_init();
  	paging_init();

target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch

@@ -32,7 +32,7 @@ Signed-off-by: Guenter Roeck <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -15902,6 +15902,13 @@ S:	Maintained
+@@ -15895,6 +15895,13 @@ S:	Maintained
  F:	include/sound/rt*.h
  F:	sound/soc/codecs/rt*
 

target/linux/realtek/patches-5.15/300-mips-add-rtl838x-platform.patch

@@ -25,7 +25,7 @@ Submitted-by: Birger Koblitz <[email protected]>
  platform-$(CONFIG_SGI_IP28)		+= sgi-ip22/
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1053,8 +1053,58 @@ config NLM_XLP_BOARD
+@@ -1054,8 +1054,58 @@ config NLM_XLP_BOARD
  	  This board is based on Netlogic XLP Processor.
  	  Say Y here if you have a XLP based board.