Просмотр исходного кода

kernel: bump 6.12 to 6.12.66

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

All patches automatically rebased

Build system: x86/64
Build-tested: flogic/glinet_gl-mt6000
Run-tested: flogic/glinet_gl-mt6000

Signed-off-by: John Audia <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/21591
Signed-off-by: Hauke Mehrtens <[email protected]>
John Audia 4 дней назад
Родитель
Сommit
c0fb8e1f35

+ 1 - 1
target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch

@@ -18626,7 +18626,7 @@ Signed-off-by: j-schambacher <[email protected]>
  	 * For devices with more than one control interface, we assume the
 --- a/sound/usb/quirks.c
 +++ b/sound/usb/quirks.c
-@@ -2385,6 +2385,8 @@ static const struct usb_audio_quirk_flag
+@@ -2393,6 +2393,8 @@ static const struct usb_audio_quirk_flag
  		   QUIRK_FLAG_ALIGN_TRANSFER),
  	DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
  		   QUIRK_FLAG_ALIGN_TRANSFER),

+ 1 - 1
target/linux/bcm27xx/patches-6.12/950-0308-gpio-pca953x-Add-ti-tca9554-compatible-string.patch

@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/gpio/gpio-pca953x.c
 +++ b/drivers/gpio/gpio-pca953x.c
-@@ -1306,6 +1306,7 @@ static const struct of_device_id pca953x
+@@ -1351,6 +1351,7 @@ static const struct of_device_id pca953x
  	{ .compatible = "ti,tca9535", .data = OF_953X(16, PCA_INT), },
  	{ .compatible = "ti,tca9538", .data = OF_953X( 8, PCA_INT), },
  	{ .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), },

+ 1 - 1
target/linux/generic/hack-6.12/902-debloat_proc.patch

@@ -331,7 +331,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -4284,6 +4284,8 @@ static __net_initdata struct pernet_oper
+@@ -4285,6 +4285,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {

+ 2 - 2
target/linux/generic/kernel-6.12

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.12 = .65
-LINUX_KERNEL_HASH-6.12.65 = 54e852667af35c0ed06cfc81311e65fa7f5f798a3bfcf78a559d3b4785a139c1
+LINUX_VERSION-6.12 = .66
+LINUX_KERNEL_HASH-6.12.66 = ba3897a1c060b05a03cb4dda6f20d8c75e6f73c88b217744823a915056536eaf

+ 1 - 1
target/linux/generic/pending-6.12/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch

@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -8656,7 +8656,7 @@ static int nft_register_flowtable_net_ho
+@@ -8718,7 +8718,7 @@ static int nft_register_flowtable_net_ho
  		err = flowtable->data.type->setup(&flowtable->data,
  						  hook->ops.dev,
  						  FLOW_BLOCK_BIND);

+ 4 - 4
target/linux/generic/pending-6.12/834-ledtrig-libata.patch

@@ -63,7 +63,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  /**
   *	ata_build_rw_tf - Build ATA taskfile for given read/write request
   *	@qc: Metadata associated with the taskfile to build
-@@ -4767,6 +4778,9 @@ void __ata_qc_complete(struct ata_queued
+@@ -4770,6 +4781,9 @@ void __ata_qc_complete(struct ata_queued
  		link->active_tag = ATA_TAG_POISON;
  		ap->nr_active_links--;
  	}
@@ -73,7 +73,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  
  	/* clear exclusive status */
  	if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL &&
-@@ -5489,6 +5503,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5492,6 +5506,9 @@ struct ata_port *ata_port_alloc(struct a
  	ap->stats.unhandled_irq = 1;
  	ap->stats.idle_irq = 1;
  #endif
@@ -83,7 +83,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  	ata_sff_port_init(ap);
  
  	ata_force_pflags(ap);
-@@ -5505,6 +5522,12 @@ void ata_port_free(struct ata_port *ap)
+@@ -5508,6 +5525,12 @@ void ata_port_free(struct ata_port *ap)
  	kfree(ap->pmp_link);
  	kfree(ap->slave_link);
  	ida_free(&ata_ida, ap->print_id);
@@ -96,7 +96,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  	kfree(ap);
  }
  EXPORT_SYMBOL_GPL(ata_port_free);
-@@ -5909,7 +5932,23 @@ int ata_host_register(struct ata_host *h
+@@ -5912,7 +5935,23 @@ int ata_host_register(struct ata_host *h
  		WARN_ON(1);
  		return -EINVAL;
  	}

+ 1 - 1
target/linux/ipq40xx/patches-6.12/701-net-dsa-add-out-of-band-tagging-protocol.patch

@@ -136,7 +136,7 @@ Signed-off-by: Maxime Chevallier <[email protected]>
  #include <net/dst.h>
  #include <net/sock.h>
  #include <net/checksum.h>
-@@ -5068,6 +5072,9 @@ static const u8 skb_ext_type_len[] = {
+@@ -5070,6 +5074,9 @@ static const u8 skb_ext_type_len[] = {
  #if IS_ENABLED(CONFIG_MCTP_FLOWS)
  	[SKB_EXT_MCTP] = SKB_EXT_CHUNKSIZEOF(struct mctp_flow),
  #endif

+ 3 - 3
target/linux/realtek/patches-6.12/714-net-phy-sfp-add-support-for-SMBus.patch

@@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart <[email protected]>
 
 --- a/drivers/net/phy/sfp.c
 +++ b/drivers/net/phy/sfp.c
-@@ -713,10 +713,64 @@ static int sfp_i2c_write(struct sfp *sfp
+@@ -715,10 +715,64 @@ static int sfp_i2c_write(struct sfp *sfp
  	return ret == ARRAY_SIZE(msgs) ? len : 0;
  }
  
@@ -77,7 +77,7 @@ Signed-off-by: Antoine Tenart <[email protected]>
  
  	sfp->i2c = i2c;
  	sfp->read = sfp_i2c_read;
-@@ -748,6 +802,29 @@ static int sfp_i2c_mdiobus_create(struct
+@@ -750,6 +804,29 @@ static int sfp_i2c_mdiobus_create(struct
  	return 0;
  }
  
@@ -107,7 +107,7 @@ Signed-off-by: Antoine Tenart <[email protected]>
  static void sfp_i2c_mdiobus_destroy(struct sfp *sfp)
  {
  	mdiobus_unregister(sfp->i2c_mii);
-@@ -1922,9 +1999,15 @@ static void sfp_sm_fault(struct sfp *sfp
+@@ -1924,9 +2001,15 @@ static void sfp_sm_fault(struct sfp *sfp
  
  static int sfp_sm_add_mdio_bus(struct sfp *sfp)
  {

+ 2 - 2
target/linux/rockchip/patches-6.12/035-02-v6.13-gpio-rockchip-change-the-GPIO-version-judgment-logic.patch

@@ -16,7 +16,7 @@ Signed-off-by: Bartosz Golaszewski <[email protected]>
 
 --- a/drivers/gpio/gpio-rockchip.c
 +++ b/drivers/gpio/gpio-rockchip.c
-@@ -667,8 +667,9 @@ static int rockchip_get_bank_data(struct
+@@ -668,8 +668,9 @@ static int rockchip_get_bank_data(struct
  	clk_prepare_enable(bank->clk);
  	id = readl(bank->reg_base + gpio_regs_v2.version_id);
  
@@ -28,7 +28,7 @@ Signed-off-by: Bartosz Golaszewski <[email protected]>
  		bank->gpio_regs = &gpio_regs_v2;
  		bank->gpio_type = GPIO_TYPE_V2;
  		bank->db_clk = of_clk_get(bank->of_node, 1);
-@@ -677,9 +678,14 @@ static int rockchip_get_bank_data(struct
+@@ -678,9 +679,14 @@ static int rockchip_get_bank_data(struct
  			clk_disable_unprepare(bank->clk);
  			return -EINVAL;
  		}

+ 1 - 1
target/linux/rockchip/patches-6.12/035-03-v6.13-gpio-rockchip-support-new-version-GPIO.patch

@@ -24,7 +24,7 @@ Signed-off-by: Bartosz Golaszewski <[email protected]>
  
  static const struct rockchip_gpio_regs gpio_regs_v1 = {
  	.port_dr = 0x00,
-@@ -670,6 +671,7 @@ static int rockchip_get_bank_data(struct
+@@ -671,6 +672,7 @@ static int rockchip_get_bank_data(struct
  	switch (id) {
  	case GPIO_TYPE_V2:
  	case GPIO_TYPE_V2_1: