From 88fc0e2f65816ea00498a0302a7fd5f54695ea9c Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@fedoraproject.org>
Date: Mon, 20 Mar 2017 08:16:10 -0700
Subject: [PATCH] Linux v4.11-rc3 Fix for debuginfo conflicts (rhbz 1431296)

---
 kernel.spec | 11 +++++++++--
 sources     |  3 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index a2183aa0f..19aa29c50 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 2
+%global rcrev 3
 # The git snapshot level
-%define gitrev 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -183,6 +183,9 @@ Summary: The Linux kernel
 %define _enable_debug_packages 0
 %endif
 %define debuginfodir /usr/lib/debug
+# Needed because we override almost everything involving build-ids
+# and debuginfo generation. Currently we rely on the old alldebug setting.
+%global _build_id_links alldebug
 
 # kernel PAE is only built on i686 and ARMv7.
 %ifnarch i686 armv7hl
@@ -2164,6 +2167,10 @@ fi
 #
 #
 %changelog
+* Mon Mar 20 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc3.git0.1
+- Linux v4.11-rc3
+- Fix for debuginfo conflicts (rhbz 1431296)
+
 * Mon Mar 20 2017 Laura Abbott <labbott@fedoraproject.org>
 - Disable debugging options.
 
diff --git a/sources b/sources
index 2d7d5dd3d..cbf2fc9e9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
-SHA512 (patch-4.11-rc2.xz) = 01fcc1e67bba67a1bfef74acea99a52b489cdaf3f6feb59dd4e7719a3a9c07ff3131a754823a283ef50535d730929b4ddd31fa24c6bda2c68c3ad41283db49ec
-SHA512 (patch-4.11-rc2-git4.xz) = 8a062c885c190a1ce7c56f37246f88cbc3f884b4a3ea914f3fb92d4ed501b10016ce2b03bd89e30846b8917334ba62e78d813e8f2bbceefce64f58fb99b97520
+SHA512 (patch-4.11-rc3.xz) = 88ff442fdcc41cd3734ddabc3cee54ea15ff5fef6b3bc1edc8f8c904ac888b45942a483ae35e3fee1a3b050d925755501b53de2e241a98905f63bb763a389086