From bff70322560535e5f97309fc6cc6c76328a055bd Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: Feb 03 2017 19:06:51 +0000 Subject: Linux v4.10-rc6-110-g34e00ac --- diff --git a/baseconfig/s390x/CONFIG_MARCH_Z900 b/baseconfig/s390x/CONFIG_MARCH_Z900 deleted file mode 100644 index 6fa9110..0000000 --- a/baseconfig/s390x/CONFIG_MARCH_Z900 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MARCH_Z900 is not set diff --git a/baseconfig/s390x/CONFIG_MARCH_Z990 b/baseconfig/s390x/CONFIG_MARCH_Z990 deleted file mode 100644 index b0c3638..0000000 --- a/baseconfig/s390x/CONFIG_MARCH_Z990 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MARCH_Z990 is not set diff --git a/baseconfig/s390x/CONFIG_MARCH_Z9_109 b/baseconfig/s390x/CONFIG_MARCH_Z9_109 deleted file mode 100644 index e19e966..0000000 --- a/baseconfig/s390x/CONFIG_MARCH_Z9_109 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MARCH_Z9_109=y diff --git a/baseconfig/s390x/CONFIG_MARCH_ZEC12 b/baseconfig/s390x/CONFIG_MARCH_ZEC12 new file mode 100644 index 0000000..7dbcbb3 --- /dev/null +++ b/baseconfig/s390x/CONFIG_MARCH_ZEC12 @@ -0,0 +1 @@ +CONFIG_MARCH_ZEC12=y diff --git a/gitrev b/gitrev index 049f033..59232de 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -6d04dfc8966019b8b0977b2cb942351f13d2b178 +34e00accf612bc5448ae709245c2b408edf39f46 diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 1b80a8c..cc1ac36 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2461,9 +2461,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m -# CONFIG_MARCH_Z900 is not set -CONFIG_MARCH_Z9_109=y -# CONFIG_MARCH_Z990 is not set +CONFIG_MARCH_ZEC12=y CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX1363 is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index a54c07c..b90aaab 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2442,9 +2442,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m -# CONFIG_MARCH_Z900 is not set -CONFIG_MARCH_Z9_109=y -# CONFIG_MARCH_Z990 is not set +CONFIG_MARCH_ZEC12=y CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX1363 is not set diff --git a/kernel.spec b/kernel.spec index 114da2b..8841d69 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2169,6 +2169,9 @@ fi # # %changelog +* Fri Feb 03 2017 Justin M. Forbes - 4.10.0-0.rc6.git3.1 +- Linux v4.10-rc6-110-g34e00ac + * Wed Feb 01 2017 Justin M. Forbes - 4.10.0-0.rc6.git2.1 - Linux v4.10-rc6-85-g6d04dfc - enable CONFIG_SENSORS_JC42 (rhbz 1417454) diff --git a/sources b/sources index b3977fa..405fe1f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99 SHA512 (patch-4.10-rc6.xz) = eb6dfcdcb427d198d955b6c2146abd5c6a74d01ab10855d713f33b9c87df05f20f2688cb354d5881dfb82ebdcf4ecac37b36956ff3645977f967f021b52ad507 -SHA512 (patch-4.10-rc6-git2.xz) = 48f8233d4a9bdb0eaa71123437633c4b6d01a5e2ca577f8ab3435a404ea78f4f6d6c90c4ad39c4497f3affcdb240a383d92923eb98d505f927014485acf1839a +SHA512 (patch-4.10-rc6-git3.xz) = 8a844c3b708926f0451931961128b485db23dac8f40978716675d9fcec5ae9a40b3ef5da50d613c9de4d3c7c15edf4942dd232b1ef7935c373e74e92c145b016