Linux v4.7-11544-g96b5852

4 files changed, 6 insertions, 56 deletions

diff --git a/0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch b/0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch
deleted file mode 100644
index fcafe4d29..000000000
--- a/0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4196017cd0e50e434ee72ca706742804f75c8827 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@fedoraproject.org>
-Date: Fri, 8 Jul 2016 11:15:43 -0700
-Subject: [PATCH] Work around for addition of metag def but not relocations
-
-Caused by commit in sync up from
-http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/commit/?id=9a78be1808600ca5e66eab741542447a29cfbeb3
-
-Fixes build errors like:
-
-scripts/recordmcount.c: In function 'do_file':
-scripts/recordmcount.c:466:28: error: 'R_METAG_ADDR32' undeclared (first use in this function)
-  case EM_METAG:  reltype = R_METAG_ADDR32;
-                            ^~~~~~~~~~~~~~
-scripts/recordmcount.c:466:28: note: each undeclared identifier is reported only once for each function it appears in
-scripts/recordmcount.c:468:20: error: 'R_METAG_NONE' undeclared (first use in this function)
-     rel_type_nop = R_METAG_NONE;
-                    ^~~~~~~~~~~~
-
-Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
----
- scripts/recordmcount.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
-index e1675927..42396a7 100644
---- a/scripts/recordmcount.c
-+++ b/scripts/recordmcount.c
-@@ -33,10 +33,17 @@
- #include <string.h>
- #include <unistd.h>
- 
-+/*
-+ * glibc synced up and added the metag number but didn't add the relocations.
-+ * Work around this in a crude manner for now.
-+ */
- #ifndef EM_METAG
--/* Remove this when these make it to the standard system elf.h. */
- #define EM_METAG      174
-+#endif
-+#ifndef R_METAG_ADDR32
- #define R_METAG_ADDR32                   2
-+#endif
-+#ifndef R_METAG_NONE
- #define R_METAG_NONE                     3
- #endif
- 
--- 
-2.9.0
-
diff --git a/gitrev b/gitrev
index 04f182a74..3a8679472 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-d52bd54db8be8999df6df5a776f38c4f8b5e9cea
+96b585267f552d4b6a28ea8bd75e5ed03deb6e71
diff --git a/kernel.spec b/kernel.spec
index 01f745b08..69cf5d50f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -598,9 +598,6 @@ Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
 #CVE-2016-3134 rhbz 1317383 1317384
 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 
-#Workaround for glibc update
-Patch835: 0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch
-
 # https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org/message/A4YCP7OGMX6JLFT5V44H57GOMAQLC3M4/
 Patch839: drm-i915-Acquire-audio-powerwell-for-HD-Audio-regist.patch
 
@@ -2138,6 +2135,9 @@ fi
 #
 # 
 %changelog
+* Thu Aug 04 2016 Laura Abbott <labbott@redhat.com> - 4.8.0-0.rc0.git6.1
+- Linux v4.7-11544-g96b5852
+
 * Wed Aug 03 2016 Laura Abbott <labbott@redhat.com> - 4.8.0-0.rc0.git5.1
 - Linux v4.7-11470-gd52bd54
 
diff --git a/sources b/sources
index 0035fb427..e06b0a92e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 5276563eb1f39a048e4a8a887408c031  linux-4.7.tar.xz
 fe259c02c75eec61d1aa4b1211f3c853  perf-man-4.7.tar.gz
-0578e1a487d8580174a3c5542687f8ca  patch-4.7-git5.xz
+49f6889a0303e4aef5f3b604d8642da0  patch-4.7-git6.xz