diff --git a/Makefile.rhelver b/Makefile.rhelver index 7db7c7804..3554f91af 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 = 18 +RHEL_RELEASE = 19 # # RHEL_REBASE_NUM diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 3a22deadc..9d8245f7e 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -8030,7 +8030,7 @@ CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2685=m -CONFIG_VIDEO_OV2740=m +# CONFIG_VIDEO_OV2740 is not set CONFIG_VIDEO_OV4689=m CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5645=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 704769db7..a27e866b1 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -8000,7 +8000,7 @@ CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2685=m -CONFIG_VIDEO_OV2740=m +# CONFIG_VIDEO_OV2740 is not set CONFIG_VIDEO_OV4689=m CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5645=m diff --git a/kernel.spec b/kernel.spec index af6a340e1..4404a24d5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -148,13 +148,13 @@ Summary: The Linux kernel %define specrpmversion 6.4.0 %define specversion 6.4.0 %define patchversion 6.4 -%define pkgrelease 0.rc1.20230510git16a8829130ca.18 +%define pkgrelease 0.rc1.20230511git80e62bc8487b.19 %define kversion 6 -%define tarfile_release 6.4-rc1-12-g16a8829130ca +%define tarfile_release 6.4-rc1-26-g80e62bc8487b # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20230510git16a8829130ca.18%{?buildid}%{?dist} +%define specrelease 0.rc1.20230511git80e62bc8487b.19%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.4.0 @@ -3410,6 +3410,10 @@ fi # # %changelog +* Thu May 11 2023 Fedora Kernel Team [6.4.0-0.rc1.80e62bc8487b.19] +- redhat: configs: generic: x86: Disable CONFIG_VIDEO_OV2740 for x86 platform (Kate Hsuan) +- Linux v6.4.0-0.rc1.80e62bc8487b + * Wed May 10 2023 Fedora Kernel Team [6.4.0-0.rc1.16a8829130ca.18] - Enable IO_URING for RHEL (Justin M. Forbes) - Linux v6.4.0-0.rc1.16a8829130ca diff --git a/sources b/sources index a81de8931..00132b040 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4-rc1-12-g16a8829130ca.tar.xz) = 77b63afbe50eabd7215b6b4be2897b31e745e164418e1ecfd14a644ca8fd2082022eb39c3422b171969563e8a9e8683ee1e2f4950c8e0f2fe20a6c365ebe7fee -SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = fd0d8ab5b849095f4852ccf0633edaca7f2dc3ff76be52b36c54bd8db27e84b274db49862d9627186b756ed85e1b85f573b13ae423ef2e52adf5e7ac3523e61c -SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 7162767ac7aad2a71b8c039a7dbb998043a8ce759ac99aa5f0ff87e455b09ec19af539971faefaeec00a5fc36675aa2da3c4a623410d270866557b79efedaef5 +SHA512 (linux-6.4-rc1-26-g80e62bc8487b.tar.xz) = b263193b17a1a152d766a8294b05c851393c584a9b38641627ee5b085b617f76983bddcfa214766a7d2590442571ce7f2c466588d7bc8f45ff8c1f0f1fb91816 +SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = fff8328802967f1312494fa52e9938430559062bb1defae2516c2571489275a5498a45ee2f43d1ab0c40d0278021305fa8017131532c73db063b744db3d7396f +SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = cb219f6bed2d54fdb4a55c74aef8792b94adc27ce39e30cf128b74e88b15672e70e9e49eb97dd16f14c438a7d7273c9562e9dafe2ab67e4a7caa4de350b5b343