summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2017-11-13 11:38:31 -0800
committerLaura Abbott <labbott@redhat.com>2017-11-13 11:44:06 -0800
commit1a5d24760948ee0eea5779cb3a177cd89e1a3373 (patch)
treebc9bf273ef249af3a9f1ddc7cd65a5bd8269edb7
parentee6b4cbd339d961f533f363732e601bf59b1c489 (diff)
downloadkernel-1a5d24760948ee0eea5779cb3a177cd89e1a3373.tar.gz
kernel-1a5d24760948ee0eea5779cb3a177cd89e1a3373.tar.xz
kernel-1a5d24760948ee0eea5779cb3a177cd89e1a3373.zip
Linux v4.14-104-g1e19bded7f5d
Also flip MAXSMP for generic vs. debug config (see f4861c48b88ff145cc8b50655b61d6c6a411f073)
-rw-r--r--configs/base-debug/CONFIG_MAXSMP2
-rw-r--r--configs/base-generic/CONFIG_SENSORS_MAX317851
-rw-r--r--configs/base-generic/CONFIG_SENSORS_MAX66211
-rw-r--r--configs/base-generic/x86/CONFIG_MAXSMP2
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64-debug.config2
-rw-r--r--kernel-ppc64.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
-rw-r--r--kernel.spec7
-rw-r--r--sources1
25 files changed, 47 insertions, 5 deletions
diff --git a/configs/base-debug/CONFIG_MAXSMP b/configs/base-debug/CONFIG_MAXSMP
index d0d71de53..8d0fa581d 100644
--- a/configs/base-debug/CONFIG_MAXSMP
+++ b/configs/base-debug/CONFIG_MAXSMP
@@ -1 +1 @@
-# CONFIG_MAXSMP is not set
+CONFIG_MAXSMP=y
diff --git a/configs/base-generic/CONFIG_SENSORS_MAX31785 b/configs/base-generic/CONFIG_SENSORS_MAX31785
new file mode 100644
index 000000000..071991fe5
--- /dev/null
+++ b/configs/base-generic/CONFIG_SENSORS_MAX31785
@@ -0,0 +1 @@
+# CONFIG_SENSORS_MAX31785 is not set
diff --git a/configs/base-generic/CONFIG_SENSORS_MAX6621 b/configs/base-generic/CONFIG_SENSORS_MAX6621
new file mode 100644
index 000000000..cc3cdefc6
--- /dev/null
+++ b/configs/base-generic/CONFIG_SENSORS_MAX6621
@@ -0,0 +1 @@
+# CONFIG_SENSORS_MAX6621 is not set
diff --git a/configs/base-generic/x86/CONFIG_MAXSMP b/configs/base-generic/x86/CONFIG_MAXSMP
index 8d0fa581d..d0d71de53 100644
--- a/configs/base-generic/x86/CONFIG_MAXSMP
+++ b/configs/base-generic/x86/CONFIG_MAXSMP
@@ -1 +1 @@
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
diff --git a/gitrev b/gitrev
index 9da565e93..148bd3c97 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-bebc6082da0a9f5d47a1ea2edc099bf671058bd4
+1e19bded7f5d5152b7f53ee7356241ecb18905b0
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 1e35231c2..fd83dda4d 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4884,8 +4884,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 355143eaf..71752a01a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4862,8 +4862,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 4656caba8..8920fa68a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5242,8 +5242,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index d1dd32b16..542d9c42d 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4934,8 +4934,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0160a3634..572ea2e89 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4912,8 +4912,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index b7d0628e4..2e29e4e35 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5220,8 +5220,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 45918b967..7e0a4d0dc 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -4613,8 +4613,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 9bb1564fc..48906da85 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4634,8 +4634,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 1a81d84c1..146ad5ae0 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4634,8 +4634,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 6549136f6..f6b420ded 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4613,8 +4613,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 06bb87cad..6708dc62e 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4438,8 +4438,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index e6e9c4e43..06b0d71a9 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4415,8 +4415,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 66c67d2c5..8434f99fc 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4377,8 +4377,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 0d18af253..5a53b8b54 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4354,8 +4354,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index acca1bb10..58b82e7e7 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4280,8 +4280,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index b5c7f851f..f5e8458dd 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4257,8 +4257,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 99f92b549..c9efc3836 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4677,8 +4677,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 7f94bd96e..e9a772664 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4656,8 +4656,10 @@ CONFIG_SENSORS_MAX1668=m
CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX31722=m
+# CONFIG_SENSORS_MAX31785 is not set
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MAX34440=m
+# CONFIG_SENSORS_MAX6621 is not set
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
diff --git a/kernel.spec b/kernel.spec
index d7715feda..14401f384 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%global released_kernel 1
+%global released_kernel 0
# Sign modules on x86. Make sure the config files match this setting if more
# architectures are added.
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2201,6 +2201,9 @@ fi
#
#
%changelog
+* Mon Nov 13 2017 Laura Abbott <labbott@redhat.com> - 4.14.0-0.rc0.git1.1
+- Linux v4.14-104-g1e19bded7f5d
+
* Mon Nov 13 2017 Laura Abbott <labbott@redhat.com>
- Reenable debugging options.
diff --git a/sources b/sources
index ad3df1e55..6ed2fa0a9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8
+SHA512 (patch-4.14-git1.xz) = 52539214eb198781891805c1cbdf085e48b62bed33848a8be96e6268595c769ab8ea702db57840b510b3a6461fa8bf94031b692a6726b9f7b1fe307f9e8f29cc