Linux v4.10-rc7-127-g3d88460

11 files changed, 24 insertions, 6 deletions

diff --git a/baseconfig/s390x/CONFIG_EMU_SIZE b/baseconfig/s390x/CONFIG_EMU_SIZE
new file mode 100644
index 000000000..116273f0c
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_EMU_SIZE
@@ -0,0 +1 @@
+CONFIG_EMU_SIZE=0x10000000
diff --git a/baseconfig/s390x/CONFIG_NODES_SHIFT b/baseconfig/s390x/CONFIG_NODES_SHIFT
new file mode 100644
index 000000000..747517623
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_NODES_SHIFT
@@ -0,0 +1 @@
+CONFIG_NODES_SHIFT=4
diff --git a/baseconfig/s390x/CONFIG_NUMA b/baseconfig/s390x/CONFIG_NUMA
index 7482c9800..e480f0c04 100644
--- a/baseconfig/s390x/CONFIG_NUMA
+++ b/baseconfig/s390x/CONFIG_NUMA
@@ -1 +1 @@
-# CONFIG_NUMA is not set
+CONFIG_NUMA=y
diff --git a/baseconfig/s390x/CONFIG_NUMA_BALANCING b/baseconfig/s390x/CONFIG_NUMA_BALANCING
new file mode 100644
index 000000000..9de89d51d
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_NUMA_BALANCING
@@ -0,0 +1 @@
+CONFIG_NUMA_BALANCING=y
diff --git a/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
new file mode 100644
index 000000000..5f7402180
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
@@ -0,0 +1 @@
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
diff --git a/baseconfig/s390x/CONFIG_NUMA_EMU b/baseconfig/s390x/CONFIG_NUMA_EMU
new file mode 100644
index 000000000..a444d47bb
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_NUMA_EMU
@@ -0,0 +1 @@
+CONFIG_NUMA_EMU=y
diff --git a/gitrev b/gitrev
index ad99c1c74..55c2d627c 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-55aac6ef53e114c28170ee3f79065cfa8ca9cf3f
+3d88460dbd285e7f32437b530d5bb7cb916142fa
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 005eefbaa..61a9964a1 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1202,6 +1202,7 @@ CONFIG_EFI_PGT_DUMP=y
 # CONFIG_EFS_FS is not set
 # CONFIG_EMAC_ROCKCHIP is not set
 # CONFIG_EMBEDDED is not set
+CONFIG_EMU_SIZE=0x10000000
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENC28J60 is not set
@@ -3316,6 +3317,7 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NLS=y
 CONFIG_NMI_LOG_BUF_SHIFT=13
+CONFIG_NODES_SHIFT=4
 CONFIG_NO_HZ=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NORTEL_HERMES=m
@@ -3329,7 +3331,10 @@ CONFIG_NSC_FIR=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
-# CONFIG_NUMA is not set
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_EMU=y
+CONFIG_NUMA=y
 CONFIG_NVME_FC=m
 CONFIG_NVMEM=m
 CONFIG_NVME_RDMA=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 53a1ef4a4..2743434dd 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1192,6 +1192,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_EFS_FS is not set
 # CONFIG_EMAC_ROCKCHIP is not set
 # CONFIG_EMBEDDED is not set
+CONFIG_EMU_SIZE=0x10000000
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENC28J60 is not set
@@ -3295,6 +3296,7 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NLS=y
 CONFIG_NMI_LOG_BUF_SHIFT=13
+CONFIG_NODES_SHIFT=4
 CONFIG_NO_HZ=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NORTEL_HERMES=m
@@ -3308,7 +3310,10 @@ CONFIG_NSC_FIR=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
-# CONFIG_NUMA is not set
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_EMU=y
+CONFIG_NUMA=y
 CONFIG_NVME_FC=m
 CONFIG_NVMEM=m
 CONFIG_NVME_RDMA=m
diff --git a/kernel.spec b/kernel.spec
index b437e8495..02aa8f239 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 7
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2172,6 +2172,9 @@ fi
 #
 #
 %changelog
+* Fri Feb 10 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc7.git4.1
+- Linux v4.10-rc7-127-g3d88460
+
 * Thu Feb 09 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc7.git3.1
 - Linux v4.10-rc7-114-g55aac6e
 
diff --git a/sources b/sources
index 37d25b00e..b6070fbe6 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-rc7.xz) = 206e5e97581bb376141398b6962fbbc4ee0a58b50fae1de83f3f6f3c06502b260f006628aab738d63994a6d1c0276717d49e882a8107b8f9c24d565a2a70ea9b
-SHA512 (patch-4.10-rc7-git3.xz) = 09ca5268d4e4b3ef82a086f2a2496adf47d522b3e98b9c020ffad9078f4af381f06c61140a726f1b6b2611ee014637eaac76e0df04c03e123609b742a09ac801
+SHA512 (patch-4.10-rc7-git4.xz) = 11e05e0f4f9c5a5bada92869a3a719fa4b12a8cd7829308ed1ea391a97d5273710559db546aa3162ca54d3fd9414f66c4e8aa7ee6c3af739ad9d2a4a4a3e29c0