From a14a56a257853e77526f95062db50a1e7424006b Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@fedoraproject.org>
Date: May 17 2021 20:08:44 +0000
Subject: Linux v5.13-rc2


Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

---

diff --git a/Fix-dynamic-libbpf-link.patch b/Fix-dynamic-libbpf-link.patch
deleted file mode 100644
index d72517e..0000000
--- a/Fix-dynamic-libbpf-link.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From ad1237c30d975535a669746496cbed136aa5a045 Mon Sep 17 00:00:00 2001
-From: Jiri Olsa <jolsa@kernel.org>
-Date: Sat, 8 May 2021 22:50:20 +0200
-Subject: perf tools: Fix dynamic libbpf link
-
-Justin reported broken build with LIBBPF_DYNAMIC=1.
-
-When linking libbpf dynamically we need to use perf's
-hashmap object, because it's not exported in libbpf.so
-(only in libbpf.a).
-
-Following build is now passing:
-
-  $ make LIBBPF_DYNAMIC=1
-    BUILD:   Doing 'make -j8' parallel build
-    ...
-  $ ldd perf | grep libbpf
-        libbpf.so.0 => /lib64/libbpf.so.0 (0x00007fa7630db000)
-
-Fixes: eee19501926d ("perf tools: Grab a copy of libbpf's hashmap")
-Reported-by: Justin M. Forbes <jforbes@redhat.com>
-Signed-off-by: Jiri Olsa <jolsa@kernel.org>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Michael Petlan <mpetlan@redhat.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/20210508205020.617984-1-jolsa@kernel.org
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
- tools/perf/Makefile.config | 1 +
- tools/perf/util/Build      | 7 +++++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
-index 0d6619064a838..406a9519145e5 100644
---- a/tools/perf/Makefile.config
-+++ b/tools/perf/Makefile.config
-@@ -540,6 +540,7 @@ ifndef NO_LIBELF
-       ifdef LIBBPF_DYNAMIC
-         ifeq ($(feature-libbpf), 1)
-           EXTLIBS += -lbpf
-+          $(call detected,CONFIG_LIBBPF_DYNAMIC)
-         else
-           dummy := $(error Error: No libbpf devel library found, please install libbpf-devel);
-         endif
-diff --git a/tools/perf/util/Build b/tools/perf/util/Build
-index 8c0d9f368ebcf..b64bdc1a7026d 100644
---- a/tools/perf/util/Build
-+++ b/tools/perf/util/Build
-@@ -145,7 +145,14 @@ perf-$(CONFIG_LIBELF) += symbol-elf.o
- perf-$(CONFIG_LIBELF) += probe-file.o
- perf-$(CONFIG_LIBELF) += probe-event.o
- 
-+ifdef CONFIG_LIBBPF_DYNAMIC
-+  hashmap := 1
-+endif
- ifndef CONFIG_LIBBPF
-+  hashmap := 1
-+endif
-+
-+ifdef hashmap
- perf-y += hashmap.o
- endif
- 
--- 
-cgit 1.2.3-1.el7
-
diff --git a/kernel-tools.spec b/kernel-tools.spec
index 2b69041..1e51aaa 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -34,7 +34,7 @@
 %global upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 
 # The rc snapshot level
-%global rcrev 1
+%global rcrev 2
 # Set rpm version accordingly
 %global rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -111,9 +111,6 @@ Patch0: 0001-iio-Use-event-header-from-kernel-tree.patch
 # rpmlint cleanup
 Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch
 
-# This goes away with rc2
-Patch7: Fix-dynamic-libbpf-link.patch
-
 Name: kernel-tools
 Summary: Assortment of tools for the Linux kernel
 License: GPLv2
@@ -207,7 +204,6 @@ cd linux-%{kversion}
 
 %patch0 -p1
 %patch6 -p1
-%patch7 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -489,6 +485,9 @@ popd
 %license linux-%{kversion}/COPYING
 
 %changelog
+* Mon May 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.13.0-0.rc2.git0.1
+- Linux v5.13-rc2
+
 * Mon May 10 2021 Justin M. Forbes <jforbes@fedoraproject.org>
 - perf: enable dynamic linking of libbpf
 
diff --git a/sources b/sources
index b330376..eae38fa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.12.tar.xz) = be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
-SHA512 (patch-5.13-rc1.xz) = 679a2aee0fc9cc4a71a181962d59dd1e3ca6fb75d8404d9c4c693d3718989ca814fcfd9c3f39e86fd3a3f46a29184b583a1033b9ea28989b6866228d7dc9618b
+SHA512 (patch-5.13-rc2.xz) = c6dc787b51fb5abd1f177ee9d6f03aa5fb538644ee5d78b413c3af23d6b7cce82682e51d785aafcbdc8d48cac2ada0740bf6cc8a1fd4317daa0512ddc292a804