mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
kernel: bump 5.15 to 5.15.40
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
parent
6cdf974a3d
commit
e156f1f862
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .39
|
LINUX_VERSION-5.15 = .40
|
||||||
LINUX_KERNEL_HASH-5.15.39 = 888641634f9e0e38cd0efcfec92ea3c126d381b24a514740d3fe3dc9988fd7ad
|
LINUX_KERNEL_HASH-5.15.40 = c787f7eecbabbfca4dd3224827292a5fb98e3370c6e04b859714fba25bb8c33b
|
||||||
|
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
"__kstrtabns_" #sym ": \n" \
|
"__kstrtabns_" #sym ": \n" \
|
||||||
--- a/scripts/Makefile.build
|
--- a/scripts/Makefile.build
|
||||||
+++ b/scripts/Makefile.build
|
+++ b/scripts/Makefile.build
|
||||||
@@ -385,7 +385,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
|
@@ -396,7 +396,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
|
||||||
# Linker scripts preprocessor (.lds.S -> .lds)
|
# Linker scripts preprocessor (.lds.S -> .lds)
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
quiet_cmd_cpp_lds_S = LDS $@
|
quiet_cmd_cpp_lds_S = LDS $@
|
||||||
|
@ -23,7 +23,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|||||||
{ {0x02, 0x21}, "lz4", unlz4 },
|
{ {0x02, 0x21}, "lz4", unlz4 },
|
||||||
--- a/scripts/Makefile.lib
|
--- a/scripts/Makefile.lib
|
||||||
+++ b/scripts/Makefile.lib
|
+++ b/scripts/Makefile.lib
|
||||||
@@ -413,7 +413,7 @@ quiet_cmd_bzip2 = BZIP2 $@
|
@@ -402,7 +402,7 @@ quiet_cmd_bzip2 = BZIP2 $@
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
quiet_cmd_lzma = LZMA $@
|
quiet_cmd_lzma = LZMA $@
|
||||||
|
@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
}
|
}
|
||||||
--- a/scripts/link-vmlinux.sh
|
--- a/scripts/link-vmlinux.sh
|
||||||
+++ b/scripts/link-vmlinux.sh
|
+++ b/scripts/link-vmlinux.sh
|
||||||
@@ -260,6 +260,10 @@ kallsyms()
|
@@ -263,6 +263,10 @@ kallsyms()
|
||||||
kallsymopt="${kallsymopt} --base-relative"
|
kallsymopt="${kallsymopt} --base-relative"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -17,11 +17,9 @@ Signed-off-by: Andreas Böhler <dev@aboehler.at>
|
|||||||
drivers/mtd/nand/raw/nand_ids.c | 3 +++
|
drivers/mtd/nand/raw/nand_ids.c | 3 +++
|
||||||
1 file changed, 3 insertions(+)
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c
|
|
||||||
index 6e41902be35f..d64adbd1ce6b 100644
|
|
||||||
--- a/drivers/mtd/nand/raw/nand_ids.c
|
--- a/drivers/mtd/nand/raw/nand_ids.c
|
||||||
+++ b/drivers/mtd/nand/raw/nand_ids.c
|
+++ b/drivers/mtd/nand/raw/nand_ids.c
|
||||||
@@ -29,6 +29,9 @@ struct nand_flash_dev nand_flash_ids[] = {
|
@@ -29,6 +29,9 @@ struct nand_flash_dev nand_flash_ids[] =
|
||||||
{"TC58NVG0S3E 1G 3.3V 8-bit",
|
{"TC58NVG0S3E 1G 3.3V 8-bit",
|
||||||
{ .id = {0x98, 0xd1, 0x90, 0x15, 0x76, 0x14, 0x01, 0x00} },
|
{ .id = {0x98, 0xd1, 0x90, 0x15, 0x76, 0x14, 0x01, 0x00} },
|
||||||
SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), },
|
SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), },
|
||||||
@ -31,6 +29,3 @@ index 6e41902be35f..d64adbd1ce6b 100644
|
|||||||
{"TC58NVG2S0F 4G 3.3V 8-bit",
|
{"TC58NVG2S0F 4G 3.3V 8-bit",
|
||||||
{ .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} },
|
{ .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} },
|
||||||
SZ_4K, SZ_512, SZ_256K, 0, 8, 224, NAND_ECC_INFO(4, SZ_512) },
|
SZ_4K, SZ_512, SZ_256K, 0, 8, 224, NAND_ECC_INFO(4, SZ_512) },
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|||||||
|
|
||||||
--- a/drivers/pci/controller/pci-aardvark.c
|
--- a/drivers/pci/controller/pci-aardvark.c
|
||||||
+++ b/drivers/pci/controller/pci-aardvark.c
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
||||||
@@ -1634,9 +1634,7 @@ static int advk_pcie_enable_phy(struct a
|
@@ -1633,9 +1633,7 @@ static int advk_pcie_enable_phy(struct a
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = phy_power_on(pcie->phy);
|
ret = phy_power_on(pcie->phy);
|
||||||
|
Loading…
Reference in New Issue
Block a user