Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kernel: bump 6.6 to 6.6.25 #15063

Merged
merged 2 commits into from Apr 5, 2024
Merged

kernel: bump 6.6 to 6.6.25 #15063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c2eca6
kernel: bump 6.6 to 6.6.24
graysky2 Apr 3, 2024
e6f7e9d
kernel: bump 6.6 to 6.6.25
graysky2 Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/kernel-6.6
View file
Open in desktop
@@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .23
LINUX_KERNEL_HASH-6.6.23 = 200fd119cb9ef06bcedcdb52be00ba443163eab154295c5831fed9a12211a8b9
LINUX_VERSION-6.6 = .25
LINUX_KERNEL_HASH-6.6.25 = 99d210be87908233a55b0fadc0dccd3b95926c0651b6b82e37350b2029de1f44
2 changes: 1 addition & 1 deletion ...ric/backport-6.6/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
View file
Open in desktop
Expand Up @@ -132,7 +132,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
imx_ocotp_nvmem_config.priv = priv;
--- a/drivers/nvmem/meson-efuse.c
+++ b/drivers/nvmem/meson-efuse.c
@@ -93,6 +93,7 @@ static int meson_efuse_probe(struct plat
@@ -74,6 +74,7 @@ static int meson_efuse_probe(struct plat

econfig->dev = dev;
econfig->name = dev_name(dev);
Expand Down
55 changes: 0 additions & 55 deletions .../generic/backport-6.6/838-v6.9-leds-trigger-netdev-Fix-kernel-panic-on-interface-re.patch
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions target/linux/generic/backport-6.6/981-mtd-spinand-Add-support-for-5-byte-IDs.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support

#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
@@ -1147,6 +1152,11 @@ static const struct usb_device_id option
@@ -1152,6 +1157,11 @@ static const struct usb_device_id option
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
Expand All @@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
/* Quectel products using Qualcomm vendor ID */
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
@@ -1188,6 +1198,11 @@ static const struct usb_device_id option
@@ -1193,6 +1203,11 @@ static const struct usb_device_id option
.driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-6.6/902-debloat_proc.patch
View file
Open in desktop
Expand Up @@ -385,7 +385,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -556,5 +556,8 @@ static __net_initdata struct pernet_oper
@@ -557,5 +557,8 @@ static __net_initdata struct pernet_oper

int __init ip_misc_proc_init(void)
{
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/pending-6.6/450-14-mmc-block-set-fwnode-of-disk-devices.patch
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>

--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -2461,6 +2461,8 @@ static struct mmc_blk_data *mmc_blk_allo
@@ -2463,6 +2463,8 @@ static struct mmc_blk_data *mmc_blk_allo
int area_type,
unsigned int part_type)
{
Expand All @@ -23,7 +23,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
struct mmc_blk_data *md;
int devidx, ret;
char cap_str[10];
@@ -2557,6 +2559,13 @@ static struct mmc_blk_data *mmc_blk_allo
@@ -2559,6 +2561,13 @@ static struct mmc_blk_data *mmc_blk_allo

blk_queue_write_cache(md->queue.queue, cache_enabled, fua_enabled);

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-6.6/450-15-mmc-block-set-GENHD_FL_NVMEM.patch
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>

--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -2515,6 +2515,7 @@ static struct mmc_blk_data *mmc_blk_allo
@@ -2517,6 +2517,7 @@ static struct mmc_blk_data *mmc_blk_allo
md->disk->major = MMC_BLOCK_MAJOR;
md->disk->minors = perdev_minors;
md->disk->first_minor = devidx * perdev_minors;
Expand Down
2 changes: 1 addition & 1 deletion .../linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -8214,7 +8214,7 @@ static int nft_register_flowtable_net_ho
@@ -8221,7 +8221,7 @@ static int nft_register_flowtable_net_ho
err = flowtable->data.type->setup(&flowtable->data,
hook->ops.dev,
FLOW_BLOCK_BIND);
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-6.6/834-ledtrig-libata.patch
View file
Open in desktop
Expand Up @@ -132,7 +132,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>

/*
* Define if arch has non-standard setup. This is a _PCI_ standard
@@ -874,6 +877,12 @@ struct ata_port {
@@ -875,6 +878,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif
Expand Down
2 changes: 1 addition & 1 deletion target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch
View file
Open in desktop
Expand Up @@ -93,7 +93,7 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
+#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -4627,6 +4627,9 @@ enum skb_ext_id {
@@ -4637,6 +4637,9 @@ enum skb_ext_id {
#if IS_ENABLED(CONFIG_MCTP_FLOWS)
SKB_EXT_MCTP,
#endif
Expand Down
2 changes: 1 addition & 1 deletion target/linux/mediatek/patches-6.6/410-bt-mtk-serial-fix.patch
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
},
[PORT_NPCM] = {
.name = "Nuvoton 16550",
@@ -2780,6 +2780,11 @@ serial8250_do_set_termios(struct uart_po
@@ -2774,6 +2774,11 @@ serial8250_do_set_termios(struct uart_po
unsigned long flags;
unsigned int baud, quot, frac = 0;

Expand Down
59 changes: 0 additions & 59 deletions ...ek/patches-6.6/831-thermal-drivers-mediatek-Fix-control-buffer-enablement-on-MT7896.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions target/linux/qualcommax/patches-6.6/0053-v6.7-clk-qcom-gcc-ipq6018-add-QUP6-I2C-clock.patch
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>

--- a/drivers/clk/qcom/gcc-ipq6018.c
+++ b/drivers/clk/qcom/gcc-ipq6018.c
@@ -2119,6 +2119,26 @@ static struct clk_branch gcc_blsp1_qup5_
@@ -2121,6 +2121,26 @@ static struct clk_branch gcc_blsp1_qup5_
},
};

Expand All @@ -47,7 +47,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
static struct clk_branch gcc_blsp1_qup6_spi_apps_clk = {
.halt_reg = 0x0700c,
.clkr = {
@@ -4275,6 +4295,7 @@ static struct clk_regmap *gcc_ipq6018_cl
@@ -4277,6 +4297,7 @@ static struct clk_regmap *gcc_ipq6018_cl
[GCC_BLSP1_QUP4_SPI_APPS_CLK] = &gcc_blsp1_qup4_spi_apps_clk.clkr,
[GCC_BLSP1_QUP5_I2C_APPS_CLK] = &gcc_blsp1_qup5_i2c_apps_clk.clkr,
[GCC_BLSP1_QUP5_SPI_APPS_CLK] = &gcc_blsp1_qup5_spi_apps_clk.clkr,
Expand Down
4 changes: 2 additions & 2 deletions ...alcommax/patches-6.6/0060-v6.9-clk-qcom-gcc-ipq6018-add-qdss_at-clock-needed-for-wi.patch
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>

--- a/drivers/clk/qcom/gcc-ipq6018.c
+++ b/drivers/clk/qcom/gcc-ipq6018.c
@@ -3522,6 +3522,22 @@ static struct clk_branch gcc_prng_ahb_cl
@@ -3524,6 +3524,22 @@ static struct clk_branch gcc_prng_ahb_cl
},
};

Expand All @@ -40,7 +40,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
static struct clk_branch gcc_qdss_dap_clk = {
.halt_reg = 0x29084,
.clkr = {
@@ -4361,6 +4377,7 @@ static struct clk_regmap *gcc_ipq6018_cl
@@ -4363,6 +4379,7 @@ static struct clk_regmap *gcc_ipq6018_cl
[GCC_SYS_NOC_PCIE0_AXI_CLK] = &gcc_sys_noc_pcie0_axi_clk.clkr,
[GCC_PCIE0_PIPE_CLK] = &gcc_pcie0_pipe_clk.clkr,
[GCC_PRNG_AHB_CLK] = &gcc_prng_ahb_clk.clkr,
Expand Down
8 changes: 4 additions & 4 deletions ...ux/qualcommax/patches-6.6/0101-clk-qcom-gcc-ipq8074-rework-nss_port5-6-clock-to-mul.patch
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -1675,13 +1675,21 @@ static struct clk_regmap_div nss_port4_t
@@ -1677,13 +1677,21 @@ static struct clk_regmap_div nss_port4_t
},
};

Expand All @@ -49,7 +49,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
F(156250000, P_UNIPHY1_RX, 2, 0, 0),
F(312500000, P_UNIPHY1_RX, 1, 0, 0),
{ }
@@ -1737,13 +1745,21 @@ static struct clk_regmap_div nss_port5_r
@@ -1739,13 +1747,21 @@ static struct clk_regmap_div nss_port5_r
},
};

Expand All @@ -75,7 +75,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
F(156250000, P_UNIPHY1_TX, 2, 0, 0),
F(312500000, P_UNIPHY1_TX, 1, 0, 0),
{ }
@@ -1799,13 +1815,21 @@ static struct clk_regmap_div nss_port5_t
@@ -1801,13 +1817,21 @@ static struct clk_regmap_div nss_port5_t
},
};

Expand All @@ -101,7 +101,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
F(156250000, P_UNIPHY2_RX, 2, 0, 0),
F(312500000, P_UNIPHY2_RX, 1, 0, 0),
{ }
@@ -1856,13 +1880,21 @@ static struct clk_regmap_div nss_port6_r
@@ -1858,13 +1882,21 @@ static struct clk_regmap_div nss_port6_r
},
};

Expand Down
2 changes: 1 addition & 1 deletion target/linux/qualcommax/patches-6.6/0118-clk-qcom-Add-WCSSAON-reset.patch
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>

--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4710,6 +4710,7 @@ static const struct qcom_reset_map gcc_i
@@ -4712,6 +4712,7 @@ static const struct qcom_reset_map gcc_i
[GCC_NSSPORT4_RESET] = { .reg = 0x68014, .bitmask = BIT(27) | GENMASK(9, 8) },
[GCC_NSSPORT5_RESET] = { .reg = 0x68014, .bitmask = BIT(28) | GENMASK(11, 10) },
[GCC_NSSPORT6_RESET] = { .reg = 0x68014, .bitmask = BIT(29) | GENMASK(13, 12) },
Expand Down
2 changes: 1 addition & 1 deletion ...ux/qualcommax/patches-6.6/0904-clk-qcom-ipq6018-workaround-networking-clock-parenti.patch
View file
Open in desktop
Expand Up @@ -92,7 +92,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
};

static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = {
@@ -1897,12 +1897,11 @@ static const struct freq_tbl ftbl_ubi32_
@@ -1899,12 +1899,11 @@ static const struct freq_tbl ftbl_ubi32_
{ }
};

Expand Down