From 35b2c96d3ff40c11b143ce992634c0be8cb08c08 Mon Sep 17 00:00:00 2001 From: Marty Jones Date: Sat, 5 Oct 2024 15:47:59 -0400 Subject: [PATCH] kernel: Linux 6.11.2 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/?h=v6.11.2 Signed-off-by: Marty Jones --- include/kernel-6.11 | 4 ++-- .../hack-6.11/410-block-fit-partition-parser.patch | 2 +- .../pending-6.11/810-pci_disable_common_quirks.patch | 8 ++++---- .../840-hwrng-bcm2835-set-quality-to-1000.patch | 2 +- ...0-hwrng-add-hwrng-driver-for-Rockchip-RK3568-SoC.patch | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/kernel-6.11 b/include/kernel-6.11 index 0a442c0a641284..ca3fc1c0da74f2 100644 --- a/include/kernel-6.11 +++ b/include/kernel-6.11 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.11 = -LINUX_KERNEL_HASH-6.11 = 55d2c6c025ebc27810c748d66325dd5bc601e8d32f8581d9e77673529bdacb2e +LINUX_VERSION-6.11 = .2 +LINUX_KERNEL_HASH-6.11.2 = ec9ef7a0b9cebb55940e1ef87a1f9e1004b10456a119dc386bb3e565b0d39c42 diff --git a/target/linux/generic/hack-6.11/410-block-fit-partition-parser.patch b/target/linux/generic/hack-6.11/410-block-fit-partition-parser.patch index 2a99a2b98d0cce..7cb7211b63019a 100644 --- a/target/linux/generic/hack-6.11/410-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-6.11/410-block-fit-partition-parser.patch @@ -86,7 +86,7 @@ /* everything is up and running, commence */ err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL); if (err) -@@ -565,6 +577,11 @@ static bool blk_add_partition(struct gen +@@ -567,6 +579,11 @@ static bool blk_add_partition(struct gen (state->parts[p].flags & ADDPART_FLAG_RAID)) md_autodetect_dev(part->bd_dev); diff --git a/target/linux/generic/pending-6.11/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-6.11/810-pci_disable_common_quirks.patch index cdba3caf8bf9b0..559348332f1805 100644 --- a/target/linux/generic/pending-6.11/810-pci_disable_common_quirks.patch +++ b/target/linux/generic/pending-6.11/810-pci_disable_common_quirks.patch @@ -25,7 +25,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -300,6 +300,7 @@ static void quirk_mmio_always_on(struct +@@ -313,6 +313,7 @@ static void quirk_mmio_always_on(struct DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on); @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos /* * The Mellanox Tavor device gives false positive parity errors. Disable * parity error reporting. -@@ -3495,6 +3496,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -3508,6 +3509,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); @@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos /* * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. * To work around this, query the size it should be configured to by the -@@ -3520,6 +3523,8 @@ static void quirk_intel_ntb(struct pci_d +@@ -3533,6 +3536,8 @@ static void quirk_intel_ntb(struct pci_d DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb); @@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos /* * Some BIOS implementations leave the Intel GPU interrupts enabled, even * though no one is handling them (e.g., if the i915 driver is never -@@ -3558,6 +3563,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN +@@ -3571,6 +3576,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); diff --git a/target/linux/generic/pending-6.11/840-hwrng-bcm2835-set-quality-to-1000.patch b/target/linux/generic/pending-6.11/840-hwrng-bcm2835-set-quality-to-1000.patch index 4bc5a7da455cde..3172ad5a167b0e 100644 --- a/target/linux/generic/pending-6.11/840-hwrng-bcm2835-set-quality-to-1000.patch +++ b/target/linux/generic/pending-6.11/840-hwrng-bcm2835-set-quality-to-1000.patch @@ -16,7 +16,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c -@@ -167,6 +167,7 @@ static int bcm2835_rng_probe(struct plat +@@ -169,6 +169,7 @@ static int bcm2835_rng_probe(struct plat priv->rng.init = bcm2835_rng_init; priv->rng.read = bcm2835_rng_read; priv->rng.cleanup = bcm2835_rng_cleanup; diff --git a/target/linux/rockchip/patches-6.11/300-hwrng-add-hwrng-driver-for-Rockchip-RK3568-SoC.patch b/target/linux/rockchip/patches-6.11/300-hwrng-add-hwrng-driver-for-Rockchip-RK3568-SoC.patch index 4c8be2c6492711..683d1b1d5e51c9 100644 --- a/target/linux/rockchip/patches-6.11/300-hwrng-add-hwrng-driver-for-Rockchip-RK3568-SoC.patch +++ b/target/linux/rockchip/patches-6.11/300-hwrng-add-hwrng-driver-for-Rockchip-RK3568-SoC.patch @@ -26,7 +26,7 @@ Acked-by: Krzysztof Kozlowski --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig -@@ -572,6 +572,20 @@ config HW_RANDOM_JH7110 +@@ -573,6 +573,20 @@ config HW_RANDOM_JH7110 To compile this driver as a module, choose M here. The module will be called jh7110-trng.