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

kernel-5.13.0-0.rc5.38 

* Mon Jun 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.38]
- spec: Enable sefltests rpm build (Jiri Olsa)
- spec: Allow bpf selftest/samples to fail (Jiri Olsa)
- kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc)
- kernel.spec: Add missing source files to kernel-selftests-internal (Jiri Benc)
- kernel.spec: selftests: add net/forwarding to TARGETS list (Jiri Benc)
- kernel.spec: selftests: add build requirement on libmnl-devel (Jiri Benc)
- kernel.spec: add action.o to kernel-selftests-internal (Jiri Benc)
- kernel.spec: avoid building bpftool repeatedly (Jiri Benc)
- kernel.spec: selftests require python3 (Jiri Benc)
- kernel.spec: skip selftests that failed to build (Jiri Benc)
- kernel.spec: fix installation of bpf selftests (Jiri Benc)
- redhat: fix samples and selftests make options (Jiri Benc)
- kernel.spec: enable mptcp selftests for kernel-selftests-internal (Jiri Benc)
- kernel.spec: Do not export shared objects from libexecdir to RPM Provides (Jiri Benc)
- kernel.spec: add missing dependency for the which package (Jiri Benc)
- kernel.spec: add netfilter selftests to kernel-selftests-internal (Jiri Benc)
- kernel.spec: move slabinfo and page_owner_sort debuginfo to tools-debuginfo (Jiri Benc)
- kernel.spec: package and ship VM tools (Jiri Benc)
- configs: enable CONFIG_PAGE_OWNER (Jiri Benc)
- kernel.spec: add coreutils (Jiri Benc)
- kernel.spec: add netdevsim driver selftests to kernel-selftests-internal (Jiri Benc)
- redhat/Makefile: Clean out the --without flags from the baseonly rule (Jiri Benc)
- kernel.spec: Stop building unnecessary rpms for baseonly builds (Jiri Benc)
- kernel.spec: disable more kabi switches for gcov build (Jiri Benc)
- kernel.spec: Rename kabi-dw base (Jiri Benc)
- kernel.spec: Fix error messages during build of zfcpdump kernel (Jiri Benc)
- kernel.spec: perf: remove bpf examples (Jiri Benc)
- kernel.spec: selftests should not depend on modules-internal (Jiri Benc)
- kernel.spec: build samples (Jiri Benc)
- kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2021-06-07 08:47:39 -05:00
parent 76dd46aa6a
commit 4bc3c54f38
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
28 changed files with 72 additions and 36 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.
# Do not trim this comment.
RHEL_RELEASE = 35
RHEL_RELEASE = 38
#
# Early y+1 numbering

3
Patchlist.changelog
View File

@ -1,6 +1,9 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/9ecb01bae94e7379d2da1b5e375241ea3b40ff3b
9ecb01bae94e7379d2da1b5e375241ea3b40ff3b bpf: Fix unprivileged_bpf_disabled setup
https://gitlab.com/cki-project/kernel-ark/-/commit/47290c39b2f08588fb5aaf15b867cf9daaecaeb9
47290c39b2f08588fb5aaf15b867cf9daaecaeb9 RHEL: disable io_uring support
https://gitlab.com/cki-project/kernel-ark/-/commit/217f590d1ac59c7253497adb15c8a81d59b8be95
217f590d1ac59c7253497adb15c8a81d59b8be95 nvme: nvme_mpath_init remove multipath check

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

@ -3045,6 +3045,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -870,7 +870,7 @@ CONFIG_CORESIGHT_SINK_ETBV10=m
CONFIG_CORESIGHT_SINK_TPIU=m
CONFIG_CORESIGHT_SOURCE_ETM4X=m
CONFIG_CORESIGHT_STM=m
# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORESIGHT_TRBE=m
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPU5_WDT is not set
@ -2413,6 +2413,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
# CONFIG_IO_STRICT_DEVMEM is not set
# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

1
kernel-aarch64-fedora.config
View File

@ -3029,6 +3029,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

3
kernel-aarch64-rhel.config
View File

@ -870,7 +870,7 @@ CONFIG_CORESIGHT_SINK_ETBV10=m
CONFIG_CORESIGHT_SINK_TPIU=m
CONFIG_CORESIGHT_SOURCE_ETM4X=m
CONFIG_CORESIGHT_STM=m
# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORESIGHT_TRBE=m
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPU5_WDT is not set
@ -2397,6 +2397,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
# CONFIG_IO_STRICT_DEVMEM is not set
# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -3084,6 +3084,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

1
kernel-armv7hl-fedora.config
View File

@ -3069,6 +3069,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -3017,6 +3017,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -3002,6 +3002,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -2720,6 +2720,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSF_MBI=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

1
kernel-i686-fedora.config
View File

@ -2703,6 +2703,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSF_MBI=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -2489,6 +2489,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -734,7 +734,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPU5_WDT is not set
@ -2257,6 +2256,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
# CONFIG_IO_STRICT_DEVMEM is not set
# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

1
kernel-ppc64le-fedora.config
View File

@ -2472,6 +2472,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

2
kernel-ppc64le-rhel.config
View File

@ -734,7 +734,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPU5_WDT is not set
@ -2241,6 +2240,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
# CONFIG_IO_STRICT_DEVMEM is not set
# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -2469,6 +2469,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -737,7 +737,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPU5_WDT is not set
@ -2237,6 +2236,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
# CONFIG_IO_STRICT_DEVMEM is not set
# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

1
kernel-s390x-fedora.config
View File

@ -2452,6 +2452,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

2
kernel-s390x-rhel.config
View File

@ -737,7 +737,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPU5_WDT is not set
@ -2221,6 +2220,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
# CONFIG_IO_STRICT_DEVMEM is not set
# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -742,7 +742,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_CORDIC=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPU5_WDT is not set
@ -2239,6 +2238,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
# CONFIG_IO_STRICT_DEVMEM is not set
# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -2770,6 +2770,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSF_MBI=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

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

@ -765,7 +765,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPA_DEBUG is not set
@ -2434,6 +2433,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSF_MBI=y
# CONFIG_IO_STRICT_DEVMEM is not set
# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

1
kernel-x86_64-fedora.config
View File

@ -2753,6 +2753,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSF_MBI=y
CONFIG_IO_STRICT_DEVMEM=y
CONFIG_IO_URING=y
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

2
kernel-x86_64-rhel.config
View File

@ -765,7 +765,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPA_DEBUG is not set
@ -2418,6 +2417,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSF_MBI=y
# CONFIG_IO_STRICT_DEVMEM is not set
# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m

19
kernel.spec
View File

@ -71,9 +71,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
%define debugbuildsenabled 1
%global distro_build 0.rc4.20210603git324c92e5e0ee.35
%global distro_build 0.rc5.38
%if 0%{?fedora}
%define secure_boot_arch x86_64
@ -117,13 +117,13 @@ Summary: The Linux kernel
%define kversion 5.13
%define rpmversion 5.13.0
%define pkgrelease 0.rc4.20210603git324c92e5e0ee.35
%define pkgrelease 0.rc5.38
# This is needed to do merge window version magic
%define patchlevel 13
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc4.20210603git324c92e5e0ee.35%{?buildid}%{?dist}
%define specrelease 0.rc5.38%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@ -647,7 +647,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.13-rc4-61-g324c92e5e0ee.tar.xz
Source0: linux-5.13-rc5.tar.xz
Source1: Makefile.rhelver
@ -1316,8 +1316,8 @@ ApplyOptionalPatch()
fi
}
%setup -q -n kernel-5.13-rc4-61-g324c92e5e0ee -c
mv linux-5.13-rc4-61-g324c92e5e0ee linux-%{KVERREL}
%setup -q -n kernel-5.13-rc5 -c
mv linux-5.13-rc5 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@ -2871,7 +2871,7 @@ fi
#
#
%changelog
* Thu Jun 03 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.20210603git324c92e5e0ee.35]
* Mon Jun 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.38]
- spec: Enable sefltests rpm build (Jiri Olsa)
- spec: Allow bpf selftest/samples to fail (Jiri Olsa)
- kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc)
@ -2903,6 +2903,9 @@ fi
- kernel.spec: build samples (Jiri Benc)
- kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc)
* Sat Jun 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.20210604gitf88cd3fb9df2.36]
- RHEL: disable io_uring support (Jeff Moyer)
* Thu Jun 03 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.20210603git324c92e5e0ee.34]
- all: Changing CONFIG_UV_SYSFS to build uv_sysfs.ko as a loadable module. (Frank Ramsay)
- Enable NITRO_ENCLAVES on RHEL (Vitaly Kuznetsov)

44
patch-5.13.0-redhat.patch
View File

@ -54,6 +54,7 @@
include/linux/rh_kabi.h | 297 +++++++++++++++++++++
include/linux/rmi.h | 1 +
include/linux/security.h | 5 +
init/Kconfig | 2 +-
kernel/Makefile | 1 +
kernel/bpf/syscall.c | 24 ++
kernel/crash_core.c | 28 +-
@ -69,7 +70,7 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
71 files changed, 1214 insertions(+), 188 deletions(-)
72 files changed, 1215 insertions(+), 189 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@ -147,7 +148,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
index b79e0e8acbe3..4968f750ae2e 100644
index 144d4f8b7eb3..c57946dbc433 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -297,7 +298,7 @@ index a1b756c49a93..e8992590d603 100644
setup_force_cpu_cap(X86_FEATURE_CPUID);
cpu_parse_early_param();
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 72920af0b3c0..d1f74c05cf24 100644
index 1e720626069a..78644c6dc4a8 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -18,6 +18,7 @@
@ -308,7 +309,7 @@ index 72920af0b3c0..d1f74c05cf24 100644
#include <linux/usb/xhci-dbgp.h>
#include <linux/static_call.h>
#include <linux/swiotlb.h>
@@ -47,6 +48,7 @@
@@ -48,6 +49,7 @@
#include <asm/unwind.h>
#include <asm/vsyscall.h>
#include <linux/vmalloc.h>
@ -316,8 +317,8 @@ index 72920af0b3c0..d1f74c05cf24 100644
/*
* max_low_pfn_mapped: highest directly mapped pfn < 4 GB
@@ -753,6 +755,50 @@ static void __init early_reserve_memory(void)
reserve_bios_regions();
@@ -755,6 +757,50 @@ static void __init early_reserve_memory(void)
trim_snb_memory();
}
+#ifdef CONFIG_RHEL_DIFFERENCES
@ -367,7 +368,7 @@ index 72920af0b3c0..d1f74c05cf24 100644
/*
* Dump out kernel offset information on panic.
*/
@@ -960,6 +1006,13 @@ void __init setup_arch(char **cmdline_p)
@@ -962,6 +1008,13 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled(EFI_BOOT))
efi_init();
@ -381,7 +382,7 @@ index 72920af0b3c0..d1f74c05cf24 100644
dmi_setup();
/*
@@ -1118,19 +1171,7 @@ void __init setup_arch(char **cmdline_p)
@@ -1126,19 +1179,7 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
@ -402,7 +403,7 @@ index 72920af0b3c0..d1f74c05cf24 100644
reserve_initrd();
@@ -1235,6 +1276,8 @@ void __init setup_arch(char **cmdline_p)
@@ -1251,6 +1292,8 @@ void __init setup_arch(char **cmdline_p)
efi_apply_memmap_quirks();
#endif
@ -1276,7 +1277,7 @@ index dd7917cab2b1..f6b43adb2ced 100644
err_nl_init:
diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c
index 7a7d5f1a80fc..de28e2633761 100644
index 75dbe77b0b4b..029ff8576f8e 100644
--- a/drivers/net/wireguard/main.c
+++ b/drivers/net/wireguard/main.c
@@ -12,6 +12,7 @@
@ -1296,10 +1297,10 @@ index 7a7d5f1a80fc..de28e2633761 100644
+ return -EOPNOTSUPP;
+#endif
+
#ifdef DEBUG
if (!wg_allowedips_selftest() || !wg_packet_counter_selftest() ||
!wg_ratelimiter_selftest())
@@ -39,6 +45,7 @@ static int __init mod_init(void)
ret = wg_allowedips_slab_init();
if (ret < 0)
goto err_allowedips;
@@ -48,6 +54,7 @@ static int __init mod_init(void)
pr_info("WireGuard " WIREGUARD_VERSION " loaded. See www.wireguard.com for information.\n");
pr_info("Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.\n");
@ -1986,7 +1987,7 @@ index 8100bb477d86..f758f2869c02 100644
/* Exported symbols */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c20211e59a57..ba81f1b4bd9b 100644
index 24306504226a..ea30eee40dfb 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1430,6 +1430,10 @@ int pci_add_dynid(struct pci_driver *drv,
@ -2338,6 +2339,19 @@ index 06f7c50ce77f..09ed686ac5e6 100644
#endif /* CONFIG_SECURITY */
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/init/Kconfig b/init/Kconfig
index a61c92066c2e..94107b1d0e3e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1622,7 +1622,7 @@ config AIO
this option saves about 7k.
config IO_URING
- bool "Enable IO uring support" if EXPERT
+ bool "Enable IO uring support"
select IO_WQ
default y
help
diff --git a/kernel/Makefile b/kernel/Makefile
index 4df609be42d0..4ef0c0f6a8f4 100644
--- a/kernel/Makefile

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.13-rc4-61-g324c92e5e0ee.tar.xz) = ac6bb59f3c1adc7103cefd9bba73e6777ab7519401639392768813ce134b6e20f3903060c77db8a039efd840ff9d95d32528df787429d714886a058b1297ea07
SHA512 (kernel-abi-whitelists-5.13.0-0.rc4.20210603git324c92e5e0ee.35.tar.bz2) = de6243ba194d42e5389b2eb22c173ff1a388abc5c4b92d1d14d82bfe203cd032fdbe92260d27556831ad06092442706e1bfc16f86fea1d77b4c05a0b380c70ad
SHA512 (kernel-kabi-dw-5.13.0-0.rc4.20210603git324c92e5e0ee.35.tar.bz2) = aece5675a70a4b2aa93431ce781ebfbe84f1648056a9d36c09f9641bdbb289a7c220c4f05c51b40cec16f3883302d8d3d770295fb08c70694394136bc371e1f3
SHA512 (linux-5.13-rc5.tar.xz) = a3d81252708ab8530779175697a89001c892153e19da6dbc0ba4babe89728c6688819795993fc71948ba82db8e90435183faacfd52791fe82931757ab7e651c5
SHA512 (kernel-abi-whitelists-5.13.0-0.rc5.38.tar.bz2) = 557a248d9016c6ab925146831a6f6357f7a87993ef056ad5f857748f951e62e1577ff673c44fd083fa8122bfddd44f8a23c315eb035f84366be3150959f93783
SHA512 (kernel-kabi-dw-5.13.0-0.rc5.38.tar.bz2) = 8344d8058a4948b548f5411181c64badb47a2628699c544c768921eedaef86a545049c07dbbcd30e56901c4eb1e04d911478295f0074c344cfadf9fc5187822f