Linux v4.16-rc1-10-g178e834c47b0

4 files changed, 8 insertions, 84 deletions

diff --git a/arm-sun4i_ss_prng-fixes.patch b/arm-sun4i_ss_prng-fixes.patch
deleted file mode 100644
index ed4cc0369..000000000
--- a/arm-sun4i_ss_prng-fixes.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From patchwork Tue Feb  6 21:20:21 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [1/2] sun4i_ss_prng: fix return value of sun4i_ss_prng_generate
-From: Artem Savkov <artem.savkov@gmail.com>
-X-Patchwork-Id: 10204151
-Message-Id: <20180206212022.1309-2-artem.savkov@gmail.com>
-To: Corentin Labbe <clabbe.montjoie@gmail.com>
-Cc: linux-kernel@vger.kernel.org, Artem Savkov <artem.savkov@gmail.com>,
- Herbert Xu <herbert@gondor.apana.org.au>,
- linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org
-Date: Tue,  6 Feb 2018 22:20:21 +0100
-
-According to crypto/rng.h generate function should return 0 on success
-and < 0 on error.
-
-Fixes: b8ae5c7387ad ("crypto: sun4i-ss - support the Security System PRNG")
-Signed-off-by: Artem Savkov <artem.savkov@gmail.com>
-Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com>
----
- drivers/crypto/sunxi-ss/sun4i-ss-prng.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-prng.c b/drivers/crypto/sunxi-ss/sun4i-ss-prng.c
-index 0d01d1624252..5754e0b92fb0 100644
---- a/drivers/crypto/sunxi-ss/sun4i-ss-prng.c
-+++ b/drivers/crypto/sunxi-ss/sun4i-ss-prng.c
-@@ -52,5 +52,5 @@ int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
- 
- 	writel(0, ss->base + SS_CTL);
- 	spin_unlock(&ss->slock);
--	return dlen;
-+	return 0;
- }
-From patchwork Tue Feb  6 21:20:22 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [2/2] sun4i_ss_prng: convert lock to _bh in sun4i_ss_prng_generate
-From: Artem Savkov <artem.savkov@gmail.com>
-X-Patchwork-Id: 10204145
-Message-Id: <20180206212022.1309-3-artem.savkov@gmail.com>
-To: Corentin Labbe <clabbe.montjoie@gmail.com>
-Cc: linux-kernel@vger.kernel.org, Artem Savkov <artem.savkov@gmail.com>,
- Herbert Xu <herbert@gondor.apana.org.au>,
- linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org
-Date: Tue,  6 Feb 2018 22:20:22 +0100
-
-Lockdep detects a possible deadlock in sun4i_ss_prng_generate() and
-throws an "inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage" warning.
-Disabling softirqs to fix this.
-
-Fixes: b8ae5c7387ad ("crypto: sun4i-ss - support the Security System PRNG")
-Signed-off-by: Artem Savkov <artem.savkov@gmail.com>
----
- drivers/crypto/sunxi-ss/sun4i-ss-prng.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-prng.c b/drivers/crypto/sunxi-ss/sun4i-ss-prng.c
-index 5754e0b92fb0..63d636424161 100644
---- a/drivers/crypto/sunxi-ss/sun4i-ss-prng.c
-+++ b/drivers/crypto/sunxi-ss/sun4i-ss-prng.c
-@@ -28,7 +28,7 @@ int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
- 	algt = container_of(alg, struct sun4i_ss_alg_template, alg.rng);
- 	ss = algt->ss;
- 
--	spin_lock(&ss->slock);
-+	spin_lock_bh(&ss->slock);
- 
- 	writel(mode, ss->base + SS_CTL);
- 
-@@ -51,6 +51,6 @@ int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
- 	}
- 
- 	writel(0, ss->base + SS_CTL);
--	spin_unlock(&ss->slock);
-+	spin_unlock_bh(&ss->slock);
- 	return 0;
- }
diff --git a/gitrev b/gitrev
index 6411debef..a6bb49169 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-7928b2cbe55b2a410a0f5c1f154610059c57b1b2
+178e834c47b0d01352c48730235aae69898fbc02
diff --git a/kernel.spec b/kernel.spec
index ff5c2eebc..a3dd646da 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 1
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -124,7 +124,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
 
 %if %{with_verbose}
 %define make_opts V=1
@@ -594,7 +594,6 @@ Patch308: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe
 Patch311: arm-clk-bcm2835-hdmi-fixes.patch
 
 # https://www.spinics.net/lists/arm-kernel/msg632925.html
-Patch312: arm-sun4i_ss_prng-fixes.patch
 Patch313: arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch
 
 # 400 - IBM (ppc/s390x) patches
@@ -1871,6 +1870,10 @@ fi
 #
 #
 %changelog
+* Tue Feb 13 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.16.0-0.rc1.git1.1
+- Linux v4.16-rc1-10-g178e834c47b0
+- Reenable debugging options.
+
 * Mon Feb 12 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.16.0-0.rc1.git0.1
 - Linux v4.16-rc1
 
diff --git a/sources b/sources
index a26ce45b2..5c64e668f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
 SHA512 (patch-4.16-rc1.xz) = bedbdd6d8e08734083b03ef453e4f46b17016a936ebbd0a1908df7b5a3bdcfc0990d35f4dff83fd83008e4dfe326ccc9f406080cd8818c2d24e20eadaf37598b
+SHA512 (patch-4.16-rc1-git1.xz) = 2a9f1f728bc1440e13692ad88f45e7f02e9291ddaf30cac3eb54fe57a7a8b700160247ee84937093f9f8e9549df5fdd92f491450347375648a514af42838eabc