Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc4.git3.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc4.git3.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc4.git3.1.vanilla.knurd.1.fc25

8 files changed, 20 insertions, 59 deletions

diff --git a/0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch b/0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
deleted file mode 100644
index 3e4fade01..000000000
--- a/0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8bfbdce4d7da6353d1039148a4c90dd463f1fb8f Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 27 Jul 2017 13:52:17 -0700
-Subject: [PATCH] Revert "xgene: Don't fail probe, if there is no clk resource
- for SGMII interfaces"
-
-This reverts commit 0db01097cabd97897d123b4c5d805d1a7b061d82.
-
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 22 ++++++++++------------
- 1 file changed, 10 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-index 86058a9f3417..d3906f6b01bd 100644
---- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-@@ -1785,18 +1785,16 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
- 
- 	xgene_enet_gpiod_get(pdata);
- 
--	if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) {
--		pdata->clk = devm_clk_get(&pdev->dev, NULL);
--		if (IS_ERR(pdata->clk)) {
--			/* Abort if the clock is defined but couldn't be
--			 * retrived. Always abort if the clock is missing on
--			 * DT system as the driver can't cope with this case.
--			 */
--			if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
--				return PTR_ERR(pdata->clk);
--			/* Firmware may have set up the clock already. */
--			dev_info(dev, "clocks have been setup already\n");
--		}
-+	pdata->clk = devm_clk_get(&pdev->dev, NULL);
-+	if (IS_ERR(pdata->clk)) {
-+		/* Abort if the clock is defined but couldn't be retrived.
-+		 * Always abort if the clock is missing on DT system as
-+		 * the driver can't cope with this case.
-+		 */
-+		if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
-+			return PTR_ERR(pdata->clk);
-+		/* Firmware may have set up the clock already. */
-+		dev_info(dev, "clocks have been setup already\n");
- 	}
- 
- 	if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII)
--- 
-2.13.0
-
diff --git a/debugconfig/arm/armv7/CONFIG_DMADEVICES_DEBUG b/debugconfig/arm/CONFIG_DMADEVICES_DEBUG
index 7cd4fec86..7cd4fec86 100644
--- a/debugconfig/arm/armv7/CONFIG_DMADEVICES_DEBUG
+++ b/debugconfig/arm/CONFIG_DMADEVICES_DEBUG
diff --git a/gitrev b/gitrev
index 741833e70..940787631 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-869c058fbe741cadff09647c68dbeae7d012f52d
+8d31f80eb38819e4f2905ad21c0e8998382a08f7
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 44fefa8d1..c1cd3f2d8 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1181,10 +1181,10 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_BCM2835=m
 CONFIG_DMA_CMA=y
-CONFIG_DMADEVICES_DEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMADEVICES_VDEBUG is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 4bfa3935a..3384fb812 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1243,7 +1243,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
 CONFIG_DMA_CMA=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index da3311cdb..ec766c062 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1191,7 +1191,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
 CONFIG_DMA_CMA=y
diff --git a/kernel.spec b/kernel.spec
index 41b343ad0..020bf0e05 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 4
 # The git snapshot level
-%define gitrev 0
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -133,7 +133,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -632,9 +632,6 @@ Patch312: qcom-display-iommu.patch
 # https://patchwork.kernel.org/patch/9839803/
 Patch313: qcom-Force-host-mode-for-USB-on-apq8016-sbc.patch
 
-# Breaking mustang booting
-Patch314: 0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
-
 # http://www.spinics.net/lists/dri-devel/msg132235.html
 Patch320: bcm283x-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch
 
@@ -2219,6 +2216,18 @@ fi
 #
 #
 %changelog
+* Thu Aug 10 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc4.git3.1
+- Linux v4.13-rc4-139-g8d31f80eb388
+
+* Wed Aug 09 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc4.git2.1
+- Linux v4.13-rc4-52-gbfa738cf3dfa
+
+* Tue Aug 08 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc4.git1.1
+- Linux v4.13-rc4-18-g623ce3456671
+
+* Tue Aug 08 2017 Laura Abbott <labbott@fedoraproject.org>
+- Reenable debugging options.
+
 * Mon Aug 07 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc4.git0.1
 - Linux v4.13-rc4
 
diff --git a/sources b/sources
index f5a972c3f..d55a7d711 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c
 SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 SHA512 (patch-4.13-rc4.xz) = 0f03c25f705892ffcff410b3d3068fe25a876c91ec251497ceda37bfdef1c88bf0ed5486c5e68f399db1f5a11e9a08c48d894cc80cb8e9b3a56ce02f203cc1bc
+SHA512 (patch-4.13-rc4-git3.xz) = 31cfcc546eaf9a50bff6ab7d0f031a7dd95fc7e00e558efa00a8d68c96703f0216a1e03a03feda7abe666baa6bb2b2be61517a0830587eae3d98eafddd0b7355