From 26518b2cca22452e05e13386e82c7b0fc977535d Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 5 Sep 2022 09:49:55 +0100 Subject: kernel-6.0.0-0.rc4.31 * Mon Sep 05 2022 Fedora Kernel Team [6.0.0-0.rc4.31] - Linux v6.0.0-0.rc4 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 12 ++++++------ kernel-aarch64-debug-rhel.config | 22 +++++++++++----------- kernel-aarch64-fedora.config | 12 ++++++------ kernel-aarch64-rhel.config | 22 +++++++++++----------- kernel-ppc64le-debug-rhel.config | 7 +++---- kernel-ppc64le-rhel.config | 7 +++---- kernel-s390x-debug-rhel.config | 5 ++--- kernel-s390x-rhel.config | 5 ++--- kernel-s390x-zfcpdump-rhel.config | 5 ++--- kernel-x86_64-debug-rhel.config | 6 ++---- kernel-x86_64-rhel.config | 6 ++---- kernel.spec | 19 +++++++++++++++---- patch-6.0-redhat.patch | 4 ++-- sources | 6 +++--- 15 files changed, 71 insertions(+), 69 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 25620a326..2c3816673 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 = 28 +RHEL_RELEASE = 31 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 1471abb52..51117251d 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3078,12 +3078,12 @@ CONFIG_INOTIFY_USER=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ADXL34X is not set CONFIG_INPUT_APANEL=m -CONFIG_INPUT_ATI_REMOTE2=m +# CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m # CONFIG_INPUT_BMA150 is not set -CONFIG_INPUT_CM109=m +# CONFIG_INPUT_CM109 is not set CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_CMA3000=m # CONFIG_INPUT_DA7280_HAPTICS is not set @@ -3096,7 +3096,7 @@ CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_GPIO_BEEPER is not set # CONFIG_INPUT_GPIO_DECODER is not set -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_HISI_POWERKEY=y CONFIG_INPUT_IDEAPAD_SLIDEBAR=m @@ -3107,7 +3107,7 @@ CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y -CONFIG_INPUT_KEYSPAN_REMOTE=m +# CONFIG_INPUT_KEYSPAN_REMOTE is not set CONFIG_INPUT_KXTJ9=m CONFIG_INPUT_LEDS=y CONFIG_INPUT_MATRIXKMAP=m @@ -3124,7 +3124,7 @@ CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PM8941_PWRKEY is not set CONFIG_INPUT_PM8XXX_VIBRATOR=m CONFIG_INPUT_PMIC8XXX_PWRKEY=m -CONFIG_INPUT_POWERMATE=m +# CONFIG_INPUT_POWERMATE is not set CONFIG_INPUT_PWM_BEEPER=m # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set @@ -3136,7 +3136,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_UINPUT=m CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT=y -CONFIG_INPUT_YEALINK=m +# CONFIG_INPUT_YEALINK is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_MACHINE_KEYRING=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index e31f6328b..354f00fd3 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2135,7 +2135,7 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_HP206C is not set # CONFIG_HPFS_FS is not set # CONFIG_HP_ILO is not set -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -2420,11 +2420,11 @@ CONFIG_INOTIFY_USER=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ADXL34X is not set CONFIG_INPUT_APANEL=m -CONFIG_INPUT_ATI_REMOTE2=m +# CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set # CONFIG_INPUT_BMA150 is not set -CONFIG_INPUT_CM109=m +# CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_CMA3000 is not set # CONFIG_INPUT_DA7280_HAPTICS is not set # CONFIG_INPUT_DRV260X_HAPTICS is not set @@ -2436,8 +2436,9 @@ CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_GPIO_BEEPER is not set # CONFIG_INPUT_GPIO_DECODER is not set -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_GPIO_VIBRA is not set +# CONFIG_INPUT_HISI_POWERKEY is not set # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set @@ -2446,11 +2447,11 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_KEYBOARD=y -CONFIG_INPUT_KEYSPAN_REMOTE=m +# CONFIG_INPUT_KEYSPAN_REMOTE is not set # CONFIG_INPUT_KXTJ9 is not set CONFIG_INPUT_LEDS=y # CONFIG_INPUT_MATRIXKMAP is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y # CONFIG_INPUT_MMA8450 is not set # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 @@ -2459,15 +2460,16 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_POWERMATE=m +# CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set +# CONFIG_INPUT_REGULATOR_HAPTIC is not set CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_UINPUT=m CONFIG_INPUT=y -CONFIG_INPUT_YEALINK=m +# CONFIG_INPUT_YEALINK is not set # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y @@ -3813,7 +3815,7 @@ CONFIG_NET_VENDOR_STMICRO=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4435,7 +4437,6 @@ CONFIG_PROVE_NVDIMM_LOCKING=y # CONFIG_PROVE_RAW_LOCK_NESTING is not set CONFIG_PSAMPLE=m # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set @@ -6794,7 +6795,6 @@ CONFIG_VFIO=m CONFIG_VFIO_NOIOMMU=y # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV_KVM=y # CONFIG_VFIO_PLATFORM is not set CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 28f4b1406..45a2618a3 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3062,12 +3062,12 @@ CONFIG_INOTIFY_USER=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ADXL34X is not set CONFIG_INPUT_APANEL=m -CONFIG_INPUT_ATI_REMOTE2=m +# CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m # CONFIG_INPUT_BMA150 is not set -CONFIG_INPUT_CM109=m +# CONFIG_INPUT_CM109 is not set CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_CMA3000=m # CONFIG_INPUT_DA7280_HAPTICS is not set @@ -3080,7 +3080,7 @@ CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_GPIO_BEEPER is not set # CONFIG_INPUT_GPIO_DECODER is not set -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_HISI_POWERKEY=y CONFIG_INPUT_IDEAPAD_SLIDEBAR=m @@ -3091,7 +3091,7 @@ CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y -CONFIG_INPUT_KEYSPAN_REMOTE=m +# CONFIG_INPUT_KEYSPAN_REMOTE is not set CONFIG_INPUT_KXTJ9=m CONFIG_INPUT_LEDS=y CONFIG_INPUT_MATRIXKMAP=m @@ -3108,7 +3108,7 @@ CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PM8941_PWRKEY is not set CONFIG_INPUT_PM8XXX_VIBRATOR=m CONFIG_INPUT_PMIC8XXX_PWRKEY=m -CONFIG_INPUT_POWERMATE=m +# CONFIG_INPUT_POWERMATE is not set CONFIG_INPUT_PWM_BEEPER=m # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set @@ -3120,7 +3120,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_UINPUT=m CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT=y -CONFIG_INPUT_YEALINK=m +# CONFIG_INPUT_YEALINK is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_MACHINE_KEYRING=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index bede66748..2b8e6e753 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2119,7 +2119,7 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_HP206C is not set # CONFIG_HPFS_FS is not set # CONFIG_HP_ILO is not set -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -2404,11 +2404,11 @@ CONFIG_INOTIFY_USER=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ADXL34X is not set CONFIG_INPUT_APANEL=m -CONFIG_INPUT_ATI_REMOTE2=m +# CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set # CONFIG_INPUT_BMA150 is not set -CONFIG_INPUT_CM109=m +# CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_CMA3000 is not set # CONFIG_INPUT_DA7280_HAPTICS is not set # CONFIG_INPUT_DRV260X_HAPTICS is not set @@ -2420,8 +2420,9 @@ CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_GPIO_BEEPER is not set # CONFIG_INPUT_GPIO_DECODER is not set -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_GPIO_VIBRA is not set +# CONFIG_INPUT_HISI_POWERKEY is not set # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set @@ -2430,11 +2431,11 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_KEYBOARD=y -CONFIG_INPUT_KEYSPAN_REMOTE=m +# CONFIG_INPUT_KEYSPAN_REMOTE is not set # CONFIG_INPUT_KXTJ9 is not set CONFIG_INPUT_LEDS=y # CONFIG_INPUT_MATRIXKMAP is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y # CONFIG_INPUT_MMA8450 is not set # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 @@ -2443,15 +2444,16 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_POWERMATE=m +# CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set +# CONFIG_INPUT_REGULATOR_HAPTIC is not set CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_UINPUT=m CONFIG_INPUT=y -CONFIG_INPUT_YEALINK=m +# CONFIG_INPUT_YEALINK is not set # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y @@ -3792,7 +3794,7 @@ CONFIG_NET_VENDOR_STMICRO=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4412,7 +4414,6 @@ CONFIG_PROVE_NVDIMM_LOCKING=y # CONFIG_PROVE_RAW_LOCK_NESTING is not set CONFIG_PSAMPLE=m # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set @@ -6769,7 +6770,6 @@ CONFIG_VFIO=m CONFIG_VFIO_NOIOMMU=y # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV_KVM=y # CONFIG_VFIO_PLATFORM is not set CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index fe8b6d9ee..a3d58a381 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1961,7 +1961,7 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_HP206C is not set # CONFIG_HPFS_FS is not set # CONFIG_HP_ILO is not set -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -3625,7 +3625,7 @@ CONFIG_NET_VENDOR_SOLARFLARE=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4232,7 +4232,7 @@ CONFIG_PSAMPLE=m CONFIG_PSERIES_CPUIDLE=y CONFIG_PSERIES_ENERGY=m # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set +CONFIG_PSERIES_WDT=y CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set @@ -6549,7 +6549,6 @@ CONFIG_VFIO=m # CONFIG_VFIO_NOIOMMU is not set # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV_KVM=y CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y CONFIG_VGA_CONSOLE=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 94867c89e..19d69809f 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1945,7 +1945,7 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_HP206C is not set # CONFIG_HPFS_FS is not set # CONFIG_HP_ILO is not set -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -3605,7 +3605,7 @@ CONFIG_NET_VENDOR_SOLARFLARE=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4211,7 +4211,7 @@ CONFIG_PSAMPLE=m CONFIG_PSERIES_CPUIDLE=y CONFIG_PSERIES_ENERGY=m # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set +CONFIG_PSERIES_WDT=y CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set @@ -6526,7 +6526,6 @@ CONFIG_VFIO=m # CONFIG_VFIO_NOIOMMU is not set # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV_KVM=y CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y CONFIG_VGA_CONSOLE=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 5aca369be..d9cab874d 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1959,7 +1959,7 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_HP206C is not set # CONFIG_HPFS_FS is not set # CONFIG_HP_ILO is not set -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -3608,7 +3608,7 @@ CONFIG_NET_VENDOR_SOLARFLARE=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4170,7 +4170,6 @@ CONFIG_PROVE_NVDIMM_LOCKING=y # CONFIG_PROVE_RAW_LOCK_NESTING is not set CONFIG_PSAMPLE=m # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d6ca71b49..a24f27dc2 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1943,7 +1943,7 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_HP206C is not set # CONFIG_HPFS_FS is not set # CONFIG_HP_ILO is not set -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -3588,7 +3588,7 @@ CONFIG_NET_VENDOR_SOLARFLARE=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4149,7 +4149,6 @@ CONFIG_PROVE_NVDIMM_LOCKING=y # CONFIG_PROVE_RAW_LOCK_NESTING is not set CONFIG_PSAMPLE=m # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 1b8ce8f51..355a46892 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1952,7 +1952,7 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_HP206C is not set # CONFIG_HPFS_FS is not set # CONFIG_HP_ILO is not set -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -3601,7 +3601,7 @@ CONFIG_NET_VENDOR_SOLARFLARE=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4164,7 +4164,6 @@ CONFIG_PROVE_NVDIMM_LOCKING=y # CONFIG_PROVE_RAW_LOCK_NESTING is not set # CONFIG_PSAMPLE is not set # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index ad1a7b69d..f591d81b8 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2082,7 +2082,7 @@ CONFIG_HP_ILO=m CONFIG_HP_WATCHDOG=m CONFIG_HPWDT_NMI_DECODING=y CONFIG_HP_WMI=m -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -3797,7 +3797,7 @@ CONFIG_NET_VENDOR_STMICRO=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4396,7 +4396,6 @@ CONFIG_PROVE_NVDIMM_LOCKING=y CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_PSAMPLE=m # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set @@ -6779,7 +6778,6 @@ CONFIG_VFIO_NOIOMMU=y # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m # CONFIG_VFIO_PCI_VGA is not set -CONFIG_VFIO_PCI_ZDEV_KVM=y CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y CONFIG_VGA_CONSOLE=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 8c9a87604..b97881f16 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2066,7 +2066,7 @@ CONFIG_HP_ILO=m CONFIG_HP_WATCHDOG=m CONFIG_HPWDT_NMI_DECODING=y CONFIG_HP_WMI=m -# CONFIG_HSA_AMD_P2P is not set +CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y # CONFIG_HSI is not set @@ -3777,7 +3777,7 @@ CONFIG_NET_VENDOR_STMICRO=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set -CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set CONFIG_NET_VRF=m @@ -4374,7 +4374,6 @@ CONFIG_PROVE_NVDIMM_LOCKING=y CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_PSAMPLE=m # CONFIG_PSERIES_PLPKS is not set -# CONFIG_PSERIES_WDT is not set CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set @@ -6755,7 +6754,6 @@ CONFIG_VFIO_NOIOMMU=y # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m # CONFIG_VFIO_PCI_VGA is not set -CONFIG_VFIO_PCI_ZDEV_KVM=y CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y CONFIG_VGA_CONSOLE=y diff --git a/kernel.spec b/kernel.spec index 7e89bebd1..eb80f338f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -120,17 +120,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # define buildid .local %define specversion 6.0.0 %define patchversion 6.0 -%define pkgrelease 0.rc3.20220902git42e66b1cc3a0.28 +%define pkgrelease 0.rc4.31 %define kversion 6 -%define tarfile_release 6.0-rc3-107-g42e66b1cc3a0 +%define tarfile_release 6.0-rc4 # This is needed to do merge window version magic %define patchlevel 0 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20220902git42e66b1cc3a0.28%{?buildid}%{?dist} +%define specrelease 0.rc4.31%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.0.0 @@ -3147,6 +3147,17 @@ fi # # %changelog +* Mon Sep 05 2022 Fedora Kernel Team [6.0.0-0.rc4.31] +- Linux v6.0.0-0.rc4 + +* Sun Sep 04 2022 Fedora Kernel Team [6.0.0-0.rc3.7726d4c3e60b.30] +- Linux v6.0.0-0.rc3.7726d4c3e60b + +* Sat Sep 03 2022 Fedora Kernel Team [6.0.0-0.rc3.d895ec7938c4.29] +- Add cpumask_kunit to mod-internal.list (Patrick Talbert) +- redhat/configs: enable UINPUT on aarch64 (Benjamin Tissoires) +- Linux v6.0.0-0.rc3.d895ec7938c4 + * Fri Sep 02 2022 Fedora Kernel Team [6.0.0-0.rc3.42e66b1cc3a0.28] - Fedora 6.0 configs part 1 (Justin M. Forbes) - Linux v6.0.0-0.rc3.42e66b1cc3a0 diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index fdb50bd67..293931cc8 100644 --- a/patch-6.0-redhat.patch +++ b/patch-6.0-redhat.patch @@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 952d354069a4..91c24008b37f 100644 +index a4f71076cacb..a6f13827b133 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1767,7 +1767,7 @@ index 9e849f6b0d0f..00f9a1303b93 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 2633acde7ac1..665b8a441b0a 100644 +index d4b1e70d1498..bb2cc1dfb22e 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5676,6 +5676,13 @@ static void hub_event(struct work_struct *work) diff --git a/sources b/sources index 2e5945287..0d1d9f6ce 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.0-rc3-107-g42e66b1cc3a0.tar.xz) = 5505e4a6c3010b78eafbc8a16b7ad7beeee27fc28436548cf21df2117c991f429555642d29ec4ed64ec9607967c1d10b842adc6a25e28a340572a00e66eedfe6 -SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 17ebaab3aa6367e613bd35167dbe6b6519274351482359e743baf99775c906c0bfcdd9157654b0865d9ed7fe4f039060b2d1e5b2fe0b1a4a8da5efe67afc8620 -SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 6b5e8b0349c85e2a14789f40a99bd78fc3785ccdd1ea68121d0ee2189fb195838059af6b763d8f386a8a7abc76512bd630f5da6ca5b6f0c1ab44436b75f5016a +SHA512 (linux-6.0-rc4.tar.xz) = 47b6d6da5322b5036627114816da13bb38d80ce2b8a01f9e1e017426f54ac97e4efb364ae635610a42098b0a383cbd3c040c2edad1d8b2a7b883b1b5ca4c2874 +SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = f52245eb250bee19ea8bde92cab05b0b25b11dc4212558cd326bf6ac6deaeb8e2ec350e4f6f01e685b03578fc517a92eedeb7989b2ceb11c18398e2aa8c184d4 +SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = a374879a0ee86071837dcc5caa5a777d4637eecb911727259b2fe2a5e9cf785dac0dc7f773ae10ac9acb9b2eeabfc7d5b85a463730993f41a9d612874829c1f1 -- cgit