Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc0.git7.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc0.git7.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc0.git7.1.vanilla.knurd.1.fc24

24 files changed, 27 insertions, 3 deletions

diff --git a/baseconfig/CONFIG_NET_VENDOR_SOLARFLARE b/baseconfig/CONFIG_NET_VENDOR_SOLARFLARE
new file mode 100644
index 000000000..7b1c5d291
--- /dev/null
+++ b/baseconfig/CONFIG_NET_VENDOR_SOLARFLARE
@@ -0,0 +1 @@
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
diff --git a/gitrev b/gitrev
index 2408058e0..deea4cc82 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-e93b1cc8a8965da137ffea0b88e5f62fa1d2a9e6
+ba6d973f78eb62ffebb32f6ef3334fc9a3b33d22
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index fe38d780b..ea708b8de 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3413,6 +3413,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index eaf27dd5a..c99f8cac4 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3392,6 +3392,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index f9b3af4ff..4f7b295a0 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3707,6 +3707,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index c78ec2d83..7b1355617 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3555,6 +3555,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 106a7a35d..2f47010d7 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3535,6 +3535,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 2bc07b94d..2d89fda2c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3687,6 +3687,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 838de57ec..c7071f138 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3344,6 +3344,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index a34d80a35..0ee04fa36 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3363,6 +3363,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 60c9bab1a..7162d0981 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3363,6 +3363,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 77c8cb868..9d6e8c9e8 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3344,6 +3344,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 22fad5ed1..393f5e43b 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3226,6 +3226,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index eab8de1bd..12466cd73 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3205,6 +3205,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 1db893489..8c3a65297 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3171,6 +3171,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index da5be09e8..2fe9f3a81 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3150,6 +3150,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 7e51b08bf..eb4318d52 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -3170,6 +3170,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 8d93e0edb..4d67bee1f 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -3149,6 +3149,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a967df94e..f9b7fcbf0 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3098,6 +3098,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 8eb7a2322..477b4a337 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3077,6 +3077,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 86ff69a58..6e0b82f27 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3384,6 +3384,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index a2943df48..e39d32047 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3365,6 +3365,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
diff --git a/kernel.spec b/kernel.spec
index d0dacad48..20cf476d8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 0
 # The git snapshot level
-%define gitrev 6
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2152,6 +2152,9 @@ fi
 #
 #
 %changelog
+* Wed Dec 21 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc0.git7.1
+- Linux v4.9-11893-gba6d973
+
 * Tue Dec 20 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc0.git6.1
 - Linux v4.9-11815-ge93b1cc
 
diff --git a/sources b/sources
index 03a10e326..79f851cee 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99
-SHA512 (patch-4.9-git6.xz) = 95529ed29fb45189278ee8baf8acbd43835f5e90d4e2f97188229641a95723da0d7c08e2b51dbe3633d5f6829dfee42f821871b7309c1111b09bb743fa4d7353
+SHA512 (patch-4.9-git7.xz) = ccffed03268c9c476ae98863942b7c6a28e194fa73144e99cddde6a4c3e983222c2bc5276892585e3c4b5d5b8b7afdcb77fffceae55741ff2a5bfb065a4608c0