diff --git a/0001-libbpf-Fix-readelf-output-parsing-on-powerpc-with-re.patch b/0001-libbpf-Fix-readelf-output-parsing-on-powerpc-with-re.patch
deleted file mode 100644
index 4099e36..0000000
--- a/0001-libbpf-Fix-readelf-output-parsing-on-powerpc-with-re.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3464afdf11f9a1e031e7858a05351ceca1792fea Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Sun, 1 Dec 2019 20:57:28 +0100
-Subject: [PATCH] libbpf: Fix readelf output parsing on powerpc with recent
- binutils
-
-On powerpc with recent versions of binutils, readelf outputs an extra
-field when dumping the symbols of an object file. For example:
-
- 35: 0000000000000838 96 FUNC LOCAL DEFAULT [<localentry>: 8] 1 btf_is_struct
-
-The extra "[<localentry>: 8]" prevents the GLOBAL_SYM_COUNT variable to
-be computed correctly and causes the check_abi target to fail.
-
-Fix that by looking for the symbol name in the last field instead of the
-8th one. This way it should also cope with future extra fields.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-Tested-by: Michael Ellerman <mpe@ellerman.id.au>
-Link: https://lore.kernel.org/bpf/20191201195728.4161537-1-aurelien@aurel32.net
----
- tools/lib/bpf/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
-index 37d7967aa166..3d3d024f7b94 100644
---- a/tools/lib/bpf/Makefile
-+++ b/tools/lib/bpf/Makefile
-@@ -147,7 +147,7 @@ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
-
- GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \
- cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
-- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \
-+ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
- sort -u | wc -l)
- VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \
- grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l)
-@@ -216,7 +216,7 @@ check_abi: $(OUTPUT)libbpf.so
- "versioned in $(VERSION_SCRIPT)." >&2; \
- readelf -s --wide $(BPF_IN_SHARED) | \
- cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
-- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}'| \
-+ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \
- sort -u > $(OUTPUT)libbpf_global_syms.tmp; \
- readelf -s --wide $(OUTPUT)libbpf.so | \
- grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \
---
-2.23.0
-
diff --git a/kernel-tools.spec b/kernel-tools.spec
index a41ea25..4d4621f 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -7,8 +7,8 @@
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%global released_kernel 1
-%global baserelease 2
+%global released_kernel 0
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -34,7 +34,7 @@
%global upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 0
+%global rcrev 1
# Set rpm version accordingly
%global rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -113,9 +113,6 @@ Patch0: 0001-iio-Use-event-header-from-kernel-tree.patch
# rpmlint cleanup
Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch
-# Should be fixed upstream soon
-Patch7: 0001-libbpf-Fix-readelf-output-parsing-on-powerpc-with-re.patch
-
Name: kernel-tools
Summary: Assortment of tools for the Linux kernel
License: GPLv2
@@ -222,7 +219,6 @@ cd linux-%{kversion}
%patch0 -p1
%patch6 -p1
-%patch7 -p1 -R
# END OF PATCH APPLICATIONS
@@ -456,6 +452,7 @@ popd
%{_sysconfdir}/bash_completion.d/bpftool
%{_mandir}/man8/bpftool-btf.8.gz
%{_mandir}/man8/bpftool-cgroup.8.gz
+%{_mandir}/man8/bpftool-gen.8.gz
%{_mandir}/man8/bpftool-map.8.gz
%{_mandir}/man8/bpftool-net.8.gz
%{_mandir}/man8/bpftool-prog.8.gz
@@ -466,7 +463,7 @@ popd
%files -n libbpf
%{_libdir}/libbpf.so.0
-%{_libdir}/libbpf.so.0.0.6
+%{_libdir}/libbpf.so.0.0.7
%license linux-%{kversion}/COPYING
%files -n libbpf-devel
@@ -481,11 +478,15 @@ popd
%{_includedir}/bpf/bpf_tracing.h
%{_includedir}/bpf/btf.h
%{_includedir}/bpf/libbpf.h
+%{_includedir}/bpf/libbpf_common.h
%{_includedir}/bpf/libbpf_util.h
%{_includedir}/bpf/xsk.h
%license linux-%{kversion}/COPYING
%changelog
+* Fri Feb 14 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc1.git0.1
+- Linux v5.6-rc1
+
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 3df436d..837a996 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86
+SHA512 (patch-5.6-rc1.xz) = 14a250e7128fa5e72f077e8751d3aa759ed03f102405359445748765542da1d0afae90bf69e02526cbf003395114b546c716ffd93d0e230e5da3b088f6d4b573