Linux v4.12-rc7

23 files changed, 28 insertions, 25 deletions

diff --git a/baseconfig/CONFIG_SERIAL_8250_PCI b/baseconfig/CONFIG_SERIAL_8250_PCI
index d48086e3e..c0ac5637f 100644
--- a/baseconfig/CONFIG_SERIAL_8250_PCI
+++ b/baseconfig/CONFIG_SERIAL_8250_PCI
@@ -1 +1 @@
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index c9c64e570..6e01e68d1 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4845,7 +4845,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 27c433472..27cb78ee2 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4823,7 +4823,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index bb7488db0..c43cfe8a7 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5216,7 +5216,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_OMAP=m
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 1e803f5d0..b080a6628 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4918,7 +4918,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index cc44bc6a3..ffe0780ff 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4896,7 +4896,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 9a613869a..98ddad80f 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5194,7 +5194,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_OMAP=m
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 13048b855..cdfe4bb3b 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -4589,7 +4589,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_MID=y
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 7c7cb2266..d88af7089 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4610,7 +4610,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_MID=y
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 4589583d5..05b44a313 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4610,7 +4610,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_MID=y
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-i686.config b/kernel-i686.config
index 6c25526e7..c5809f722 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4589,7 +4589,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_MID=y
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 218c1e23c..730f42718 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4427,7 +4427,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index f29a7604e..d39d94c84 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4404,7 +4404,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2fd4fd6aa..61fa7665a 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4367,7 +4367,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 287b1abae..fe131a436 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4344,7 +4344,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 8e1af389e..477c51d42 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -4366,7 +4366,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 63285bb0d..7a5f05022 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -4343,7 +4343,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a9a3c1264..37e00a8bd 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4266,7 +4266,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 89e845b6a..21726a5ed 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4243,7 +4243,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 3be7d797d..9f52fa0de 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4649,7 +4649,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_MID=y
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 891ce24ac..14a5f1e8e 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4628,7 +4628,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_MID=y
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
diff --git a/kernel.spec b/kernel.spec
index 5f86387c8..658b4a198 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 6
+%global rcrev 7
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2193,6 +2193,10 @@ fi
 #
 #
 %changelog
+* Mon Jun 26 2017 Laura Abbott <labbott@fedoraproject.org> - 4.12.0-0.rc7.git0.1
+- Linux v4.12-rc7
+- Make CONFIG_SERIAL_8250_PCI built in (rhbz 1464709)
+
 * Mon Jun 26 2017 Laura Abbott <labbott@fedoraproject.org>
 - Disable debugging options.
 
diff --git a/sources b/sources
index 5fda7c580..709ae54f4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6
 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
-SHA512 (patch-4.12-rc6.xz) = a788fc1a840a398602feaa3b9e5d1183e13a96ac41399185645a67b86572cb569da2bcae41e7dfbde5b82cc1a69607833d24fed1fd4657e29a8536817afcfde6
-SHA512 (patch-4.12-rc6-git3.xz) = b218ff63345d72d27dd562bfd37208a54844df424bd5b040f7cb7c2df0c5d475ada35f9be2a9fa3b476437a727601eaa9d1c494b65e0e7fd7059fd43f6c77bb0
+SHA512 (patch-4.12-rc7.xz) = 0e2edc68851374111c458fb0557c724ec1db0376ea42b40177205453961791cc717cede122da95408b3e2eb5d59a7a7b214d70aed1cbb271d572a78e39c5b244