kernel-6.4.0-0.rc2.20230518git4d6d4c7f541d.24

* Thu May 18 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc2.4d6d4c7f541d.24]
- kernel.spec: package unstripped test_progs-no_alu32 (Felix Maurer)
- Turn on NFT_CONNLIMIT for Fedora (Justin M. Forbes)
- Include the information about builtin symbols into kernel-uki-virt package too (Vitaly Kuznetsov)
- Linux v6.4.0-0.rc2.4d6d4c7f541d
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

Makefile.rhelver

@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 23
+RHEL_RELEASE = 24
 
 #
 # RHEL_REBASE_NUM

kernel-aarch64-debug-fedora.config

@@ -5114,7 +5114,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-aarch64-fedora.config

@@ -5088,7 +5088,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-armv7hl-debug-fedora.config

@@ -5093,7 +5093,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-armv7hl-fedora.config

@@ -5069,7 +5069,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-armv7hl-lpae-debug-fedora.config

@@ -4995,7 +4995,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-armv7hl-lpae-fedora.config

@@ -4971,7 +4971,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-ppc64le-debug-fedora.config

@@ -4325,7 +4325,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-ppc64le-fedora.config

@@ -4297,7 +4297,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-s390x-debug-fedora.config

@@ -4303,7 +4303,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-s390x-fedora.config

@@ -4275,7 +4275,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-x86_64-debug-fedora.config

@@ -4640,7 +4640,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

kernel-x86_64-fedora.config

@@ -4614,7 +4614,7 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_COMPAT=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_DUP_IPV4=m

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.rc2.23
+%define pkgrelease 0.rc2.20230518git4d6d4c7f541d.24
 %define kversion 6
-%define tarfile_release 6.4-rc2
+%define tarfile_release 6.4-rc2-18-g4d6d4c7f541d
 # This is needed to do merge window version magic
 %define patchlevel 4
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.23%{?buildid}%{?dist}
+%define specrelease 0.rc2.20230518git4d6d4c7f541d.24%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.4.0
 
@@ -2574,6 +2574,7 @@ for dir in bpf bpf/no_alu32 bpf/progs; do
 	xargs -0 cp -t %{buildroot}%{_libexecdir}/kselftests/$dir || true
 done
 %buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs"
+%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32"
 popd
 export -n BPFTOOL
 %endif
@@ -3364,6 +3365,10 @@ fi
 %endif\
 %if %{with_efiuki}\
 %{expand:%%files %{?3:%{3}-}uki-virt}\
+%attr(0600, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.gz\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/config\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.builtin*\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi\
 %ghost /%{image_install_path}/efi/EFI/Linux/%{?-k:%{-k*}}%{!?-k:*}-%{KVERREL}%{?3:+%{3}}.efi\
 %endif\
@@ -3410,6 +3415,12 @@ fi
 #
 #
 %changelog
+* Thu May 18 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc2.4d6d4c7f541d.24]
+- kernel.spec: package unstripped test_progs-no_alu32 (Felix Maurer)
+- Turn on NFT_CONNLIMIT for Fedora (Justin M. Forbes)
+- Include the information about builtin symbols into kernel-uki-virt package too (Vitaly Kuznetsov)
+- Linux v6.4.0-0.rc2.4d6d4c7f541d
+
 * Mon May 15 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc2.23]
 - redhat/configs: Fix incorrect configs location and content (Vladis Dronov)
 - redhat/configs: turn on CONFIG_MARVELL_CN10K_DDR_PMU (Michal Schmidt) [2042241]

sources

@@ -1,3 +1,3 @@
-SHA512 (linux-6.4-rc2.tar.xz) = ddea6ea4e57ce1d4ba526148be5e51338b350626974f082520a937235670fcc529e01ec6d7078ad1989b920a368ed8f4ca9d932f315c188f77aa6e6e016cc40f
+SHA512 (linux-6.4-rc2-18-g4d6d4c7f541d.tar.xz) = fa2237cc52437b296e0bbcc0923cd77ab4b4f55377ebf242cd4ee31737b9e4390a691a7a999cd111f3d8bb6c5b34d6b06c3bf5a4df49780c6535ebd5de055ad6
-SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 843e84d78732d9aab8360c2c4df6460a5e6f5b74352f87edca6cd1dd2548ac4867681860769faa33c1ce2f9ce5e7bc3a8e2ededbb409cb4534715d66efd5687b
+SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 4e7bcce843507dbade2e4b144bada81e3ea359836bfe3b0852515223bb88c0063e8f50510eb0924796b219eb3abd0ade5031a0c034acf24c267d2e941109e7b9
-SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 49bc80226d890eedf439c03a16126aa0ed97206f92b4d421535fe842a6f6b0dc1455915480ead42d0c0bbcfc0445a2980789763730ca59908182d8f73128e1e5
+SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 278b4fa9e288bf82f3ad669603293361560cda3cdb1b1aad687026151aa5d6f49b001467dc932cc378e75f0340d6a205a4f797a7a0e7021c2bdabfe91e0d2bf6