diff --git a/Makefile.rhelver b/Makefile.rhelver index 6645cf390..61c2648c5 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 = 46 +RHEL_RELEASE = 47 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 458cb0dcc..e0f7df018 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -6481,7 +6481,7 @@ CONFIG_SPI_QUP=y # CONFIG_SPI_SLAVE is not set # CONFIG_SPI_SN_F_OSPI is not set # CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TEGRA114 is not set +CONFIG_SPI_TEGRA114=m # CONFIG_SPI_TEGRA20_SFLASH is not set # CONFIG_SPI_TEGRA20_SLINK is not set CONFIG_SPI_TEGRA210_QUAD=m diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 94072c037..9851554e6 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -6456,7 +6456,7 @@ CONFIG_SPI_QUP=y # CONFIG_SPI_SLAVE is not set # CONFIG_SPI_SN_F_OSPI is not set # CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TEGRA114 is not set +CONFIG_SPI_TEGRA114=m # CONFIG_SPI_TEGRA20_SFLASH is not set # CONFIG_SPI_TEGRA20_SLINK is not set CONFIG_SPI_TEGRA210_QUAD=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 6e2a6d39d..55de1a810 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -6477,7 +6477,7 @@ CONFIG_SPI_QUP=y # CONFIG_SPI_SLAVE is not set # CONFIG_SPI_SN_F_OSPI is not set # CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TEGRA114 is not set +CONFIG_SPI_TEGRA114=m # CONFIG_SPI_TEGRA20_SFLASH is not set # CONFIG_SPI_TEGRA20_SLINK is not set CONFIG_SPI_TEGRA210_QUAD=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 4e37a18a6..40d92d6a5 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -6452,7 +6452,7 @@ CONFIG_SPI_QUP=y # CONFIG_SPI_SLAVE is not set # CONFIG_SPI_SN_F_OSPI is not set # CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TEGRA114 is not set +CONFIG_SPI_TEGRA114=m # CONFIG_SPI_TEGRA20_SFLASH is not set # CONFIG_SPI_TEGRA20_SLINK is not set CONFIG_SPI_TEGRA210_QUAD=m diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 66729a964..0fb5f982d 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -6623,7 +6623,7 @@ CONFIG_SPI_QUP=y # CONFIG_SPI_SLAVE is not set # CONFIG_SPI_SN_F_OSPI is not set # CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TEGRA114 is not set +CONFIG_SPI_TEGRA114=m # CONFIG_SPI_TEGRA20_SFLASH is not set # CONFIG_SPI_TEGRA20_SLINK is not set CONFIG_SPI_TEGRA210_QUAD=m diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 811042673..5bc1e3480 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -6598,7 +6598,7 @@ CONFIG_SPI_QUP=y # CONFIG_SPI_SLAVE is not set # CONFIG_SPI_SN_F_OSPI is not set # CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TEGRA114 is not set +CONFIG_SPI_TEGRA114=m # CONFIG_SPI_TEGRA20_SFLASH is not set # CONFIG_SPI_TEGRA20_SLINK is not set CONFIG_SPI_TEGRA210_QUAD=m diff --git a/kernel.spec b/kernel.spec index d57ffb419..0ece61868 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.5.0 %define specversion 6.5.0 %define patchversion 6.5 -%define pkgrelease 0.rc6.20230817git4853c74bd7ab.46 +%define pkgrelease 0.rc6.20230818git0e8860d2125f.47 %define kversion 6 -%define tarfile_release 6.5-rc6-36-g4853c74bd7ab +%define tarfile_release 6.5-rc6-117-g0e8860d2125f # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20230817git4853c74bd7ab.46%{?buildid}%{?dist} +%define specrelease 0.rc6.20230818git0e8860d2125f.47%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.0 @@ -3713,6 +3713,10 @@ fi\ # # %changelog +* Fri Aug 18 2023 Fedora Kernel Team [6.5.0-0.rc6.0e8860d2125f.47.el130] +- redhat/configs: enable tegra114 SPI (Mark Salter) +- Linux v6.5.0-0.rc6.0e8860d2125f + * Thu Aug 17 2023 Fedora Kernel Team [6.5.0-0.rc6.4853c74bd7ab.46.el130] - all: properly cleanup firewire once and for all (Peter Robinson) - Fix up filters for Fedora (Justin M. Forbes) diff --git a/sources b/sources index 1d8065428..92e80a1e9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5-rc6-36-g4853c74bd7ab.tar.xz) = aba78052b7a25353b6f45cee1e46f1d0b58c9c756ab14d92b40a91d3a3778ba5169e846865a35e6d02da7c62ecdacdf66ca5d271df1c793f6a2c2b5d0d6fe337 -SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 0133a20f73d0f8ba732dca8e425ee51aea914264745be4f4a546ef6b7df1aba5e804b5b68266b813958526980987a06fcd14d1f19fed4b8ab1c40ca80e46f3b4 -SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 85973e96cb1d14bb85befd6e6727d5c378fbfe72efc4008f3e39e7852f11cd48e66d56f410257b95a6315dc705d652bf8a92240e73da72ade60d1f9798a88fa5 +SHA512 (linux-6.5-rc6-117-g0e8860d2125f.tar.xz) = 80c830eea4f058dcfca4fe4a1e5755bd2a80da286ef844c069364b3af7f8f5f1d06cc44f2148d58f51e8404d9035b107edb332cdfa2d110acac887738d2acc4b +SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 7a8eccabac16348713e61eb4d3b9b229d78579ba1079d3d3766e8ddace14421ba816519aa720b4ca34db77d635ab58a4feb42fa8f25b33af26c5a0c01875c69f +SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 1c8dd1fd1f4a67a110c6a789fbbe83976ba4ef0d6168e7c4f8fb1d491eaf8fdb0a5c515de6c002a01e66cdbe70f0abe1f2a7060f50661ed29871492cf70c1e96