diff --git a/arm-sun4i_ss_prng-fixes.patch b/arm-sun4i_ss_prng-fixes.patch deleted file mode 100644 index ed4cc03..0000000 --- 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 -X-Patchwork-Id: 10204151 -Message-Id: <20180206212022.1309-2-artem.savkov@gmail.com> -To: Corentin Labbe -Cc: linux-kernel@vger.kernel.org, Artem Savkov , - Herbert Xu , - 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 -Acked-by: Corentin Labbe ---- - 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 -X-Patchwork-Id: 10204145 -Message-Id: <20180206212022.1309-3-artem.savkov@gmail.com> -To: Corentin Labbe -Cc: linux-kernel@vger.kernel.org, Artem Savkov , - Herbert Xu , - 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 ---- - 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/dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch b/dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch deleted file mode 100644 index 6e40c3d..0000000 --- a/dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch +++ /dev/null @@ -1,62 +0,0 @@ -From patchwork Mon Jan 22 20:00:03 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: dma-buf: fix reservation_object_wait_timeout_rcu once more v2 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= -X-Patchwork-Id: 199865 -Message-Id: <20180122200003.6665-1-christian.koenig@amd.com> -To: dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk, lyude@redhat.com -Date: Mon, 22 Jan 2018 21:00:03 +0100 - -We need to set shared_count even if we already have a fence to wait for. - -v2: init i to -1 as well - -Signed-off-by: Christian König -Cc: stable@vger.kernel.org -Tested-by: Lyude Paul -Reviewed-by: Lyude Paul -Reviewed-by: Chris Wilson ---- - drivers/dma-buf/reservation.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c -index 461afa9febd4..314eb1071cce 100644 ---- a/drivers/dma-buf/reservation.c -+++ b/drivers/dma-buf/reservation.c -@@ -484,13 +484,15 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj, - unsigned long timeout) - { - struct dma_fence *fence; -- unsigned seq, shared_count, i = 0; -+ unsigned seq, shared_count; - long ret = timeout ? timeout : 1; -+ int i; - - retry: - shared_count = 0; - seq = read_seqcount_begin(&obj->seq); - rcu_read_lock(); -+ i = -1; - - fence = rcu_dereference(obj->fence_excl); - if (fence && !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { -@@ -506,14 +508,14 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj, - fence = NULL; - } - -- if (!fence && wait_all) { -+ if (wait_all) { - struct reservation_object_list *fobj = - rcu_dereference(obj->fence); - - if (fobj) - shared_count = fobj->shared_count; - -- for (i = 0; i < shared_count; ++i) { -+ for (i = 0; !fence && i < shared_count; ++i) { - struct dma_fence *lfence = rcu_dereference(fobj->shared[i]); - - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, diff --git a/kernel.spec b/kernel.spec index 6f8d5c7..f1fafc7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 4 +%define stable_update 5 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -601,7 +601,6 @@ Patch310: arm-imx6-cpufreq-fix-loading.patch 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 # In 4.16 @@ -651,9 +650,6 @@ Patch638: 0003-ahci-Allow-setting-a-default-LPM-policy-for-mobile-c.patch # rhbz1514969, submitted upstream Patch640: 0001-platform-x86-dell-laptop-Filter-out-spurious-keyboar.patch -# Fix crash on Xwayland using nouveau -Patch650: dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch - # https://bugzilla.kernel.org/show_bug.cgi?id=198351 Patch652: iwlwifi-mvn.patch @@ -1926,6 +1922,9 @@ fi # # %changelog +* Fri Feb 23 2018 Laura Abbott - 4.15.5-300 +- Linux v4.15.5 + * Mon Feb 19 2018 Laura Abbott - 4.15.4-300 - Linux v4.15.4 diff --git a/sources b/sources index b0964ba..8805bbd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea -SHA512 (patch-4.15.4.xz) = e903b02631f5fa261db44ea2da69b6edc3afbbbbb4da5eca6abf2972b9f5aeb032d6b4b22c1313eef7763bc91987ec793b05c00c04a0ec592f61cb5a82cea296 +SHA512 (patch-4.15.5.xz) = a2f3777a694e27847dfc04178d2ef2721cf30bd6036c2738964403b78d6979ff885cbf2a569716ff7e0585399490731bb7a47f7cfdf4bb7f3a62e80fe1329061