4.15.5-200.fc26.gnu

4 files changed, 16 insertions, 68 deletions

diff --git a/freed-ora/current/f26/dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch b/freed-ora/current/f26/dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch
deleted file mode 100644
index 6e40c3da3..000000000
--- a/freed-ora/current/f26/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?= <ckoenig.leichtzumerken@gmail.com>
-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 <christian.koenig@amd.com>
-Cc: stable@vger.kernel.org
-Tested-by: Lyude Paul <lyude@redhat.com>
-Reviewed-by: Lyude Paul <lyude@redhat.com>
-Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
----
- 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/freed-ora/current/f26/kernel.spec b/freed-ora/current/f26/kernel.spec
index 86cf737c3..63243d265 100644
--- a/freed-ora/current/f26/kernel.spec
+++ b/freed-ora/current/f26/kernel.spec
@@ -58,7 +58,7 @@ Summary: The Linux kernel
 %define basegnu -gnu%{?librev}
 
 # To be inserted between "patch" and "-4.".
-#define stablelibre -4.15%{?stablegnux}
+%define stablelibre -4.15%{?stablegnux}
 #define rcrevlibre  -4.15%{?rcrevgnux}
 #define gitrevlibre -4.15%{?gitrevgnux}
 
@@ -92,7 +92,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}
@@ -669,9 +669,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
 
@@ -2025,6 +2022,12 @@ fi
 #
 #
 %changelog
+* Fri Feb 23 2018 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 4.15.5-gnu.
+
+* Fri Feb 23 2018 Laura Abbott <labbott@redhat.com> - 4.15.5-200
+- Linux v4.15.5
+
 * Mon Feb 19 2018 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 4.15.4-gnu.
 
diff --git a/freed-ora/current/f26/patch-4.15-gnu-4.15.5-gnu.xz.sign b/freed-ora/current/f26/patch-4.15-gnu-4.15.5-gnu.xz.sign
new file mode 100644
index 000000000..b6545f111
--- /dev/null
+++ b/freed-ora/current/f26/patch-4.15-gnu-4.15.5-gnu.xz.sign
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCWpCA1wAKCRC8t8+Hfn1H
+p4pTAJsEb+pGiBmbDUFmqwdYsYprtrBnFQCaA0FQYT5E4+vBGwa/ixW5UA9E0uY=
+=ThEk
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f26/sources b/freed-ora/current/f26/sources
index 1137091e3..16e6e8b36 100644
--- a/freed-ora/current/f26/sources
+++ b/freed-ora/current/f26/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-libre-4.15-gnu.tar.xz) = a55cc663c6fb1e1cfa7905282b368b5d5888bc2398f0acf37e5bb9a232ded04fd566b1980e654da26aaec005332e458581495184d6bd4cec669181085d4d78a5
-SHA512 (patch-4.15.4.xz) = e903b02631f5fa261db44ea2da69b6edc3afbbbbb4da5eca6abf2972b9f5aeb032d6b4b22c1313eef7763bc91987ec793b05c00c04a0ec592f61cb5a82cea296
+SHA512 (patch-4.15.5.xz) = a2f3777a694e27847dfc04178d2ef2721cf30bd6036c2738964403b78d6979ff885cbf2a569716ff7e0585399490731bb7a47f7cfdf4bb7f3a62e80fe1329061
+SHA512 (patch-4.15-gnu-4.15.5-gnu.xz) = c98d408a45aae4134a58af7971bfc3aabe271477a2cfb18a1ae5e0649927329c96142268c10c9a852289e5dfe189eb3e06eef559c3cedcddcadb956a969d612a