diff --git a/Makefile.rhelver b/Makefile.rhelver index 1c25bd071..af759d5f9 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 33 +RHEL_RELEASE = 35 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index eb463c0e6..ba19239f6 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,3 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/303ea0d45db99c3ef3837b706717920086b580e5 - 303ea0d45db99c3ef3837b706717920086b580e5 kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes - "https://gitlab.com/cki-project/kernel-ark/-/commit"/22dd8ddfd304a1eb6fe11f5aad6a6e8523575414 22dd8ddfd304a1eb6fe11f5aad6a6e8523575414 Revert "acpi: prefer booting with ACPI over DTS" diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 31471903c..9fe5745ea 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5329,7 +5329,6 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index d1515440e..3b7b4f21a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4250,7 +4250,6 @@ CONFIG_PANIC_TIMEOUT=0 # CONFIG_PANTHERLORD_FF is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 717eed45b..5e7770216 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5302,7 +5302,6 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 3d1d3ac36..7a8c83b7e 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4227,7 +4227,6 @@ CONFIG_PANIC_TIMEOUT=0 # CONFIG_PANTHERLORD_FF is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 729e4dbbd..2b839a9fa 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5334,7 +5334,6 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index bdc66314c..3116ec602 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5309,7 +5309,6 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 44a431ff2..2ab87580b 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5226,7 +5226,6 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 9182d98d1..751876d3a 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5201,7 +5201,6 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index abb3bd136..2d3386548 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4516,7 +4516,6 @@ CONFIG_PAGE_TABLE_CHECK=y CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y CONFIG_PAPR_SCM=m -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 1d472f41f..9a70e6a76 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4009,7 +4009,6 @@ CONFIG_PAGE_TABLE_CHECK=y CONFIG_PANIC_TIMEOUT=180 # CONFIG_PANTHERLORD_FF is not set CONFIG_PAPR_SCM=m -# CONFIG_PARIDE is not set # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 1a0194f22..af77fd32d 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4487,7 +4487,6 @@ CONFIG_PAGE_REPORTING=y CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y CONFIG_PAPR_SCM=m -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index d0f621bef..fbe9e94ce 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3988,7 +3988,6 @@ CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=180 # CONFIG_PANTHERLORD_FF is not set CONFIG_PAPR_SCM=m -# CONFIG_PARIDE is not set # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 039956d4b..21120f8eb 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4488,7 +4488,6 @@ CONFIG_PAGE_TABLE_CHECK=y # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 3ea03194f..193e7a956 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3992,7 +3992,6 @@ CONFIG_PAGE_TABLE_CHECK=y # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 # CONFIG_PANTHERLORD_FF is not set -# CONFIG_PARIDE is not set # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 8276d3085..a980e3a59 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4459,7 +4459,6 @@ CONFIG_PAGE_REPORTING=y # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 6bc93ec23..8dbee5035 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3971,7 +3971,6 @@ CONFIG_PAGE_REPORTING=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=0 # CONFIG_PANTHERLORD_FF is not set -# CONFIG_PARIDE is not set # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index d6ba9ee6d..4369c8cf6 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3985,7 +3985,6 @@ CONFIG_PAGE_REPORTING=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=0 # CONFIG_PANTHERLORD_FF is not set -# CONFIG_PARIDE is not set # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index ba3926f3b..89f6f3685 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4839,10 +4839,8 @@ CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m CONFIG_PARPORT_1284=y -# CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT=m # CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC_FIFO is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 990448801..b6e931093 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4201,9 +4201,7 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARPORT_1284=y -# CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT=m # CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC_FIFO is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 2904ad2ff..c83bbeccf 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4812,10 +4812,8 @@ CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARMAN=m CONFIG_PARPORT_1284=y -# CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT=m # CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC_FIFO is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 942dd1a60..f80cf5ce1 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4180,9 +4180,7 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT=y -# CONFIG_PARIDE is not set CONFIG_PARPORT_1284=y -# CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT=m # CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC_FIFO is not set diff --git a/kernel.spec b/kernel.spec index a36161401..f0f2bfd6b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -143,13 +143,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.3.0 %define patchversion 6.3 -%define pkgrelease 0.rc3.20230324git1e760fa3596e.33 +%define pkgrelease 0.rc4.35 %define kversion 6 -%define tarfile_release 6.3-rc3-31-g1e760fa3596e +%define tarfile_release 6.3-rc4 # This is needed to do merge window version magic %define patchlevel 3 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20230324git1e760fa3596e.33%{?buildid}%{?dist} +%define specrelease 0.rc4.35%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.3.0 @@ -3360,8 +3360,16 @@ fi # # %changelog -* Fri Mar 24 2023 Fedora Kernel Team [6.3.0-0.rc3.1e760fa3596e.33] -- kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes (Marco Elver) +* Mon Mar 27 2023 Fedora Kernel Team [6.3.0-0.rc4.35] +- generic: common: Parport and paride/ata cleanups (Peter Robinson) +- Linux v6.3.0-0.rc4 + +* Sun Mar 26 2023 Fedora Kernel Team [6.3.0-0.rc3.da8e7da11e4b.34] +- Linux v6.3.0-0.rc3.da8e7da11e4b + +* Sat Mar 25 2023 Fedora Kernel Team [6.3.0-0.rc3.65aca32efdcb.33] +- CONFIG_SND_SOC_CS42L83 is no longer common (Justin M. Forbes) +- Linux v6.3.0-0.rc3.65aca32efdcb * Fri Mar 24 2023 Fedora Kernel Team [6.3.0-0.rc3.1e760fa3596e.32] - Revert "acpi: prefer booting with ACPI over DTS" (Mark Salter) diff --git a/patch-6.3-redhat.patch b/patch-6.3-redhat.patch index ac050ae71..7c20da9a9 100644 --- a/patch-6.3-redhat.patch +++ b/patch-6.3-redhat.patch @@ -4,9 +4,6 @@ Makefile | 20 +- arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 3 +- - arch/powerpc/include/asm/kasan.h | 2 +- - arch/powerpc/include/asm/string.h | 15 +- - arch/powerpc/kernel/prom_init_check.sh | 9 +- arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + @@ -66,7 +63,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 68 files changed, 1563 insertions(+), 196 deletions(-) + 65 files changed, 1544 insertions(+), 189 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 6221a1d057dd..90c169923eda 100644 @@ -122,7 +119,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index a2c310df2145..5b7c0413e3cd 100644 +index da2586d4c728..7efbc45514bd 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -196,75 +193,6 @@ index 1023e896d46b..55822162d9ee 100644 range 12 14 if ARM64_16K_PAGES default "12" if ARM64_16K_PAGES range 11 16 if ARM64_4K_PAGES -diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h -index 92a968202ba7..365d2720097c 100644 ---- a/arch/powerpc/include/asm/kasan.h -+++ b/arch/powerpc/include/asm/kasan.h -@@ -2,7 +2,7 @@ - #ifndef __ASM_KASAN_H - #define __ASM_KASAN_H - --#ifdef CONFIG_KASAN -+#if defined(CONFIG_KASAN) && !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX) - #define _GLOBAL_KASAN(fn) _GLOBAL(__##fn) - #define _GLOBAL_TOC_KASAN(fn) _GLOBAL_TOC(__##fn) - #define EXPORT_SYMBOL_KASAN(fn) EXPORT_SYMBOL(__##fn) -diff --git a/arch/powerpc/include/asm/string.h b/arch/powerpc/include/asm/string.h -index 2aa0e31e6884..60ba22770f51 100644 ---- a/arch/powerpc/include/asm/string.h -+++ b/arch/powerpc/include/asm/string.h -@@ -30,11 +30,17 @@ extern int memcmp(const void *,const void *,__kernel_size_t); - extern void * memchr(const void *,int,__kernel_size_t); - void memcpy_flushcache(void *dest, const void *src, size_t size); - -+#ifdef CONFIG_KASAN -+/* __mem variants are used by KASAN to implement instrumented meminstrinsics. */ -+#ifdef CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX -+#define __memset memset -+#define __memcpy memcpy -+#define __memmove memmove -+#else /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */ - void *__memset(void *s, int c, __kernel_size_t count); - void *__memcpy(void *to, const void *from, __kernel_size_t n); - void *__memmove(void *to, const void *from, __kernel_size_t n); -- --#if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__) -+#ifndef __SANITIZE_ADDRESS__ - /* - * For files that are not instrumented (e.g. mm/slub.c) we - * should use not instrumented version of mem* functions. -@@ -46,8 +52,9 @@ void *__memmove(void *to, const void *from, __kernel_size_t n); - #ifndef __NO_FORTIFY - #define __NO_FORTIFY /* FORTIFY_SOURCE uses __builtin_memcpy, etc. */ - #endif -- --#endif -+#endif /* !__SANITIZE_ADDRESS__ */ -+#endif /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */ -+#endif /* CONFIG_KASAN */ - - #ifdef CONFIG_PPC64 - #ifndef CONFIG_KASAN -diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh -index 5a319863f289..69623b9045d5 100644 ---- a/arch/powerpc/kernel/prom_init_check.sh -+++ b/arch/powerpc/kernel/prom_init_check.sh -@@ -13,8 +13,13 @@ - # If you really need to reference something from prom_init.o add - # it to the list below: - --grep "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} >/dev/null --if [ $? -eq 0 ] -+has_renamed_memintrinsics() -+{ -+ grep -q "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} && \ -+ ! grep -q "^CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX=y" ${KCONFIG_CONFIG} -+} -+ -+if has_renamed_memintrinsics - then - MEM_FUNCS="__memcpy __memset" - else diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index b0d00032479d..afb9544fb007 100644 --- a/arch/s390/include/asm/ipl.h @@ -1291,7 +1219,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index d4be525f8100..3ee03d5dff9d 100644 +index 53ef028596c6..6014cd758c77 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -251,6 +251,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1761,10 +1689,10 @@ index 8e24ebcebfe5..25aa49292397 100644 { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, PCI_ANY_ID, PCI_ANY_ID }, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index 80c4ee9df2a4..7f34a0966245 100644 +index bee1b8a82020..cf02b902109d 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -8082,6 +8082,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { +@@ -8093,6 +8093,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -1772,7 +1700,7 @@ index 80c4ee9df2a4..7f34a0966245 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -8094,13 +8095,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -8105,13 +8106,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, @@ -1844,7 +1772,7 @@ index eae288c8d40a..8b8bf447cedc 100644 error_proc: diff --git a/include/linux/efi.h b/include/linux/efi.h -index 04a733f0ba95..f5eb381ffed0 100644 +index 7aa62c92185f..2da17f5aeef9 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -43,6 +43,8 @@ @@ -1856,7 +1784,7 @@ index 04a733f0ba95..f5eb381ffed0 100644 typedef unsigned long efi_status_t; typedef u8 efi_bool_t; typedef u16 efi_char16_t; /* UNICODE character */ -@@ -856,6 +858,14 @@ extern int __init efi_setup_pcdp_console(char *); +@@ -857,6 +859,14 @@ extern int __init efi_setup_pcdp_console(char *); #define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */ #define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */ #define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */ @@ -1871,7 +1799,7 @@ index 04a733f0ba95..f5eb381ffed0 100644 #ifdef CONFIG_EFI /* -@@ -867,6 +877,8 @@ static inline bool efi_enabled(int feature) +@@ -868,6 +878,8 @@ static inline bool efi_enabled(int feature) } extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); @@ -1880,7 +1808,7 @@ index 04a733f0ba95..f5eb381ffed0 100644 bool __pure __efi_soft_reserve_enabled(void); static inline bool __pure efi_soft_reserve_enabled(void) -@@ -888,6 +900,8 @@ static inline bool efi_enabled(int feature) +@@ -889,6 +901,8 @@ static inline bool efi_enabled(int feature) static inline void efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {} @@ -1889,7 +1817,7 @@ index 04a733f0ba95..f5eb381ffed0 100644 static inline bool efi_soft_reserve_enabled(void) { return false; -@@ -902,6 +916,7 @@ static inline void efi_find_mirror(void) {} +@@ -903,6 +917,7 @@ static inline void efi_find_mirror(void) {} #endif extern int efi_status_to_err(efi_status_t status); @@ -1897,7 +1825,7 @@ index 04a733f0ba95..f5eb381ffed0 100644 /* * Variable Attributes -@@ -1107,13 +1122,6 @@ static inline bool efi_runtime_disabled(void) { return true; } +@@ -1108,13 +1123,6 @@ static inline bool efi_runtime_disabled(void) { return true; } extern void efi_call_virt_check_flags(unsigned long flags, const char *call); extern unsigned long efi_call_virt_save_flags(void); diff --git a/sources b/sources index d17c3070a..93fd5f0c6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.3-rc3-31-g1e760fa3596e.tar.xz) = 633727e44337afd2b3a47d704614bfae6dabd39a0c86a4e320a7f849f1430c97bc6e8fefc8101978f638e6d2faeff30305c3945fe181c57abbb8bb48ea1bfa29 -SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = b96d0ddfeec4279d6aaaeea706655223032a23313f2d6457ae5a67dca59cc8a607fd3c7140b98cc15c00b7f8ccc636ff9c33758d3613860e997d7de5dc0d0f45 -SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 43d00c03c9f19d0bba9dc897effc7c1818be28eb9968030589ebb184bfd0115c9c18d373c924de52c60d5e471a789b700d8f7eb1bf02100f92de9d7920c53f4a +SHA512 (linux-6.3-rc4.tar.xz) = 4bce5dd1f9ad06d18804adcf462e3e9d65c0715c88823de0744dc970fc375f26a0744a362851ef30f9f695a3593574a443e0f9d91eef5ed21e384bc0855aa6de +SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 726596cd69d13912e357b290ae0a2c4ad50f8c677eee21b18188c54b502909a503fc9c91977628f1c5573193fb14dcc0e095e75072cf45de1f3e1e6a5d8a6555 +SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = a3287ed4584b21e76963db80de31d6aacb22a101575020c75d49ea761fce8ed9e8951a93c12da0258eabf5655bd4b1f130ebdf9068eb401d67370c86467740c6