Merge remote-tracking branch 'origin/f27' into f27-user-thl-vanilla-fedora

3 files changed, 4 insertions, 53 deletions

diff --git a/kernel.spec b/kernel.spec
index ade81bb08..bdc80663e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -687,9 +687,6 @@ Patch662: mm-khugepaged-Convert-VM_BUG_ON-to-collapse-fail.patch
 # CVE-2017-18232 rhbz 1558066 1558067
 Patch663: 0001-scsi-libsas-direct-call-probe-and-destruct.patch
 
-# rhbz 1547037
-Patch664: mmu-ALIGN_DOWN-correct-variable.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2023,6 +2020,9 @@ fi
 #
 #
 %changelog
+* Wed Mar 21 2018 Laura Abbott <labbott@redhat.com> - 4.15.12-300
+- Linux v4.15.12
+
 * Mon Mar 19 2018 Laura Abbott <labbott@redhat.com> - 4.15.11-300
 - Linux v4.15.11
 
diff --git a/mmu-ALIGN_DOWN-correct-variable.patch b/mmu-ALIGN_DOWN-correct-variable.patch
deleted file mode 100644
index 5ea481a6b..000000000
--- a/mmu-ALIGN_DOWN-correct-variable.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 73422d1684caa09afe011cc404477836b537ac6b Mon Sep 17 00:00:00 2001
-From: Maris Nartiss <maris.nartiss@gmail.com>
-Date: Mon, 19 Mar 2018 09:55:07 -0700
-Subject: [PATCH] mmu: ALIGN_DOWN correct variable
-
-Commit 7110c89bb8852ff8b0f88ce05b332b3fe22bd11e ("mmu: swap out round
-for ALIGN") replaced two calls to round/rounddown with ALIGN/ALIGN_DOWN,
-but erroneously applied ALIGN_DOWN to a different variable (addr) and left
-intended variable (tail) not rounded/ALIGNed.
-
-As a result screen corruption, X lockups are observable. An example of kernel
-log of affected system with NV98 card where it was bisected:
-
-nouveau 0000:01:00.0: gr: TRAP_M2MF 00000002 [IN]
-nouveau 0000:01:00.0: gr: TRAP_M2MF 00320951 400007c0 00000000 04000000
-nouveau 0000:01:00.0: gr: 00200000 [] ch 1 [000fbbe000 DRM] subc 4 class 5039
-mthd 0100 data 00000000
-nouveau 0000:01:00.0: fb: trapped read at 0040000000 on channel 1
-[0fbbe000 DRM]
-engine 00 [PGRAPH] client 03 [DISPATCH] subclient 04 [M2M_IN] reason 00000006
-[NULL_DMAOBJ]
-
-Fixes bug 105173 ("[MCP79][Regression] Unhandled NULL pointer dereference in
-nvkm_object_unmap since kernel 4.15")
-https://bugs.freedesktop.org/show_bug.cgi?id=105173
-
-Fixes: 7110c89bb885 ("mmu: swap out round for ALIGN ")
-Tested-by: Pierre Moreau <pierre.morrow@free.fr>
-Reviewed-by: Pierre Moreau <pierre.morrow@free.fr>
----
- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
-index e35d3e17cd7c..c6e3d0dd1070 100644
---- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
-@@ -1354,7 +1354,7 @@ nvkm_vmm_get_locked(struct nvkm_vmm *vmm, bool getref, bool mapref, bool sparse,
- 
- 		tail = this->addr + this->size;
- 		if (vmm->func->page_block && next && next->page != p)
--			tail = ALIGN_DOWN(addr, vmm->func->page_block);
-+			tail = ALIGN_DOWN(tail, vmm->func->page_block);
- 
- 		if (addr <= tail && tail - addr >= size) {
- 			rb_erase(&this->tree, &vmm->free);
--- 
-2.14.3
-
diff --git a/sources b/sources
index 212d05b86..e444414f1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
-SHA512 (patch-4.15.11.xz) = 6d809fdf66accfbd35db25aac230d11fb55ba5ac019a7314c67937eaf9b5a49b134bc3e36685eaf7b0605dab9a54a82da62eb1e08048c1c3a3c980fcc142dfe2
+SHA512 (patch-4.15.12.xz) = 5f6f43a8ac40346a88c27886e1aab1266efc7de0f1994c7bee42e8501697123c3f7217be2368c2addd2d63ab357bc426d9eab568252659341c0c9327b9179ff1