rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-5.18.0-0.rc3.c00c5e1d157bec0.30 

* Sat Apr 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.c00c5e1d157bec0.30]
- redhat/self-test: Clean up data set (Prarit Bhargava)
- redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava)
- redhat/scripts/create-tarball.sh: Use Makefile variables (Prarit Bhargava)
- redhat/Makefile: Deprecate SINGLE_TARBALL (Prarit Bhargava)
- redhat/Makefile: Move SINGLE_TARBALL to Makefile.variables (Prarit Bhargava)
- redhat/Makefile: Use RPMVERSION (Prarit Bhargava)
- redhat/scripts/rh-dist-git.sh: Use Makefile variables (Prarit Bhargava)
- redhat/configs/build_configs.sh: Use Makefile variables (Prarit Bhargava)
- redhat/configs/process_configs.sh: Use Makefile variables (Prarit Bhargava)
- redhat/kernel.spec.template: Use RPM_BUILD_NCPUS (Prarit Bhargava)
- redhat/configs/generate_all_configs.sh: Use Makefile variables (Prarit Bhargava)
- redhat/configs: enable nf_tables SYNPROXY extension on ark (Davide Caratti)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-04-25 08:21:12 -05:00
parent 4cf4e42e77
commit fda510074f
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
13 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 31 RHEL_RELEASE = 33
# #
# Early y+1 numbering # Early y+1 numbering

6
kernel-aarch64-debug-rhel.config
View File

@ -2468,7 +2468,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set # CONFIG_IPACK_BUS is not set
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
@ -2506,7 +2506,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y CONFIG_IP_PIMSM_V2=y
@ -3843,7 +3843,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
# CONFIG_NFT_SYNPROXY is not set CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m CONFIG_NFT_XFRM=m

6
kernel-aarch64-rhel.config
View File

@ -2452,7 +2452,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set # CONFIG_IPACK_BUS is not set
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
@ -2490,7 +2490,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y CONFIG_IP_PIMSM_V2=y
@ -3822,7 +3822,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
# CONFIG_NFT_SYNPROXY is not set CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m CONFIG_NFT_XFRM=m

6
kernel-ppc64le-debug-rhel.config
View File

@ -2295,7 +2295,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set # CONFIG_IPACK_BUS is not set
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
@ -2334,7 +2334,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y CONFIG_IP_PIMSM_V2=y
@ -3654,7 +3654,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
# CONFIG_NFT_SYNPROXY is not set CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m CONFIG_NFT_XFRM=m

6
kernel-ppc64le-rhel.config
View File

@ -2279,7 +2279,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set # CONFIG_IPACK_BUS is not set
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
@ -2318,7 +2318,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y CONFIG_IP_PIMSM_V2=y
@ -3634,7 +3634,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
# CONFIG_NFT_SYNPROXY is not set CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m CONFIG_NFT_XFRM=m

6
kernel-s390x-debug-rhel.config
View File

@ -2279,7 +2279,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set # CONFIG_IPACK_BUS is not set
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
@ -2317,7 +2317,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y CONFIG_IP_PIMSM_V2=y
@ -3637,7 +3637,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
# CONFIG_NFT_SYNPROXY is not set CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m CONFIG_NFT_XFRM=m

6
kernel-s390x-rhel.config
View File

@ -2263,7 +2263,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set # CONFIG_IPACK_BUS is not set
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
@ -2301,7 +2301,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y CONFIG_IP_PIMSM_V2=y
@ -3617,7 +3617,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
# CONFIG_NFT_SYNPROXY is not set CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m CONFIG_NFT_XFRM=m

6
kernel-s390x-zfcpdump-rhel.config
View File

@ -2274,7 +2274,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set # CONFIG_IPACK_BUS is not set
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
@ -2312,7 +2312,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y CONFIG_IP_PIMSM_V2=y
@ -3631,7 +3631,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
# CONFIG_NFT_SYNPROXY is not set CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m CONFIG_NFT_XFRM=m

6
kernel-x86_64-debug-rhel.config
View File

@ -2456,7 +2456,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set # CONFIG_IPACK_BUS is not set
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
@ -2494,7 +2494,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y CONFIG_IP_PIMSM_V2=y
@ -3828,7 +3828,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
# CONFIG_NFT_SYNPROXY is not set CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m CONFIG_NFT_XFRM=m

6
kernel-x86_64-rhel.config
View File

@ -2440,7 +2440,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set # CONFIG_IPACK_BUS is not set
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
@ -2478,7 +2478,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y CONFIG_IP_PIMSM_V2=y
@ -3808,7 +3808,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
# CONFIG_NFT_SYNPROXY is not set CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m CONFIG_NFT_XFRM=m

17
kernel.spec
View File

@ -85,9 +85,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying # to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 0 %define debugbuildsenabled 1
%global distro_build 0.rc3.20220422gitd569e86915b7f2f.31 %global distro_build 0.rc4.33
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -131,13 +131,13 @@ Summary: The Linux kernel
%define rpmversion 5.18.0 %define rpmversion 5.18.0
%define patchversion 5.18 %define patchversion 5.18
%define pkgrelease 0.rc3.20220422gitd569e86915b7f2f.31 %define pkgrelease 0.rc4.33
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 18 %define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc3.20220422gitd569e86915b7f2f.31%{?buildid}%{?dist} %define specrelease 0.rc4.33%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -692,7 +692,7 @@ BuildRequires: lld
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.18-rc3-80-gd569e86915b7f2f.tar.xz Source0: linux-5.18-rc4.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1384,8 +1384,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.18-rc3-80-gd569e86915b7f2f -c %setup -q -n kernel-5.18-rc4 -c
mv linux-5.18-rc3-80-gd569e86915b7f2f linux-%{KVERREL} mv linux-5.18-rc4 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -3027,7 +3027,7 @@ fi
# #
# #
%changelog %changelog
* Fri Apr 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.d569e86915b7f2f.30] * Sat Apr 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.c00c5e1d157bec0.30]
- redhat/self-test: Clean up data set (Prarit Bhargava) - redhat/self-test: Clean up data set (Prarit Bhargava)
- redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava) - redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava)
- redhat/scripts/create-tarball.sh: Use Makefile variables (Prarit Bhargava) - redhat/scripts/create-tarball.sh: Use Makefile variables (Prarit Bhargava)
@ -3039,6 +3039,7 @@ fi
- redhat/configs/process_configs.sh: Use Makefile variables (Prarit Bhargava) - redhat/configs/process_configs.sh: Use Makefile variables (Prarit Bhargava)
- redhat/kernel.spec.template: Use RPM_BUILD_NCPUS (Prarit Bhargava) - redhat/kernel.spec.template: Use RPM_BUILD_NCPUS (Prarit Bhargava)
- redhat/configs/generate_all_configs.sh: Use Makefile variables (Prarit Bhargava) - redhat/configs/generate_all_configs.sh: Use Makefile variables (Prarit Bhargava)
- redhat/configs: enable nf_tables SYNPROXY extension on ark (Davide Caratti)
* Fri Apr 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.d569e86915b7f2f.29] * Fri Apr 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.d569e86915b7f2f.29]
- fedora: Disable fbdev drivers missed before (Javier Martinez Canillas) - fedora: Disable fbdev drivers missed before (Javier Martinez Canillas)

14
patch-5.18-redhat.patch
View File

@ -131,7 +131,7 @@ index 000000000000..effb81d04bfd
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index fa5112a0ec1b..706caf45c828 100644 index c3ec1ea42379..2262b65c424b 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -177,10 +177,10 @@ index 2e8091e2d8a8..32e0403314b1 100644
The VM uses one page of physical memory for each page table. The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 57c4c995965f..a3c61780e99c 100644 index 20ea89d9ac2f..774c1a05152d 100644
--- a/arch/arm64/Kconfig --- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig
@@ -1117,7 +1117,7 @@ endchoice @@ -1126,7 +1126,7 @@ endchoice
config ARM64_FORCE_52BIT config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace" bool "Force 52-bit virtual addresses for userspace"
@ -189,7 +189,7 @@ index 57c4c995965f..a3c61780e99c 100644
help help
For systems with 52-bit userspace VAs enabled, the kernel will attempt For systems with 52-bit userspace VAs enabled, the kernel will attempt
to maintain compatibility with older software by providing 48-bit VAs to maintain compatibility with older software by providing 48-bit VAs
@@ -1356,6 +1356,7 @@ config XEN @@ -1365,6 +1365,7 @@ config XEN
config FORCE_MAX_ZONEORDER config FORCE_MAX_ZONEORDER
int int
default "14" if ARM64_64K_PAGES default "14" if ARM64_64K_PAGES
@ -2108,10 +2108,10 @@ index eae288c8d40a..8b8bf447cedc 100644
error_proc: error_proc:
diff --git a/fs/ext4/super.c b/fs/ext4/super.c diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 81749eaddf4c..f5de0c0c14cd 100644 index 1466fbdbc8e3..4b3569868a77 100644
--- a/fs/ext4/super.c --- a/fs/ext4/super.c
+++ b/fs/ext4/super.c +++ b/fs/ext4/super.c
@@ -4793,6 +4793,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) @@ -4800,6 +4800,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
} }
if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) { if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) {
@ -2119,7 +2119,7 @@ index 81749eaddf4c..f5de0c0c14cd 100644
if (ext4_has_feature_inline_data(sb)) { if (ext4_has_feature_inline_data(sb)) {
ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem" ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem"
" that may contain inline data"); " that may contain inline data");
@@ -4803,6 +4804,10 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) @@ -4810,6 +4811,10 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
"DAX unsupported by block device."); "DAX unsupported by block device.");
goto failed_mount; goto failed_mount;
} }

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.18-rc3-80-gd569e86915b7f2f.tar.xz) = 885fc7239012554ff00b882133d267e53289e6e9fc3e33d7f2c7ce41f68decf59ab6aabf33ae44c678c982f5e80f638b55ef39457b28796c56828c0734918afa SHA512 (linux-5.18-rc4.tar.xz) = dfbaf08953a99ca7e0c3869b6c6e57534c606a225fbee7c121075a3cdba88f3bfaa7704bfd11a5e4f40851c08e5226f58e9862ad9425c22076a80a00c2f2ce19
SHA512 (kernel-abi-stablelists-5.18.0-0.rc3.20220422gitd569e86915b7f2f.31.tar.bz2) = e71cc00d6975a4b9cb844b84d113199938f914e80fc376874665ee05b357e736f4f330b460712c923a2e9d2b23506d30b9ed4faf5ff1d9bcd74e143c3f512073 SHA512 (kernel-abi-stablelists-5.18.0-0.rc4.33.tar.bz2) = b1cbc4e9d805db05d500ee6140799c79265c52d32b939bf6ba08a1263cf38999a06c23e9f00593d2feb6173c17145a312fd984abbded706e1bac1d7b48a1bcb9
SHA512 (kernel-kabi-dw-5.18.0-0.rc3.20220422gitd569e86915b7f2f.31.tar.bz2) = 13d9a43b3c7c9ee9002a95bc843a0e8d06efac3fd4b3cd26c62c722bfa095dbcaf03ee3be5fa24b58c7b6d6d68de419a3b410972f3b6be0355f90f5bbd3be854 SHA512 (kernel-kabi-dw-5.18.0-0.rc4.33.tar.bz2) = 2bfe9483c747cc7f26ec689d7551cd5d9eea89a673f5978ca27a721bb71d3d9674e2d5d946d09b5d5f50c7cb60ff3f27639adb08a2a85aa3d926a0aefbabdf91