diff options
Diffstat (limited to 'SOURCES')
-rw-r--r-- | SOURCES/Patchlist.changelog | 3 | ||||
-rw-r--r-- | SOURCES/kernel-aarch64-debug-fedora.config | 21 | ||||
-rw-r--r-- | SOURCES/kernel-aarch64-fedora.config | 23 | ||||
-rw-r--r-- | SOURCES/kernel-aarch64-rhel.config | 2 | ||||
-rw-r--r-- | SOURCES/kernel-armv7hl-fedora.config | 2 | ||||
-rw-r--r-- | SOURCES/kernel-armv7hl-lpae-fedora.config | 2 | ||||
-rw-r--r-- | SOURCES/kernel-ppc64le-fedora.config | 2 | ||||
-rw-r--r-- | SOURCES/kernel-ppc64le-rhel.config | 2 | ||||
-rw-r--r-- | SOURCES/kernel-s390x-fedora.config | 2 | ||||
-rw-r--r-- | SOURCES/kernel-s390x-rhel.config | 2 | ||||
-rw-r--r-- | SOURCES/kernel-s390x-zfcpdump-rhel.config | 2 | ||||
-rw-r--r-- | SOURCES/kernel-x86_64-fedora.config | 2 | ||||
-rw-r--r-- | SOURCES/kernel-x86_64-rhel.config | 2 | ||||
-rw-r--r-- | SOURCES/patch-5.19-redhat.patch | 26 |
14 files changed, 78 insertions, 15 deletions
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index fe6cc02..a215fe6 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/b9dfa5218351f6286e97beba802c14813735f255 + b9dfa5218351f6286e97beba802c14813735f255 Revert "block: freeze the queue earlier in del_gendisk" + "https://gitlab.com/cki-project/kernel-ark/-/commit"/3f1696ca1e6762e9774ecb4d0dedbc54dedb284d 3f1696ca1e6762e9774ecb4d0dedbc54dedb284d drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config index 9687216..a520766 100644 --- a/SOURCES/kernel-aarch64-debug-fedora.config +++ b/SOURCES/kernel-aarch64-debug-fedora.config @@ -250,8 +250,17 @@ CONFIG_ANDROID=y # CONFIG_APDS9300 is not set CONFIG_APDS9802ALS=m CONFIG_APDS9960=m +CONFIG_APPLE_ADMAC=m +CONFIG_APPLE_AIC=y +CONFIG_APPLE_DART=m +CONFIG_APPLE_M1_CPU_PMU=y +CONFIG_APPLE_MAILBOX=m CONFIG_APPLE_MFI_FASTCHARGE=m +CONFIG_APPLE_PMGR_PWRSTATE=y # CONFIG_APPLE_PROPERTIES is not set +CONFIG_APPLE_RTKIT=m +CONFIG_APPLE_SART=m +CONFIG_APPLE_WATCHDOG=m # CONFIG_APPLICOM is not set CONFIG_APQ_GCC_8084=y CONFIG_APQ_MMCC_8084=m @@ -261,7 +270,7 @@ CONFIG_AR5523=m # CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_AIROHA is not set # CONFIG_ARCH_ALPINE is not set -# CONFIG_ARCH_APPLE is not set +CONFIG_ARCH_APPLE=y # CONFIG_ARCH_BCM_21664 is not set # CONFIG_ARCH_BCM_23550 is not set # CONFIG_ARCH_BCM_281XX is not set @@ -297,6 +306,7 @@ CONFIG_ARCH_MESON=y CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MXC=y +CONFIG_ARCH_NR_GPIO=2048 # CONFIG_ARCH_OMAP1 is not set # CONFIG_ARCH_PXA is not set CONFIG_ARCH_QCOM=y @@ -1150,6 +1160,7 @@ CONFIG_CNIC=m # CONFIG_CODA_FS is not set # CONFIG_COMEDI is not set CONFIG_COMMAND_LINE_SIZE=4096 +CONFIG_COMMON_CLK_APPLE_NCO=m CONFIG_COMMON_CLK_AXG_AUDIO=y CONFIG_COMMON_CLK_AXG=y CONFIG_COMMON_CLK_AXI_CLKGEN=m @@ -2754,6 +2765,7 @@ CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_AMD756_S4882 is not set # CONFIG_I2C_AMD8111 is not set CONFIG_I2C_AMD_MP2=m +CONFIG_I2C_APPLE=m CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_BCM2835=m CONFIG_I2C_BOARDINFO=y @@ -4996,8 +5008,10 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set +CONFIG_NVME_APPLE=m CONFIG_NVME_FC=m CONFIG_NVME_HWMON=y +CONFIG_NVMEM_APPLE_EFUSES=m # CONFIG_NVMEM_IMX_IIM is not set CONFIG_NVMEM_IMX_OCOTP=m CONFIG_NVMEM_IMX_OCOTP_SCU=m @@ -5164,6 +5178,8 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIE_AL is not set # CONFIG_PCIE_ALTERA is not set +CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000 +CONFIG_PCIE_APPLE=y CONFIG_PCIE_ARMADA_8K=y CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_PERFORMANCE is not set @@ -5324,6 +5340,7 @@ CONFIG_PID_NS=y CONFIG_PINCONF=y CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_APPLE_GPIO=m # CONFIG_PINCTRL_APQ8064 is not set # CONFIG_PINCTRL_APQ8084 is not set CONFIG_PINCTRL_AS3722=y @@ -6670,6 +6687,8 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_QCOM_GENI_CONSOLE=y CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set +CONFIG_SERIAL_SAMSUNG_CONSOLE=y +CONFIG_SERIAL_SAMSUNG=y # CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config index 7a64fe7..eaa9cb9 100644 --- a/SOURCES/kernel-aarch64-fedora.config +++ b/SOURCES/kernel-aarch64-fedora.config @@ -57,7 +57,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_DOCK=y -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_HED=y @@ -250,8 +250,17 @@ CONFIG_ANDROID=y # CONFIG_APDS9300 is not set CONFIG_APDS9802ALS=m CONFIG_APDS9960=m +CONFIG_APPLE_ADMAC=m +CONFIG_APPLE_AIC=y +CONFIG_APPLE_DART=m +CONFIG_APPLE_M1_CPU_PMU=y +CONFIG_APPLE_MAILBOX=m CONFIG_APPLE_MFI_FASTCHARGE=m +CONFIG_APPLE_PMGR_PWRSTATE=y # CONFIG_APPLE_PROPERTIES is not set +CONFIG_APPLE_RTKIT=m +CONFIG_APPLE_SART=m +CONFIG_APPLE_WATCHDOG=m # CONFIG_APPLICOM is not set CONFIG_APQ_GCC_8084=y CONFIG_APQ_MMCC_8084=m @@ -261,7 +270,7 @@ CONFIG_AR5523=m # CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_AIROHA is not set # CONFIG_ARCH_ALPINE is not set -# CONFIG_ARCH_APPLE is not set +CONFIG_ARCH_APPLE=y # CONFIG_ARCH_BCM_21664 is not set # CONFIG_ARCH_BCM_23550 is not set # CONFIG_ARCH_BCM_281XX is not set @@ -297,6 +306,7 @@ CONFIG_ARCH_MESON=y CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MXC=y +CONFIG_ARCH_NR_GPIO=2048 # CONFIG_ARCH_OMAP1 is not set # CONFIG_ARCH_PXA is not set CONFIG_ARCH_QCOM=y @@ -1150,6 +1160,7 @@ CONFIG_CNIC=m # CONFIG_CODA_FS is not set # CONFIG_COMEDI is not set CONFIG_COMMAND_LINE_SIZE=4096 +CONFIG_COMMON_CLK_APPLE_NCO=m CONFIG_COMMON_CLK_AXG_AUDIO=y CONFIG_COMMON_CLK_AXG=y CONFIG_COMMON_CLK_AXI_CLKGEN=m @@ -2738,6 +2749,7 @@ CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_AMD756_S4882 is not set # CONFIG_I2C_AMD8111 is not set CONFIG_I2C_AMD_MP2=m +CONFIG_I2C_APPLE=m CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_BCM2835=m CONFIG_I2C_BOARDINFO=y @@ -4976,8 +4988,10 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set +CONFIG_NVME_APPLE=m CONFIG_NVME_FC=m CONFIG_NVME_HWMON=y +CONFIG_NVMEM_APPLE_EFUSES=m # CONFIG_NVMEM_IMX_IIM is not set CONFIG_NVMEM_IMX_OCOTP=m CONFIG_NVMEM_IMX_OCOTP_SCU=m @@ -5143,6 +5157,8 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIE_AL is not set # CONFIG_PCIE_ALTERA is not set +CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000 +CONFIG_PCIE_APPLE=y CONFIG_PCIE_ARMADA_8K=y CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_PERFORMANCE is not set @@ -5303,6 +5319,7 @@ CONFIG_PID_NS=y CONFIG_PINCONF=y CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_APPLE_GPIO=m # CONFIG_PINCTRL_APQ8064 is not set # CONFIG_PINCTRL_APQ8084 is not set CONFIG_PINCTRL_AS3722=y @@ -6649,6 +6666,8 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_QCOM_GENI_CONSOLE=y CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set +CONFIG_SERIAL_SAMSUNG_CONSOLE=y +CONFIG_SERIAL_SAMSUNG=y # CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config index 074a123..62c6b66 100644 --- a/SOURCES/kernel-aarch64-rhel.config +++ b/SOURCES/kernel-aarch64-rhel.config @@ -37,7 +37,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_DOCK is not set -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_HED=y diff --git a/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config index fe0c8a6..5211dd1 100644 --- a/SOURCES/kernel-armv7hl-fedora.config +++ b/SOURCES/kernel-armv7hl-fedora.config @@ -52,7 +52,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_HED=y diff --git a/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config index 5f9686c..a9bf9a1 100644 --- a/SOURCES/kernel-armv7hl-lpae-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-fedora.config @@ -52,7 +52,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_HED=y diff --git a/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config index 95fb258..256a669 100644 --- a/SOURCES/kernel-ppc64le-fedora.config +++ b/SOURCES/kernel-ppc64le-fedora.config @@ -52,7 +52,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_HED=y diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config index 7be464b..a3ac966 100644 --- a/SOURCES/kernel-ppc64le-rhel.config +++ b/SOURCES/kernel-ppc64le-rhel.config @@ -35,7 +35,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_HED=y diff --git a/SOURCES/kernel-s390x-fedora.config b/SOURCES/kernel-s390x-fedora.config index 9f4e43c..1901b81 100644 --- a/SOURCES/kernel-s390x-fedora.config +++ b/SOURCES/kernel-s390x-fedora.config @@ -53,7 +53,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_HED=y diff --git a/SOURCES/kernel-s390x-rhel.config b/SOURCES/kernel-s390x-rhel.config index 1a311f1..c0c45bd 100644 --- a/SOURCES/kernel-s390x-rhel.config +++ b/SOURCES/kernel-s390x-rhel.config @@ -34,7 +34,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_HED=y diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config index 211d4a0..9d1e14e 100644 --- a/SOURCES/kernel-s390x-zfcpdump-rhel.config +++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config @@ -34,7 +34,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set CONFIG_ACPI_HED=y diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index b5cd475..05d46fe 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -58,7 +58,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_DOCK=y CONFIG_ACPI_DPTF=y -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m # CONFIG_ACPI_EXTLOG is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_FPDT=y diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index 077cc32..d04da29 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -39,7 +39,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_DOCK=y CONFIG_ACPI_DPTF=y -# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_EXTLOG=m CONFIG_ACPI_FAN=y # CONFIG_ACPI_FPDT is not set diff --git a/SOURCES/patch-5.19-redhat.patch b/SOURCES/patch-5.19-redhat.patch index cc73ad2..f5d5aee 100644 --- a/SOURCES/patch-5.19-redhat.patch +++ b/SOURCES/patch-5.19-redhat.patch @@ -16,6 +16,7 @@ arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + arch/x86/kernel/setup.c | 22 +- + block/genhd.c | 3 +- drivers/acpi/apei/hest.c | 8 + drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + @@ -58,7 +59,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 60 files changed, 1727 insertions(+), 313 deletions(-) + 61 files changed, 1729 insertions(+), 314 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml index e6485f7b046f..217c42874f41 100644 @@ -250,7 +251,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 65dc4f93ffdb..f305e434bc0c 100644 +index cb68101ea070..da893ccb2025 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -495,6 +496,27 @@ index bd6c6fd373ae..3333b08a778d 100644 reserve_initrd(); +diff --git a/block/genhd.c b/block/genhd.c +index 278227ba1d53..e0675772178b 100644 +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -623,7 +623,6 @@ void del_gendisk(struct gendisk *disk) + * Prevent new I/O from crossing bio_queue_enter(). + */ + blk_queue_start_drain(q); +- blk_mq_freeze_queue_wait(q); + + if (!(disk->flags & GENHD_FL_HIDDEN)) { + sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi"); +@@ -647,6 +646,8 @@ void del_gendisk(struct gendisk *disk) + pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); + device_del(disk_to_dev(disk)); + ++ blk_mq_freeze_queue_wait(q); ++ + blk_throtl_cancel_bios(disk->queue); + + blk_sync_queue(q); diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 6aef1ee5e1bd..8f146b1b4972 100644 --- a/drivers/acpi/apei/hest.c |