Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc4.git1.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc4.git1.1.vanilla.knurd.1.fc26

7 files changed, 59 insertions, 6 deletions

diff --git a/arm64-socionext-96b-enablement.patch b/arm64-socionext-96b-enablement.patch
index 52bae8817..b82067ea4 100644
--- a/arm64-socionext-96b-enablement.patch
+++ b/arm64-socionext-96b-enablement.patch
@@ -3048,3 +3048,51 @@ index 0000000..4695969
 -- 
 cgit v1.1
 
+From d2fc584f8237746a84e6ec8690d8884f148fc449 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Tue, 10 Oct 2017 11:35:51 +0100
+Subject: [PATCH] add interrupt.h, sort alphabetically
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ drivers/net/ethernet/socionext/netsec/netsec_platform.c | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/net/ethernet/socionext/netsec/netsec_platform.c b/drivers/net/ethernet/socionext/netsec/netsec_platform.c
+index 624f6a7093f6..79072bae917d 100644
+--- a/drivers/net/ethernet/socionext/netsec/netsec_platform.c
++++ b/drivers/net/ethernet/socionext/netsec/netsec_platform.c
+@@ -14,21 +14,22 @@
+  */
+ 
+ #include <linux/acpi.h>
+-#include <linux/device.h>
+-#include <linux/ctype.h>
+-#include <linux/netdevice.h>
+-#include <linux/types.h>
+ #include <linux/bitops.h>
++#include <linux/clk.h>
++#include <linux/ctype.h>
++#include <linux/device.h>
+ #include <linux/dma-mapping.h>
++#include <linux/io.h>
++#include <linux/interrupt.h>
+ #include <linux/module.h>
+-#include <linux/sizes.h>
+-#include <linux/platform_device.h>
+-#include <linux/clk.h>
++#include <linux/netdevice.h>
+ #include <linux/of.h>
+ #include <linux/of_device.h>
+ #include <linux/of_net.h>
+-#include <linux/io.h>
++#include <linux/platform_device.h>
+ #include <linux/pm_runtime.h>
++#include <linux/sizes.h>
++#include <linux/types.h>
+ 
+ #include "netsec.h"
+ 
+-- 
+2.14.2
+
diff --git a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC b/baseconfig/arm/arm64/CONFIG_SNI_NETSEC
index 2a7609395..c348519ff 100644
--- a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC
+++ b/baseconfig/arm/arm64/CONFIG_SNI_NETSEC
@@ -1 +1 @@
-# CONFIG_SNI_NETSEC is not set
+CONFIG_SNI_NETSEC=m
diff --git a/gitrev b/gitrev
index 7be2dae54..cd311a3df 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-bf2db0b9f5808fa5b78141b68d55ec630bf06313
+529a86e063e9ff625c4ff247d8aa17d8072444fb
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 156e22488..8f666e877 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5388,7 +5388,7 @@ CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
-# CONFIG_SNI_NETSEC is not set
+CONFIG_SNI_NETSEC=m
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 3b61716fa..2576f26e5 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5365,7 +5365,7 @@ CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
-# CONFIG_SNI_NETSEC is not set
+CONFIG_SNI_NETSEC=m
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
diff --git a/kernel.spec b/kernel.spec
index b378fac32..d324e45a5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 4
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -133,7 +133,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -2217,6 +2217,10 @@ fi
 #
 #
 %changelog
+* Tue Oct 10 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc4.git1.1
+- Linux v4.14-rc4-52-g529a86e063e9
+- Reenable debugging options.
+
 * Mon Oct 09 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc4.git0.1
 - Linux v4.14-rc4
 
diff --git a/sources b/sources
index 04ef89cca..9241f38eb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
 SHA512 (patch-4.14-rc4.xz) = 11edc0714c9b7ff34986d1534c490987f5977940afc5b176a424a23e437d572d83f8d689b4505128371bf6d4c5956a2042c9c4d222eb72363b977b69c819b3e3
+SHA512 (patch-4.14-rc4-git1.xz) = 5d48cd3028d1207c2d2df298fcb5b42c83eb3b55641a117506b9d0a90d45c9bea49b6aa46136d8bc0d47914afdb930eca500e9abcf7779e0e6fea6ef8598f499