diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-22 21:06:00 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-22 21:06:00 +0100 |
| commit | b0995a72579bb0c91e12a767b0058ab55acf3659 (patch) | |
| tree | 36e93dc9d43cad93869e3f97e639868a7bd8d047 | |
| parent | 6d23e9cbda56f043899adba37921a1632505858e (diff) | |
| parent | 76155709657b5685c9dc1e06c9a3968b8710faae (diff) | |
| download | kernel-b0995a72579bb0c91e12a767b0058ab55acf3659.tar.gz kernel-b0995a72579bb0c91e12a767b0058ab55acf3659.tar.xz kernel-b0995a72579bb0c91e12a767b0058ab55acf3659.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc0.20221222git9d2f6060fe4c.11.vanilla.1.fc38kernel-6.2.0-0.rc0.20221222git9d2f6060fe4c.11.vanilla.1.fc37kernel-6.2.0-0.rc0.20221222git9d2f6060fe4c.11.vanilla.1.fc36
26 files changed, 87 insertions, 16 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index a68e6b9df..3e1b29e09 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 = 10 +RHEL_RELEASE = 11 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index eae117786..b8441932e 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/bd7cb112bc916fbaa71c838de09ef8894a9f99e3 - bd7cb112bc916fbaa71c838de09ef8894a9f99e3 Revert "arm64: remove special treatment for the link order of head.o" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cf11ba28840339cd1d829360ea13accb0ee6a0c0 + cf11ba28840339cd1d829360ea13accb0ee6a0c0 Revert "arm64: remove special treatment for the link order of head.o" "https://gitlab.com/cki-project/kernel-ark/-/commit"/77542637f2e84a847a7886979e0613332695c181 77542637f2e84a847a7886979e0613332695c181 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 94bc0871a..b33f86dc9 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4172,6 +4172,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set CONFIG_MFD_SPMI_PMIC=m # CONFIG_MFD_STMFX is not set CONFIG_MFD_STMPE=y @@ -4191,6 +4192,7 @@ CONFIG_MFD_TPS65086=m # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -5796,6 +5798,7 @@ CONFIG_PWM_IMX_TPM=m CONFIG_PWM_MESON=m CONFIG_PWM_OMAP_DMTIMER=m CONFIG_PWM_PCA9685=m +# CONFIG_PWM_PXA is not set CONFIG_PWM_RASPBERRYPI_POE=m CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_STMPE=y @@ -9207,6 +9210,7 @@ CONFIG_XILLYBUS_OF=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m CONFIG_XLNX_EVENT_MANAGER=y +# CONFIG_XLNX_R5_REMOTEPROC is not set CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 020cc8f7a..89852e85e 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3328,6 +3328,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_SL28CPLD is not set # CONFIG_MFD_SM501_GPIO is not set # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3342,6 +3343,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 9cda84518..ef6c3155b 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4152,6 +4152,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set CONFIG_MFD_SPMI_PMIC=m # CONFIG_MFD_STMFX is not set CONFIG_MFD_STMPE=y @@ -4171,6 +4172,7 @@ CONFIG_MFD_TPS65086=m # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -5775,6 +5777,7 @@ CONFIG_PWM_IMX_TPM=m CONFIG_PWM_MESON=m CONFIG_PWM_OMAP_DMTIMER=m CONFIG_PWM_PCA9685=m +# CONFIG_PWM_PXA is not set CONFIG_PWM_RASPBERRYPI_POE=m CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_STMPE=y @@ -9184,6 +9187,7 @@ CONFIG_XILLYBUS_OF=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m CONFIG_XLNX_EVENT_MANAGER=y +# CONFIG_XLNX_R5_REMOTEPROC is not set CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 93a106066..353253207 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3307,6 +3307,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_SL28CPLD is not set # CONFIG_MFD_SM501_GPIO is not set # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3321,6 +3322,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index dbd2cb00b..40ab021dd 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -4148,6 +4148,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set CONFIG_MFD_SPMI_PMIC=m CONFIG_MFD_STM32_LPTIMER=m CONFIG_MFD_STM32_TIMERS=m @@ -4171,6 +4172,7 @@ CONFIG_MFD_TI_LMU=m CONFIG_MFD_TPS65090=y CONFIG_MFD_TPS65217=m CONFIG_MFD_TPS65218=m +# CONFIG_MFD_TPS65219 is not set CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y @@ -5794,6 +5796,7 @@ CONFIG_PWM_IMX_TPM=m CONFIG_PWM_MESON=m CONFIG_PWM_OMAP_DMTIMER=m CONFIG_PWM_PCA9685=m +# CONFIG_PWM_PXA is not set CONFIG_PWM_RASPBERRYPI_POE=m CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_SAMSUNG=m @@ -9302,6 +9305,7 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 02277e264..c57a39ca0 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -4130,6 +4130,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set CONFIG_MFD_SPMI_PMIC=m CONFIG_MFD_STM32_LPTIMER=m CONFIG_MFD_STM32_TIMERS=m @@ -4153,6 +4154,7 @@ CONFIG_MFD_TI_LMU=m CONFIG_MFD_TPS65090=y CONFIG_MFD_TPS65217=m CONFIG_MFD_TPS65218=m +# CONFIG_MFD_TPS65219 is not set CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y @@ -5775,6 +5777,7 @@ CONFIG_PWM_IMX_TPM=m CONFIG_PWM_MESON=m CONFIG_PWM_OMAP_DMTIMER=m CONFIG_PWM_PCA9685=m +# CONFIG_PWM_PXA is not set CONFIG_PWM_RASPBERRYPI_POE=m CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_SAMSUNG=m @@ -9281,6 +9284,7 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 7fbffead3..2c0c1aee8 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -4068,6 +4068,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set CONFIG_MFD_STM32_LPTIMER=m CONFIG_MFD_STM32_TIMERS=m # CONFIG_MFD_STMFX is not set @@ -4090,6 +4091,7 @@ CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_TPS65090=y # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y @@ -5666,6 +5668,7 @@ CONFIG_PWM_IMX_TPM=m CONFIG_PWM_MESON=m # CONFIG_PWM_OMAP_DMTIMER is not set CONFIG_PWM_PCA9685=m +# CONFIG_PWM_PXA is not set CONFIG_PWM_RASPBERRYPI_POE=m CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_SAMSUNG=m @@ -9050,6 +9053,7 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index d50cceffe..16ef93894 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -4050,6 +4050,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set CONFIG_MFD_STM32_LPTIMER=m CONFIG_MFD_STM32_TIMERS=m # CONFIG_MFD_STMFX is not set @@ -4072,6 +4073,7 @@ CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_TPS65090=y # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y @@ -5647,6 +5649,7 @@ CONFIG_PWM_IMX_TPM=m CONFIG_PWM_MESON=m # CONFIG_PWM_OMAP_DMTIMER is not set CONFIG_PWM_PCA9685=m +# CONFIG_PWM_PXA is not set CONFIG_PWM_RASPBERRYPI_POE=m CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_SAMSUNG=m @@ -9029,6 +9032,7 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 14625a97a..c539e3225 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3478,6 +3478,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3494,6 +3495,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -4872,6 +4874,7 @@ CONFIG_PWM_DWC=m CONFIG_PWM_HIBVT=m CONFIG_PWM_OMAP_DMTIMER=m # CONFIG_PWM_PCA9685 is not set +# CONFIG_PWM_PXA is not set # CONFIG_PWM_XILINX is not set CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=m @@ -7776,6 +7779,7 @@ CONFIG_XILLYBUS=m # CONFIG_XILLYBUS_OF is not set CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set # CONFIG_XMON_DEFAULT is not set CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XMON_DISASSEMBLY=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 2095d9076..1fcd4bfe5 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3130,6 +3130,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3144,6 +3145,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 1c69bbd8e..c441252f6 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3458,6 +3458,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3474,6 +3475,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -4851,6 +4853,7 @@ CONFIG_PWM_DWC=m CONFIG_PWM_HIBVT=m CONFIG_PWM_OMAP_DMTIMER=m # CONFIG_PWM_PCA9685 is not set +# CONFIG_PWM_PXA is not set # CONFIG_PWM_XILINX is not set CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=m @@ -7753,6 +7756,7 @@ CONFIG_XILLYBUS=m # CONFIG_XILLYBUS_OF is not set CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set # CONFIG_XMON_DEFAULT is not set CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XMON_DISASSEMBLY=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 6b2440a0c..f5a10a83a 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3110,6 +3110,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3124,6 +3125,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c494e45fe..7c7b031d7 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3461,6 +3461,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3477,6 +3478,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -4801,6 +4803,7 @@ CONFIG_PWM_HIBVT=m # CONFIG_PWM is not set CONFIG_PWM_OMAP_DMTIMER=m # CONFIG_PWM_PCA9685 is not set +# CONFIG_PWM_PXA is not set # CONFIG_PWM_XILINX is not set CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SD8787=m @@ -7730,6 +7733,7 @@ CONFIG_XILINX_VCU=m # CONFIG_XILLYBUS_OF is not set CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set CONFIG_XZ_DEC_IA64=y CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 6bb16f27f..138087c9c 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3117,6 +3117,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3131,6 +3132,7 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 08684e5f2..fb4a133ef 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3441,6 +3441,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3457,6 +3458,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -4780,6 +4782,7 @@ CONFIG_PWM_HIBVT=m # CONFIG_PWM is not set CONFIG_PWM_OMAP_DMTIMER=m # CONFIG_PWM_PCA9685 is not set +# CONFIG_PWM_PXA is not set # CONFIG_PWM_XILINX is not set CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SD8787=m @@ -7707,6 +7710,7 @@ CONFIG_XILINX_VCU=m # CONFIG_XILLYBUS_OF is not set CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set CONFIG_XZ_DEC_IA64=y CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 069ba7773..4b86f8168 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3097,6 +3097,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3111,6 +3112,7 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index b7bcfbb7a..c9dc5b9b2 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3109,6 +3109,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3123,6 +3124,7 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index e59da580b..718b59a99 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3762,6 +3762,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3778,6 +3779,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -5206,6 +5208,7 @@ CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m CONFIG_PWM_OMAP_DMTIMER=m # CONFIG_PWM_PCA9685 is not set +# CONFIG_PWM_PXA is not set # CONFIG_PWM_XILINX is not set CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=m @@ -8296,6 +8299,7 @@ CONFIG_XILLYBUS=m # CONFIG_XILLYBUS_OF is not set CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set # CONFIG_XO15_EBOOK is not set CONFIG_XPOWER_PMIC_OPREGION=y CONFIG_XZ_DEC_IA64=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index f0f13e2c7..b6005d864 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3297,6 +3297,7 @@ CONFIG_MFD_INTEL_LPSS=y # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3311,6 +3312,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index ec4cc2ba2..e7c95d9f7 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3743,6 +3743,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3759,6 +3760,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -5186,6 +5188,7 @@ CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m CONFIG_PWM_OMAP_DMTIMER=m # CONFIG_PWM_PCA9685 is not set +# CONFIG_PWM_PXA is not set # CONFIG_PWM_XILINX is not set CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=m @@ -8274,6 +8277,7 @@ CONFIG_XILLYBUS=m # CONFIG_XILLYBUS_OF is not set CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m +# CONFIG_XLNX_R5_REMOTEPROC is not set # CONFIG_XO15_EBOOK is not set CONFIG_XPOWER_PMIC_OPREGION=y CONFIG_XZ_DEC_IA64=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ebdb22b73..4a644466a 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3277,6 +3277,7 @@ CONFIG_MFD_INTEL_LPSS=y # CONFIG_MFD_SL28CPLD is not set CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m +# CONFIG_MFD_SMPRO is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set @@ -3291,6 +3292,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set diff --git a/kernel.spec b/kernel.spec index 741661f83..08432fdc6 100755 --- a/kernel.spec +++ b/kernel.spec @@ -130,13 +130,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc0.20221221gitb6bb9676f216.10 +%define pkgrelease 0.rc0.20221222git9d2f6060fe4c.11 %define kversion 6 -%define tarfile_release 6.1-13872-gb6bb9676f216 +%define tarfile_release 6.1-14364-g9d2f6060fe4c # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20221221gitb6bb9676f216.10%{?buildid}%{?dist} +%define specrelease 0.rc0.20221222git9d2f6060fe4c.11%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -619,6 +619,7 @@ BuildRequires: opencsd-devel >= 1.0.0 %endif %endif %if %{with_tools} +BuildRequires: python3-docutils BuildRequires: gettext ncurses-devel BuildRequires: libcap-devel libcap-ng-devel BuildRequires: libtracefs-devel @@ -2352,7 +2353,7 @@ pushd tools/gpio/ popd # build VM tools pushd tools/vm/ -%{tools_make} CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" slabinfo page_owner_sort +%{tools_make} slabinfo page_owner_sort popd pushd tools/tracing/rtla %{tools_make} @@ -3191,9 +3192,13 @@ fi # # %changelog -* Wed Dec 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.b6bb9676f216.10] +* Thu Dec 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.9d2f6060fe4c.11] - Revert "arm64: remove special treatment for the link order of head.o" (Justin M. Forbes) +* Thu Dec 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.9d2f6060fe4c.10] +- spec: add missing BuildRequires: python3-docutils for tools (Ondrej Mosnacek) +- Linux v6.2.0-0.rc0.9d2f6060fe4c + * Wed Dec 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.b6bb9676f216.9] - Linux v6.2.0-0.rc0.b6bb9676f216 diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 7f813ceb0..464311238 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -229,7 +229,7 @@ index fbd646dbf440..23ca9cdb2438 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 2094f575c532..b74be981b1dc 100644 +index 2b6091349daa..b9eafa68df6e 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -240,7 +240,7 @@ index 2094f575c532..b74be981b1dc 100644 #include <linux/hugetlb.h> #include <linux/kmemleak.h> -@@ -979,6 +980,9 @@ void __init setup_arch(char **cmdline_p) +@@ -980,6 +981,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -561,7 +561,7 @@ index b51f2a4c821e..be31d32aba53 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 31a4090c66b3..92cc28552227 100644 +index 09716eebe8ac..dcc10a1cdf96 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -32,6 +32,7 @@ @@ -572,7 +572,7 @@ index 31a4090c66b3..92cc28552227 100644 #include <asm/early_ioremap.h> -@@ -902,40 +903,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -904,40 +905,101 @@ int efi_mem_type(unsigned long phys_addr) } #endif @@ -2559,7 +2559,7 @@ index e7fc37a68069..b91424eebd96 100644 obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 35972afb6850..c884c1a42723 100644 +index 64131f88c553..14752f864aa0 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ @@ -1,3 +1,3 @@ -SHA512 (linux-6.1-13872-gb6bb9676f216.tar.xz) = 05e1b93f988b83ebc69d1aafbc66ef21b2627f9ad95937c1a355fc6bed71ab206275ff79732ac38b4d7bdd05cf45ef3a2424864838f7362d5db7c9256a46c241 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 1c4e8ef92e503ff26385e84e990c900265261102373877f4452f9cbb575831034e5cdc884638910345680db4c3c94abc4ce314adba8d2624114565a8e109d1fe -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 57a1774e9a2eb55713d534d1f0e349db95f98693154187ce61adf6ff2bd7c896be59065e28356bf39b2e8b34e9bba5f4ef5a32aaea45095888991a0f7ad2662a +SHA512 (linux-6.1-14364-g9d2f6060fe4c.tar.xz) = 54747da1c949822dfdaffc1f7bd212998a399b6372eaad5d47a821e6651dc38861a4d6e3e8acbee714bbb28998c11f1eaface92e17ff359eaa996a0576c1c859 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = e0521160b1f2bdcefc6d38e9d8bbbcbb24de456b5055f0b424f50a3e878e0ce60ec43ddb2c70cf5ac8a1e91fb5547f978895e40eddd04dde263d309d075a81d2 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 8813cae90e4e11adc64a3b59c378995577e4c093bad6533c3c86a264a344c6712ccd6238c9784b006a183180f4f48161cdc369c475bebae564f79c271d30296e |