瀏覽代碼

kernel: bump 5.15 to 5.15.124

Changelog: https://lore.kernel.org/stable/2023080341-curliness-salary-4158@gregkh/

1. Needed to make a change to to package/kernel/linux/modules/netsupport.mk
   due to upstream moving vxlan to its own directory[1].  @john-tho suggested
   using the the 6.1 xvlan FILES to circumvent.
2. All patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.124&id=77396fa9096abdbfbb87d63e73ad44d5621cf103

Signed-off-by: John Audia <[email protected]>
John Audia 2 年之前
父節點
當前提交
81c1172c36
共有 17 個文件被更改,包括 20 次插入21 次删除
  1. 2 2
      include/kernel-5.15
  2. 1 2
      package/kernel/linux/modules/netsupport.mk
  3. 2 2
      target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
  4. 1 1
      target/linux/generic/backport-5.15/707-v6.3-net-pcs-add-driver-for-MediaTek-SGMII-PCS.patch
  5. 1 1
      target/linux/generic/backport-5.15/790-v6.4-0011-net-dsa-mt7530-introduce-separate-MDIO-driver.patch
  6. 1 1
      target/linux/generic/backport-5.15/790-v6.4-0013-net-dsa-mt7530-introduce-driver-for-MT7988-built-in-.patch
  7. 1 1
      target/linux/generic/backport-5.15/791-v6.2-01-net-phy-Add-driver-for-Motorcomm-yt8521-gigabit-ethernet.patch
  8. 1 1
      target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch
  9. 1 1
      target/linux/generic/backport-5.15/806-v6.0-0001-nvmem-microchip-otpc-add-support.patch
  10. 1 1
      target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
  11. 2 2
      target/linux/generic/pending-5.15/351-irqchip-bcm-6345-l1-request-memory-region.patch
  12. 1 1
      target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch
  13. 1 1
      target/linux/mediatek/patches-5.15/730-v6.5-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch
  14. 1 1
      target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch
  15. 1 1
      target/linux/mvebu/patches-5.15/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch
  16. 1 1
      target/linux/ramips/patches-5.15/005-v6.5-09-MAINTAINERS-add-Mediatek-MTMIPS-Clock-maintainer.patch
  17. 1 1
      target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch

+ 2 - 2
include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .123
-LINUX_KERNEL_HASH-5.15.123 = 2de69544a12e6a059163c58fc901c13bcf22e8cac39c66b56f8fbb633399bf93
+LINUX_VERSION-5.15 = .124
+LINUX_KERNEL_HASH-5.15.124 = 00036a0260ad012aa832a8698a4afcf23b2410091527738ce48ce3fcc23f22ed

+ 1 - 2
package/kernel/linux/modules/netsupport.mk

@@ -93,8 +93,7 @@ define KernelPackage/vxlan
 	+IPV6:kmod-udptunnel6
   KCONFIG:=CONFIG_VXLAN
   FILES:= \
-	$(LINUX_DIR)/drivers/net/[email protected] \
-	$(LINUX_DIR)/drivers/net/vxlan/[email protected]
+	$(LINUX_DIR)/drivers/net/vxlan/vxlan.ko
   AUTOLOAD:=$(call AutoLoad,13,vxlan)
 endef
 

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

@@ -654,7 +654,7 @@ SVN-Revision: 35130
  		return false;
  
  	return true;
-@@ -750,13 +754,13 @@ static inline void ipv6_addr_set_v4mappe
+@@ -746,13 +750,13 @@ static inline void ipv6_addr_set_v4mappe
   */
  static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
  {
@@ -670,7 +670,7 @@ SVN-Revision: 35130
  		if (xb)
  			return i * 32 + 31 - __fls(ntohl(xb));
  	}
-@@ -950,17 +954,18 @@ static inline u32 ip6_multipath_hash_fie
+@@ -946,17 +950,18 @@ static inline u32 ip6_multipath_hash_fie
  static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
  				__be32 flowlabel)
  {

+ 1 - 1
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
-@@ -11782,6 +11782,14 @@ L:	[email protected]
+@@ -11783,6 +11783,14 @@ L:	[email protected]
  S:	Maintained
  F:	drivers/net/ethernet/mediatek/
  

+ 1 - 1
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
-@@ -11894,6 +11894,7 @@ M:	Landen Chao <[email protected]
+@@ -11895,6 +11895,7 @@ M:	Landen Chao <[email protected]
  M:	DENG Qingfang <[email protected]>
  L:	[email protected]
  S:	Maintained

+ 1 - 1
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
-@@ -11892,9 +11892,11 @@ MEDIATEK SWITCH DRIVER
+@@ -11893,9 +11893,11 @@ MEDIATEK SWITCH DRIVER
  M:	Sean Wang <[email protected]>
  M:	Landen Chao <[email protected]>
  M:	DENG Qingfang <[email protected]>

+ 1 - 1
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
-@@ -12693,6 +12693,7 @@ F:	include/uapi/linux/meye.h
+@@ -12694,6 +12694,7 @@ F:	include/uapi/linux/meye.h
  
  MOTORCOMM PHY DRIVER
  M:	Peter Geis <[email protected]>

+ 1 - 1
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
-@@ -17958,6 +17958,11 @@ L:	[email protected]
+@@ -17959,6 +17959,11 @@ L:	[email protected]
  S:	Maintained
  F:	drivers/net/ethernet/dlink/sundance.c
  

+ 1 - 1
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
-@@ -12357,6 +12357,14 @@ S:	Supported
+@@ -12358,6 +12358,14 @@ S:	Supported
  F:	Documentation/devicetree/bindings/mtd/atmel-nand.txt
  F:	drivers/mtd/nand/raw/atmel/*
  

+ 1 - 1
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 */
-@@ -1177,6 +1179,11 @@ static const struct usb_device_id option
+@@ -1179,6 +1181,11 @@ static const struct usb_device_id option
  	  .driver_info = ZLP },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },

+ 2 - 2
target/linux/generic/pending-5.15/351-irqchip-bcm-6345-l1-request-memory-region.patch

@@ -91,7 +91,7 @@ Acked-by: Florian Fainelli <[email protected]>
 
 --- a/drivers/irqchip/irq-bcm6345-l1.c
 +++ b/drivers/irqchip/irq-bcm6345-l1.c
-@@ -261,6 +261,9 @@ static int __init bcm6345_l1_init_one(st
+@@ -257,6 +257,9 @@ static int __init bcm6345_l1_init_one(st
  	if (!cpu->map_base)
  		return -ENOMEM;
  
@@ -101,7 +101,7 @@ Acked-by: Florian Fainelli <[email protected]>
  	for (i = 0; i < n_words; i++) {
  		cpu->enable_cache[i] = 0;
  		__raw_writel(0, cpu->map_base + reg_enable(intc, i));
-@@ -339,8 +342,7 @@ static int __init bcm6345_l1_of_init(str
+@@ -335,8 +338,7 @@ static int __init bcm6345_l1_of_init(str
  	for_each_cpu(idx, &intc->cpumask) {
  		struct bcm6345_l1_cpu *cpu = intc->cpus[idx];
  

+ 1 - 1
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
-@@ -7519,6 +7519,14 @@ F:	drivers/ptp/ptp_qoriq.c
+@@ -7520,6 +7520,14 @@ F:	drivers/ptp/ptp_qoriq.c
  F:	drivers/ptp/ptp_qoriq_debugfs.c
  F:	include/linux/fsl/ptp_qoriq.h
  

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

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

+ 1 - 1
target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch

@@ -257,7 +257,7 @@ Signed-off-by: Wolfram Sang <[email protected]>
  
 --- a/drivers/i2c/busses/i2c-ibm_iic.c
 +++ b/drivers/i2c/busses/i2c-ibm_iic.c
-@@ -738,7 +738,7 @@ static int iic_probe(struct platform_dev
+@@ -736,7 +736,7 @@ static int iic_probe(struct platform_dev
  	adap = &dev->adap;
  	adap->dev.parent = &ofdev->dev;
  	adap->dev.of_node = of_node_get(np);

+ 1 - 1
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
-@@ -9056,6 +9056,22 @@ F:	include/net/nl802154.h
+@@ -9057,6 +9057,22 @@ F:	include/net/nl802154.h
  F:	net/ieee802154/
  F:	net/mac802154/
  

+ 1 - 1
target/linux/ramips/patches-5.15/005-v6.5-09-MAINTAINERS-add-Mediatek-MTMIPS-Clock-maintainer.patch

@@ -13,7 +13,7 @@ Signed-off-by: Thomas Bogendoerfer <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -11858,6 +11858,12 @@ S:	Maintained
+@@ -11859,6 +11859,12 @@ S:	Maintained
  F:	Documentation/devicetree/bindings/clock/mediatek,mt7621-sysc.yaml
  F:	drivers/clk/ralink/clk-mt7621.c
  

+ 1 - 1
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
-@@ -15895,6 +15895,13 @@ S:	Maintained
+@@ -15896,6 +15896,13 @@ S:	Maintained
  F:	include/sound/rt*.h
  F:	sound/soc/codecs/rt*