From 057bf8fc5f390cf78dc440b3e72d540aeafe1e81 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 24 Sep 2023 21:31:42 +0200 Subject: kernel: bump 5.10 to 5.10.197 All patches automatically rebased. Signed-off-by: Hauke Mehrtens --- include/kernel-5.10 | 4 ++-- ...950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch | 2 +- ...50-0410-drm-atomic-Pass-the-full-state-to-CRTC-atomic-begin-.patch | 4 ++-- .../patches-5.10/400-mtd-rawnand-brcmnand-disable-WP-on-BCM4908.patch | 2 +- target/linux/generic/pending-5.10/834-ledtrig-libata.patch | 2 +- target/linux/oxnas/patches-5.10/999-libata-hacks.patch | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index e80b36bdef..794011133b 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .196 -LINUX_KERNEL_HASH-5.10.196 = 71ec2e3af082bcd7c4aac4b8ecdbc2e47695befe4984e3e5567791a605a96fc0 +LINUX_VERSION-5.10 = .197 +LINUX_KERNEL_HASH-5.10.197 = 183a4507b0ebec7816a79ceba6253aa7ad345e25b0fcd4e834ee154be9a993ab diff --git a/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch b/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch index abb90c862e..feda191820 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch @@ -427,7 +427,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc, --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c -@@ -49,15 +49,17 @@ static void exynos_drm_crtc_atomic_disab +@@ -48,15 +48,17 @@ static void exynos_drm_crtc_atomic_disab } static int exynos_crtc_atomic_check(struct drm_crtc *crtc, diff --git a/target/linux/bcm27xx/patches-5.10/950-0410-drm-atomic-Pass-the-full-state-to-CRTC-atomic-begin-.patch b/target/linux/bcm27xx/patches-5.10/950-0410-drm-atomic-Pass-the-full-state-to-CRTC-atomic-begin-.patch index 2cb81db3d1..b777f8a547 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0410-drm-atomic-Pass-the-full-state-to-CRTC-atomic-begin-.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0410-drm-atomic-Pass-the-full-state-to-CRTC-atomic-begin-.patch @@ -423,7 +423,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-2-max --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c -@@ -65,7 +65,7 @@ static int exynos_crtc_atomic_check(stru +@@ -64,7 +64,7 @@ static int exynos_crtc_atomic_check(stru } static void exynos_crtc_atomic_begin(struct drm_crtc *crtc, @@ -432,7 +432,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-2-max { struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); -@@ -74,7 +74,7 @@ static void exynos_crtc_atomic_begin(str +@@ -73,7 +73,7 @@ static void exynos_crtc_atomic_begin(str } static void exynos_crtc_atomic_flush(struct drm_crtc *crtc, diff --git a/target/linux/bcm4908/patches-5.10/400-mtd-rawnand-brcmnand-disable-WP-on-BCM4908.patch b/target/linux/bcm4908/patches-5.10/400-mtd-rawnand-brcmnand-disable-WP-on-BCM4908.patch index 74dddb7f48..65066236db 100644 --- a/target/linux/bcm4908/patches-5.10/400-mtd-rawnand-brcmnand-disable-WP-on-BCM4908.patch +++ b/target/linux/bcm4908/patches-5.10/400-mtd-rawnand-brcmnand-disable-WP-on-BCM4908.patch @@ -20,7 +20,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c -@@ -37,7 +37,11 @@ +@@ -38,7 +38,11 @@ * 1: NAND_WP is set by default, cleared for erase/write operations * 2: NAND_WP is always cleared */ diff --git a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch b/target/linux/generic/pending-5.10/834-ledtrig-libata.patch index 636fe24aea..a39aef640b 100644 --- a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-5.10/834-ledtrig-libata.patch @@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle /* * Define if arch has non-standard setup. This is a _PCI_ standard -@@ -883,6 +886,12 @@ struct ata_port { +@@ -887,6 +890,12 @@ struct ata_port { #ifdef CONFIG_ATA_ACPI struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif diff --git a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch index 461a1b87f4..beceb91062 100644 --- a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch @@ -36,7 +36,7 @@ --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -912,6 +912,8 @@ struct ata_port_operations { +@@ -916,6 +916,8 @@ struct ata_port_operations { enum ata_completion_errors (*qc_prep)(struct ata_queued_cmd *qc); unsigned int (*qc_issue)(struct ata_queued_cmd *qc); bool (*qc_fill_rtf)(struct ata_queued_cmd *qc); @@ -45,7 +45,7 @@ /* * Configuration and exception handling -@@ -1002,6 +1004,9 @@ struct ata_port_operations { +@@ -1006,6 +1008,9 @@ struct ata_port_operations { void (*phy_reset)(struct ata_port *ap); void (*eng_timeout)(struct ata_port *ap); -- cgit v1.2.3