Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.vanilla.1.fc35kernel-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.vanilla.1.fc34kernel-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.vanilla.1.fc33

12 files changed, 27 insertions, 21 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 9c30a4e4a..5acae9995 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 = 39
+RHEL_RELEASE = 40
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 64bb46987..2b99bbea0 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -6491,7 +6491,7 @@ CONFIG_VMAP_STACK=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
-# CONFIG_VP_VDPA is not set
+CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 52c15f2ca..4f1ee214e 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -6468,7 +6468,7 @@ CONFIG_VMAP_STACK=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
-# CONFIG_VP_VDPA is not set
+CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 05570c2fd..b0e09524d 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -6296,7 +6296,7 @@ CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
 CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
-# CONFIG_VP_VDPA is not set
+CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 95b9afbd3..501d185bc 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -6277,7 +6277,7 @@ CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
 CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
-# CONFIG_VP_VDPA is not set
+CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 984acbe88..dda2226a7 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -6253,7 +6253,7 @@ CONFIG_VMCP=y
 CONFIG_VMLOGRDR=m
 CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
-# CONFIG_VP_VDPA is not set
+CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 6497a2e8c..c5502f0b4 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -6234,7 +6234,7 @@ CONFIG_VMCP=y
 CONFIG_VMLOGRDR=m
 CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
-# CONFIG_VP_VDPA is not set
+CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 55a70dbe7..276c819ca 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -6269,7 +6269,7 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VMLOGRDR=m
 CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
-# CONFIG_VP_VDPA is not set
+CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 # CONFIG_VSOCKETS is not set
 CONFIG_VSOCKETS_LOOPBACK=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 7ece33a24..bb3e962f7 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -6546,7 +6546,7 @@ CONFIG_VMWARE_PVSCSI=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_VMXNET3=m
-# CONFIG_VP_VDPA is not set
+CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index fc711b83a..cb2828370 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -6524,7 +6524,7 @@ CONFIG_VMWARE_PVSCSI=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_VMXNET3=m
-# CONFIG_VP_VDPA is not set
+CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
diff --git a/kernel.spec b/kernel.spec
index 22900b556..10256b95e 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 0.rc5.20210608git368094df48e6.39
+%global distro_build 0.rc5.20210610gitcd1245d75ce9.40
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -119,13 +119,13 @@ Summary: The Linux kernel
 %define kversion 5.13
 
 %define rpmversion 5.13.0
-%define pkgrelease 0.rc5.20210608git368094df48e6.39
+%define pkgrelease 0.rc5.20210610gitcd1245d75ce9.40
 
 # This is needed to do merge window version magic
 %define patchlevel 13
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20210608git368094df48e6.39%{?buildid}%{?dist}
+%define specrelease 0.rc5.20210610gitcd1245d75ce9.40%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -575,6 +575,9 @@ BuildRequires: libtraceevent-devel
 %ifnarch %{arm} s390x
 BuildRequires: numactl-devel
 %endif
+%ifarch aarch64
+BuildRequires: opencsd-devel >= 1.0.0-2
+%endif
 %endif
 %if %{with_tools}
 BuildRequires: gettext ncurses-devel
@@ -649,7 +652,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13-rc5-36-g368094df48e6.tar.xz
+Source0: linux-5.13-rc5-63-gcd1245d75ce9.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1318,8 +1321,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.13-rc5-36-g368094df48e6 -c
-mv linux-5.13-rc5-36-g368094df48e6 linux-%{KVERREL}
+%setup -q -n kernel-5.13-rc5-63-gcd1245d75ce9 -c
+mv linux-5.13-rc5-63-gcd1245d75ce9 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2098,8 +2101,11 @@ InitBuildVars
 %endif
 %endif
 
+%ifarch aarch64
+%global perf_build_extra_opts CORESIGHT=1
+%endif
 %global perf_make \
-  %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 prefix=%{_prefix} PYTHON=%{__python3}
+  %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
 %if %{with_perf}
 # perf
 # make sure check-headers.sh is executable
@@ -2873,7 +2879,7 @@ fi
 #
 #
 %changelog
-* Tue Jun 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.20210608git368094df48e6.39]
+* Thu Jun 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.20210610gitcd1245d75ce9.40]
 - 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)
diff --git a/sources b/sources
index ecb9748a9..60fffe3e5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13-rc5-36-g368094df48e6.tar.xz) = b19e464a65dc198a2d815a8f90513d866d41de7ad2c6bd319b63369a6a9fb1014ae1ce9ab006f5420c0cea32dc6aa1c894a62314bc00fd43ad5139c95241d27f
-SHA512 (kernel-abi-whitelists-5.13.0-0.rc5.20210608git368094df48e6.39.tar.bz2) = a3a267870e5eadb9f6b7e644be581e11b28b6b50b7458b8d3e18153e79029597440dcf85691be5dced24f33eae6f797c85888c29188ecdb03a40b46af1464ae6
-SHA512 (kernel-kabi-dw-5.13.0-0.rc5.20210608git368094df48e6.39.tar.bz2) = 56576ae1630f32cde1d58e48c2f15e4679d7d639c67a727b94f19c312f222ca41b684112cfa20b354d126f51fc8e5cf1e7e6e2715f4f5e23507c6cf6439f3761
+SHA512 (linux-5.13-rc5-63-gcd1245d75ce9.tar.xz) = 2d54d63097eb62f85d6630a44bf2e1f7c7e3190a90309648aaa3fd8c6549a3cfd2fc0018b4dbe08e0bd139ec3bfa3f44423b773145e29dcd759f790055b325ef
+SHA512 (kernel-abi-whitelists-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.tar.bz2) = 989a32f00d2139f3547dd58bb012f7cb28752e82367a7d8039e503dbdc272c87923276b02728c2e28a40e12198ccc84be76d221159eab4a47d1f6db292ca7bc4
+SHA512 (kernel-kabi-dw-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.tar.bz2) = 3177f38d555e65042bf7c4db4c55913beeef1793c21bdf204f26f486d1c5a2603eb2c091179c42f7657b54a9a3944e9410030c13be0b7e1feb16271fca3ea0d4