diff --git a/Makefile.rhelver b/Makefile.rhelver index 61c2648c5..076ae9c59 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 = 47 +RHEL_RELEASE = 48 # # RHEL_REBASE_NUM diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 19106439c..0edf44751 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -188,16 +188,16 @@ CONFIG_ADVANTECH_EC_WDT=m # CONFIG_ADVANTECH_WDT is not set CONFIG_ADVISE_SYSCALLS=y CONFIG_ADV_SWBUTTON=m -CONFIG_ADXL313_I2C=m -CONFIG_ADXL313_SPI=m +# CONFIG_ADXL313_I2C is not set +# CONFIG_ADXL313_SPI is not set # CONFIG_ADXL345_I2C is not set # CONFIG_ADXL345_SPI is not set -CONFIG_ADXL355_I2C=m -CONFIG_ADXL355_SPI=m -CONFIG_ADXL367_I2C=m -CONFIG_ADXL367_SPI=m -CONFIG_ADXL372_I2C=m -CONFIG_ADXL372_SPI=m +# CONFIG_ADXL355_I2C is not set +# CONFIG_ADXL355_SPI is not set +# CONFIG_ADXL367_I2C is not set +# CONFIG_ADXL367_SPI is not set +# CONFIG_ADXL372_I2C is not set +# CONFIG_ADXL372_SPI is not set CONFIG_ADXRS290=m # CONFIG_ADXRS450 is not set # CONFIG_AFE4403 is not set @@ -1332,7 +1332,7 @@ CONFIG_CXL_PMU=m # CONFIG_CXL_REGION_INVALIDATION_TEST is not set CONFIG_CXL_REGION=y CONFIG_DA280=m -CONFIG_DA311=m +# CONFIG_DA311 is not set CONFIG_DAMON_DBGFS=y # CONFIG_DAMON_LRU_SORT is not set CONFIG_DAMON_PADDR=y @@ -1513,7 +1513,7 @@ CONFIG_DMA_NUMA_CMA=y # CONFIG_DMAPOOL_TEST is not set # CONFIG_DMARD06 is not set # CONFIG_DMARD09 is not set -CONFIG_DMARD10=m +# CONFIG_DMARD10 is not set # CONFIG_DMA_RESTRICTED_POOL is not set # CONFIG_DMATEST is not set CONFIG_DM_CACHE=m @@ -2803,8 +2803,8 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m # CONFIG_IIO_HRTIMER_TRIGGER is not set CONFIG_IIO_INTERRUPT_TRIGGER=m CONFIG_IIO_KFIFO_BUF=m -CONFIG_IIO_KX022A_I2C=m -CONFIG_IIO_KX022A_SPI=m +# CONFIG_IIO_KX022A_I2C is not set +# CONFIG_IIO_KX022A_SPI is not set CONFIG_IIO=m CONFIG_IIO_MUX=m CONFIG_IIO_RESCALE_KUNIT_TEST=m @@ -2813,7 +2813,7 @@ CONFIG_IIO_RESCALE=m # CONFIG_IIO_SSP_SENSORHUB is not set CONFIG_IIO_ST_ACCEL_3AXIS=m CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m -CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +# CONFIG_IIO_ST_ACCEL_SPI_3AXIS is not set CONFIG_IIO_ST_GYRO_3AXIS=m CONFIG_IIO_ST_GYRO_I2C_3AXIS=m CONFIG_IIO_ST_GYRO_SPI_3AXIS=m @@ -4225,7 +4225,7 @@ CONFIG_MQ_IOSCHED_DEADLINE=y CONFIG_MQ_IOSCHED_KYBER=y # CONFIG_MS5611 is not set # CONFIG_MS5637 is not set -CONFIG_MSA311=m +# CONFIG_MSA311 is not set # CONFIG_MS_BLOCK is not set CONFIG_MSDOS_FS=m CONFIG_MSDOS_PARTITION=y @@ -6003,7 +6003,7 @@ CONFIG_SBP_TARGET=m # CONFIG_SC1200_WDT is not set CONFIG_SC92031=m # CONFIG_SCA3000 is not set -CONFIG_SCA3300=m +# CONFIG_SCA3300 is not set CONFIG_SCD30_CORE=m CONFIG_SCD30_I2C=m CONFIG_SCD30_SERIAL=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 246e90e92..a50188496 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -188,16 +188,16 @@ CONFIG_ADVANTECH_EC_WDT=m # CONFIG_ADVANTECH_WDT is not set CONFIG_ADVISE_SYSCALLS=y CONFIG_ADV_SWBUTTON=m -CONFIG_ADXL313_I2C=m -CONFIG_ADXL313_SPI=m +# CONFIG_ADXL313_I2C is not set +# CONFIG_ADXL313_SPI is not set # CONFIG_ADXL345_I2C is not set # CONFIG_ADXL345_SPI is not set -CONFIG_ADXL355_I2C=m -CONFIG_ADXL355_SPI=m -CONFIG_ADXL367_I2C=m -CONFIG_ADXL367_SPI=m -CONFIG_ADXL372_I2C=m -CONFIG_ADXL372_SPI=m +# CONFIG_ADXL355_I2C is not set +# CONFIG_ADXL355_SPI is not set +# CONFIG_ADXL367_I2C is not set +# CONFIG_ADXL367_SPI is not set +# CONFIG_ADXL372_I2C is not set +# CONFIG_ADXL372_SPI is not set CONFIG_ADXRS290=m # CONFIG_ADXRS450 is not set # CONFIG_AFE4403 is not set @@ -1330,7 +1330,7 @@ CONFIG_CXL_PMU=m # CONFIG_CXL_REGION_INVALIDATION_TEST is not set CONFIG_CXL_REGION=y CONFIG_DA280=m -CONFIG_DA311=m +# CONFIG_DA311 is not set CONFIG_DAMON_DBGFS=y # CONFIG_DAMON_LRU_SORT is not set CONFIG_DAMON_PADDR=y @@ -1502,7 +1502,7 @@ CONFIG_DMA_NUMA_CMA=y # CONFIG_DMAPOOL_TEST is not set # CONFIG_DMARD06 is not set # CONFIG_DMARD09 is not set -CONFIG_DMARD10=m +# CONFIG_DMARD10 is not set # CONFIG_DMA_RESTRICTED_POOL is not set # CONFIG_DMATEST is not set CONFIG_DM_CACHE=m @@ -2783,8 +2783,8 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m # CONFIG_IIO_HRTIMER_TRIGGER is not set CONFIG_IIO_INTERRUPT_TRIGGER=m CONFIG_IIO_KFIFO_BUF=m -CONFIG_IIO_KX022A_I2C=m -CONFIG_IIO_KX022A_SPI=m +# CONFIG_IIO_KX022A_I2C is not set +# CONFIG_IIO_KX022A_SPI is not set CONFIG_IIO=m CONFIG_IIO_MUX=m CONFIG_IIO_RESCALE_KUNIT_TEST=m @@ -2793,7 +2793,7 @@ CONFIG_IIO_RESCALE=m # CONFIG_IIO_SSP_SENSORHUB is not set CONFIG_IIO_ST_ACCEL_3AXIS=m CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m -CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +# CONFIG_IIO_ST_ACCEL_SPI_3AXIS is not set CONFIG_IIO_ST_GYRO_3AXIS=m CONFIG_IIO_ST_GYRO_I2C_3AXIS=m CONFIG_IIO_ST_GYRO_SPI_3AXIS=m @@ -4199,7 +4199,7 @@ CONFIG_MQ_IOSCHED_DEADLINE=y CONFIG_MQ_IOSCHED_KYBER=y # CONFIG_MS5611 is not set # CONFIG_MS5637 is not set -CONFIG_MSA311=m +# CONFIG_MSA311 is not set # CONFIG_MS_BLOCK is not set CONFIG_MSDOS_FS=m CONFIG_MSDOS_PARTITION=y @@ -5975,7 +5975,7 @@ CONFIG_SBP_TARGET=m # CONFIG_SC1200_WDT is not set CONFIG_SC92031=m # CONFIG_SCA3000 is not set -CONFIG_SCA3300=m +# CONFIG_SCA3300 is not set CONFIG_SCD30_CORE=m CONFIG_SCD30_I2C=m CONFIG_SCD30_SERIAL=m diff --git a/kernel.spec b/kernel.spec index 05cb79967..f618e9694 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc5.20231217git3b8a9b2e6809.47 +%define pkgrelease 0.rc6.48 %define kversion 6 -%define tarfile_release 6.7-rc5-230-g3b8a9b2e6809 +%define tarfile_release 6.7-rc6 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20231217git3b8a9b2e6809.47%{?buildid}%{?dist} +%define specrelease 0.rc6.48%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3754,8 +3754,11 @@ fi\ # # %changelog -* Sun Dec 17 2023 Justin M. Forbes [6.7.0-0.rc5.20231217git3b8a9b2e6809.47] +* Mon Dec 18 2023 Fedora Kernel Team [6.7.0-0.rc6.48] +- Disable accel drivers for Fedora x86 (Kate Hsuan) +- redhat: scripts: An automation script for disabling unused driver for x86 (Kate Hsuan) - Fix up Fedora LJCA configs and filters (Justin M. Forbes) +- Linux v6.7.0-0.rc6 * Sun Dec 17 2023 Fedora Kernel Team [6.7.0-0.rc5.3b8a9b2e6809.47] - Linux v6.7.0-0.rc5.3b8a9b2e6809 diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 319e64124..0af3e7d89 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -127,7 +127,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 70fc4c11dfc0..3f759e21e2b8 100644 +index e78ee7db0729..2e2b327fd8d7 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index a2e793246..90ab0e869 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.7-rc5-230-g3b8a9b2e6809.tar.xz) = 5e833a43a7a0a26479eca87d6a04b272d1d79fadccd80f5d331b2bd7857e2d9d6c09f965ab7a8d50182b616f7179953107f55e1c1015d3b96f5453beb31a7ab8 -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = dc71688a3c4ac4c5d2c62500b6d2e7da118fd8d7c9d7c46b56d4e7f20b88fbbe50defa16bed5147a5a9ed66a076546f354a0c4efd83c6fd317b96bb0d612aab5 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = f276ba0dc662b556ac404425d3994f3f041386f159a1b4c3a274b2b20d92158a5348f671ec3757e39f86beed9c59281f27c48f302459349e0307889450bafdd9 +SHA512 (linux-6.7-rc6.tar.xz) = 6fb20b92ca406b883a6eb80f8cd7e7afb2a2f1d8e40e49acd70f653b84e6b75901c64b16048529f72db6b69a3fbf514f53c9950178a8eebb08e28dd6a22bfdd0 +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 7946056ed089b39367583d7ad979eb577958a2d873caac71aac025ae0d6978fc793e4304ffd65031aa3124cbee435dc4e55db6717062fcad20f2eb9128cbce00 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = f7eee04ff75206c8062beb81e1f6be69abc30b0007a33065a0c318fec29a62e03f62ef21b2604ffd22bfac4fb1ccb8556d062d0f990ed52f8302aec5bcc3fdf2