diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-11-23 10:53:22 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-11-23 10:53:22 -0600 |
| commit | 07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c (patch) | |
| tree | fa46ce1d5db508b97fc30cb8f1e41230743a6493 | |
| parent | 9a733b7fc936752211d28f5c0fca84ddd7aa7da4 (diff) | |
| download | kernel-07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c.tar.gz kernel-07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c.tar.xz kernel-07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c.zip | |
kernel-5.10.0-0.rc4.20201120git4d02da974ea8.81
* 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>
28 files changed, 51 insertions, 32 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 7f8fb896e..5ce6cf364 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 = 81 +RHEL_RELEASE = 82 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index ecad32170..d0b5a173e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1440,7 +1440,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index c36b46370..7c4185b13 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2177,6 +2177,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 51418dc4e..675b76a2d 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1440,7 +1440,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index c9ac761c9..3b6b823d5 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2161,6 +2161,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index c8e0eab85..27e1a2f50 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2794,6 +2794,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index b7a7c8e3d..059054a17 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2779,6 +2779,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index ea4017dee..2c1fd1d90 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2736,6 +2736,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index c324542c7..cc4fd6a6b 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2721,6 +2721,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 5866c89a8..0eef79447 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1164,7 +1164,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index ea7194242..76867161b 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -1163,7 +1163,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 699907278..8687e83b3 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1081,7 +1081,7 @@ CONFIG_DEBUGGER=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 773b44912..86a16e1d4 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2044,6 +2044,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index ce22a3711..ec148217b 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1080,7 +1080,7 @@ CONFIG_DEBUGGER=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 183b824e2..389050296 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2028,6 +2028,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 3d421c47f..8092c6d6c 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1091,7 +1091,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 9e3b7fcbe..ec6309852 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2020,6 +2020,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 52f157008..db8e42dd8 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1090,7 +1090,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index b76a16334..ec84335c3 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2004,6 +2004,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index a264a89b7..d45f576b8 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2020,6 +2020,7 @@ CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m # CONFIG_INET is not set +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index f6dc39353..bec588e69 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1197,7 +1197,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 1e3a5c93a..7beec4bb7 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2179,6 +2179,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 7990f60f3..628836be5 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1196,7 +1196,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # 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_DWARF4 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_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index b78eb20fa..c974034a0 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2163,6 +2163,7 @@ CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_MPTCP_DIAG=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m diff --git a/kernel.spec b/kernel.spec index f6f76c5d0..7df6be682 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc4.20201119gitc2e7554e1b85.81 +%global distro_build 0.rc5.82 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -95,13 +95,13 @@ Summary: The Linux kernel %endif %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 %define patchlevel 10 # 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} @@ -191,7 +191,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # The kernel tarball/base version %define kversion 5.10 @@ -534,7 +534,7 @@ BuildRequires: python3-docutils BuildRequires: zlib-devel binutils-devel %endif %if %{with_selftests} -BuildRequires: llvm +BuildRequires: clang llvm %ifnarch %{arm} BuildRequires: numactl-devel %endif @@ -592,7 +592,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20201119gitc2e7554e1b85.tar.xz +Source0: linux-5.10-rc5.tar.xz Source1: Makefile.rhelver @@ -1236,8 +1236,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201119gitc2e7554e1b85 -c -mv linux-20201119gitc2e7554e1b85 linux-%{KVERREL} +%setup -q -n kernel-5.10-rc5 -c +mv linux-5.10-rc5 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2689,8 +2689,9 @@ fi # # %changelog -* Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.80] -- No need to review, Temporary workarounds due to DEBUG_INFO_BTF not working ("Justin M. Forbes") +* 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) * Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.79.test] - c2e7554e1b85 rebase diff --git a/parallel_xz.sh b/parallel_xz.sh index e2c961102..bc08a548d 100755 --- a/parallel_xz.sh +++ b/parallel_xz.sh @@ -16,11 +16,6 @@ while test "$#" != 0; do shift done -#This seems to cause problems with large numbers -if (( $procgroup > 4 )); then - procgroup=4 -fi - # If told to use only one cpu: test "$procgroup" || exec xargs -r xz test "$procgroup" = 1 && exec xargs -r xz diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch index c618ea3ff..51f27ee79 100644 --- a/patch-5.10.0-redhat.patch +++ b/patch-5.10.0-redhat.patch @@ -94,10 +94,10 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel 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 +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5512,6 +5512,14 @@ +@@ -5519,6 +5519,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index e2c3f65c4721..36e66831ae23 100644 +index ed081e3eb800..549e1381c227 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1,3 +1,3 @@ -SHA512 (linux-20201119gitc2e7554e1b85.tar.xz) = cf600a9e7c6a4112dc3e1dcaa9041079d35413a0f12656ecee4f8c60afce517e5b719fd4c28e4e65619f9454762637daaf6668461dcaef29ce21e926b7404659 -SHA512 (kernel-abi-whitelists-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.tar.bz2) = 3faaae1b3eb384d35633ca901023e6055851ae9f694a628498d4299189c14e827863d35492c47da88638a6c57353b548cfb1393bbbb64272b0c6ca0fb726ff1d -SHA512 (kernel-kabi-dw-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.tar.bz2) = b6eed06afe9de79895298f10ef1de7644b03b1e9cf840aa8db47e51c0a8ed218f787dfa8bad9b5747af5b664e04736d50872c7e67ee22e530ae8b706e15da09b +SHA512 (linux-5.10-rc5.tar.xz) = 4c3eff9d401ae3d65be4244ffb8c33602029155fd63e586a7e6d027851c0b312ebaf00e40e251ab861a5d9ebb3595207f8631514e0c2dfbd436cca6628f87619 +SHA512 (kernel-abi-whitelists-5.10.0-0.rc5.82.tar.bz2) = 829163a114d9d4267c0d776c990fc81f84dc7f7ed2ca6181876f3e3c958d9bbd41a9f2d6a4b4bdaf2c9cd0b52a950e9a10a738b4e79eff3481fbfdd371b229fd +SHA512 (kernel-kabi-dw-5.10.0-0.rc5.82.tar.bz2) = 3fb7b4324c718f6dc26d9bac376903fc71e7aa6bbd491ce9308fba8dc1ba1c96b848519324c66f26c68a75d174bb640f2d16132fb607f81c7960ece051ae5d14 |