Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc5.git1.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc5.git1.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc5.git1.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc5.git1.1.vanilla.knurd.1.fc24

15 files changed, 30 insertions, 25 deletions

diff --git a/baseconfig/CONFIG_B43LEGACY_DEBUG b/baseconfig/CONFIG_B43LEGACY_DEBUG
index 02f67a471..494982463 100644
--- a/baseconfig/CONFIG_B43LEGACY_DEBUG
+++ b/baseconfig/CONFIG_B43LEGACY_DEBUG
@@ -1 +1 @@
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
diff --git a/baseconfig/CONFIG_B43_DEBUG b/baseconfig/CONFIG_B43_DEBUG
index 9346a4511..a2bf9bb1f 100644
--- a/baseconfig/CONFIG_B43_DEBUG
+++ b/baseconfig/CONFIG_B43_DEBUG
@@ -1 +1 @@
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
diff --git a/gitrev b/gitrev
index 37d3ed9b0..789b40646 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-32c1431eea4881a6b17bd7c639315010aeefa452
+a090bd4ff8387c409732a8e059fbf264ea0bdd56
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 6b0226998..27c433472 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -407,8 +407,8 @@ CONFIG_AXP288_CHARGER=m
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 1cfebf063..cc44bc6a3 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -429,8 +429,8 @@ CONFIG_AXP288_CHARGER=m
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 4dfe85f38..9a613869a 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -444,8 +444,8 @@ CONFIG_AXP288_CHARGER=m
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 1fee46272..7c0ec2889 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -328,8 +328,8 @@ CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 345a61fe2..c34acb98f 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -328,8 +328,8 @@ CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index be2ebe13f..f29a7604e 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -278,8 +278,8 @@ CONFIG_AX25=m
 # CONFIG_AXON_RAM is not set
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 32e02f042..287b1abae 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -272,8 +272,8 @@ CONFIG_AX25=m
 # CONFIG_AXON_RAM is not set
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 245681434..63285bb0d 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -272,8 +272,8 @@ CONFIG_AX25=m
 # CONFIG_AXON_RAM is not set
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 23f78a773..89e845b6a 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -273,8 +273,8 @@ CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 9fedd2042..b6eec395f 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -327,8 +327,8 @@ CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_DEBUG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel.spec b/kernel.spec
index b0cf90352..00baf4de1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # 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}
@@ -2185,6 +2185,10 @@ fi
 #
 #
 %changelog
+* Thu Jun 15 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc5.git1.1
+- Linux v4.12-rc5-137-ga090bd4
+- Reenable debugging options.
+
 * Wed Jun 14 2017 Peter Robinson <pbrobinson@fedoraproject.org>
 - Rebase dwmac-sun8i to v6 that's in net-next
 - Add more device support and extra fixes for dwmac-sun8i
diff --git a/sources b/sources
index 2953fbb13..4e6f233e1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6
 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
 SHA512 (patch-4.12-rc5.xz) = 840b4acf25ea7bab7018f1ad00963c94ce6b92bbada0ec024a32daa5d96ce63f3791633fa400b740ab09b22f4b3ddbd8e153c85c4200044fbc47826b77dcfcb9
+SHA512 (patch-4.12-rc5-git1.xz) = 6846ad6d16cd820d111eec4f12340fe7ad0a23d807de227efc5684d7df98158183eb4d0e438470126698c907307514297715d5347be8cf4449d18d3443e04f34