ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

kernel-5.10.0-0.rc4.20201120git4d02da974ea8.81

Browse Source 
* Fri Nov 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201120git4d02da974ea8.81]
- Fedora config update ("Justin M. Forbes")
- redhat: generic  enable CONFIG_INET_MPTCP_DIAG (Davide Caratti)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2020-11-23 10:53:22 -06:00
parent 9a733b7fc9
commit 07ebe84e7e
28 changed files with 51 additions and 32 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 = 81 RHEL_RELEASE = 82
# #
# Early y+1 numbering # Early y+1 numbering

3
kernel-aarch64-debug-fedora.config
View File

@ -1440,7 +1440,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2770,6 +2770,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

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

@ -2177,6 +2177,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

3
kernel-aarch64-fedora.config
View File

@ -1440,7 +1440,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2754,6 +2754,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

1
kernel-aarch64-rhel.config
View File

@ -2161,6 +2161,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

1
kernel-armv7hl-debug-fedora.config
View File

@ -2794,6 +2794,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

1
kernel-armv7hl-fedora.config
View File

@ -2779,6 +2779,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

1
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -2736,6 +2736,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

1
kernel-armv7hl-lpae-fedora.config
View File

@ -2721,6 +2721,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

3
kernel-i686-debug-fedora.config
View File

@ -1164,7 +1164,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2441,6 +2441,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

3
kernel-i686-fedora.config
View File

@ -1163,7 +1163,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2424,6 +2424,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

3
kernel-ppc64le-debug-fedora.config
View File

@ -1081,7 +1081,7 @@ CONFIG_DEBUGGER=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2242,6 +2242,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

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

@ -2044,6 +2044,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

3
kernel-ppc64le-fedora.config
View File

@ -1080,7 +1080,7 @@ CONFIG_DEBUGGER=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2225,6 +2225,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

1
kernel-ppc64le-rhel.config
View File

@ -2028,6 +2028,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

3
kernel-s390x-debug-fedora.config
View File

@ -1091,7 +1091,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2221,6 +2221,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

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

@ -2020,6 +2020,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

3
kernel-s390x-fedora.config
View File

@ -1090,7 +1090,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2204,6 +2204,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

1
kernel-s390x-rhel.config
View File

@ -2004,6 +2004,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

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

@ -2020,6 +2020,7 @@ CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
# CONFIG_INET is not set # CONFIG_INET is not set
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

3
kernel-x86_64-debug-fedora.config
View File

@ -1197,7 +1197,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2479,6 +2479,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

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

@ -2179,6 +2179,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

3
kernel-x86_64-fedora.config
View File

@ -1196,7 +1196,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_HIGHMEM=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set
@ -2462,6 +2462,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

1
kernel-x86_64-rhel.config
View File

@ -2163,6 +2163,7 @@ CONFIG_INET_ESPINTCP=y
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESP_OFFLOAD=m
CONFIG_INET_IPCOMP=m CONFIG_INET_IPCOMP=m
CONFIG_INET_MPTCP_DIAG=m
CONFIG_INET_RAW_DIAG=m CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m

21
kernel.spec
View File

@ -56,7 +56,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. # For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0 %global released_kernel 0
%global distro_build 0.rc4.20201119gitc2e7554e1b85.81 %global distro_build 0.rc5.82
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -95,13 +95,13 @@ Summary: The Linux kernel
%endif %endif
%define rpmversion 5.10.0 %define rpmversion 5.10.0
%define pkgrelease 0.rc4.20201119gitc2e7554e1b85.81 %define pkgrelease 0.rc5.82
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 10 %define patchlevel 10
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc4.20201119gitc2e7554e1b85.81%{?buildid}%{?dist} %define specrelease 0.rc5.82%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -191,7 +191,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels) # Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels). # and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'. # See also 'make debug' and 'make release'.
%define debugbuildsenabled 0 %define debugbuildsenabled 1
# The kernel tarball/base version # The kernel tarball/base version
%define kversion 5.10 %define kversion 5.10
@ -534,7 +534,7 @@ BuildRequires: python3-docutils
BuildRequires: zlib-devel binutils-devel BuildRequires: zlib-devel binutils-devel
%endif %endif
%if %{with_selftests} %if %{with_selftests}
BuildRequires: llvm BuildRequires: clang llvm
%ifnarch %{arm} %ifnarch %{arm}
BuildRequires: numactl-devel BuildRequires: numactl-devel
%endif %endif
@ -592,7 +592,7 @@ BuildRequires: asciidoc
# 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-20201119gitc2e7554e1b85.tar.xz Source0: linux-5.10-rc5.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1236,8 +1236,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-20201119gitc2e7554e1b85 -c %setup -q -n kernel-5.10-rc5 -c
mv linux-20201119gitc2e7554e1b85 linux-%{KVERREL} mv linux-5.10-rc5 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -2689,8 +2689,9 @@ fi
# #
# #
%changelog %changelog
* Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.80] * Fri Nov 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201120git4d02da974ea8.81]
- No need to review, Temporary workarounds due to DEBUG_INFO_BTF not working ("Justin M. Forbes") - Fedora config update ("Justin M. Forbes")
- redhat: generic enable CONFIG_INET_MPTCP_DIAG (Davide Caratti)
* Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.79.test] * Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.79.test]
- c2e7554e1b85 rebase - c2e7554e1b85 rebase

5
parallel_xz.sh
View File

@ -16,11 +16,6 @@ while test "$#" != 0; do
shift shift
done done
#This seems to cause problems with large numbers
if (( $procgroup > 4 )); then
procgroup=4
fi
# If told to use only one cpu: # If told to use only one cpu:
test "$procgroup" || exec xargs -r xz test "$procgroup" || exec xargs -r xz
test "$procgroup" = 1 && exec xargs -r xz test "$procgroup" = 1 && exec xargs -r xz

6
patch-5.10.0-redhat.patch
View File

@ -94,10 +94,10 @@ index 75a9dd98e76e..3ff3291551f9 100644
Boot into System Kernel Boot into System Kernel
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 526d65d8573a..0e78308a5dce 100644 index 44fde25bb221..063ae5999610 100644
--- a/Documentation/admin-guide/kernel-parameters.txt --- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5512,6 +5512,14 @@ @@ -5519,6 +5519,14 @@
unknown_nmi_panic unknown_nmi_panic
[X86] Cause panic on unknown NMI. [X86] Cause panic on unknown NMI.
@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index e2c3f65c4721..36e66831ae23 100644 index ed081e3eb800..549e1381c227 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-20201119gitc2e7554e1b85.tar.xz) = cf600a9e7c6a4112dc3e1dcaa9041079d35413a0f12656ecee4f8c60afce517e5b719fd4c28e4e65619f9454762637daaf6668461dcaef29ce21e926b7404659 SHA512 (linux-5.10-rc5.tar.xz) = 4c3eff9d401ae3d65be4244ffb8c33602029155fd63e586a7e6d027851c0b312ebaf00e40e251ab861a5d9ebb3595207f8631514e0c2dfbd436cca6628f87619
SHA512 (kernel-abi-whitelists-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.tar.bz2) = 3faaae1b3eb384d35633ca901023e6055851ae9f694a628498d4299189c14e827863d35492c47da88638a6c57353b548cfb1393bbbb64272b0c6ca0fb726ff1d SHA512 (kernel-abi-whitelists-5.10.0-0.rc5.82.tar.bz2) = 829163a114d9d4267c0d776c990fc81f84dc7f7ed2ca6181876f3e3c958d9bbd41a9f2d6a4b4bdaf2c9cd0b52a950e9a10a738b4e79eff3481fbfdd371b229fd
SHA512 (kernel-kabi-dw-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.tar.bz2) = b6eed06afe9de79895298f10ef1de7644b03b1e9cf840aa8db47e51c0a8ed218f787dfa8bad9b5747af5b664e04736d50872c7e67ee22e530ae8b706e15da09b SHA512 (kernel-kabi-dw-5.10.0-0.rc5.82.tar.bz2) = 3fb7b4324c718f6dc26d9bac376903fc71e7aa6bbd491ce9308fba8dc1ba1c96b848519324c66f26c68a75d174bb640f2d16132fb607f81c7960ece051ae5d14