4.15.12-300.fc27.gnu

5 files changed, 67 insertions, 61 deletions

diff --git a/freed-ora/current/f27/kernel.spec b/freed-ora/current/f27/kernel.spec
index a9033eb1c..080baf3d4 100644
--- a/freed-ora/current/f27/kernel.spec
+++ b/freed-ora/current/f27/kernel.spec
@@ -92,7 +92,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 11
+%define stable_update 12
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -715,9 +715,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
@@ -1501,8 +1498,57 @@ BuildKernel() {
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+    # the full copy of scripts also copies a bunch of binaries which ends
+    # up screwing the debuginfo. It's just easier to remove them.
+    if [ -f scripts/asn1_compiler ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/asn1_compiler
+    fi
+    if [ -f scripts/sign-file ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/sign-file
+    fi
+    if [ -f scripts/extract-cert ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/extract-cert
+    fi
+    if [ -f scripts/pnmtologo ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/pnmtologo
+    fi
+    if [ -f scripts/unifdef ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/unifdef
+    fi
+    if [ -f scripts/sortextable ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/sortextable
+    fi
+    if [ -f scripts/basic/fixdep ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/basic/fixdep
+    fi
+    if [ -f scripts/recordmcount ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/recordmcount
+    fi
+    if [ -f scripts/conmakehash ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/conmakehash
+    fi
+    if [ -f scripts/kallsyms ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/kallsyms
+    fi
+    if [ -f scripts/basic/bin2c ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/basic/bin2c
+    fi
+    if [ -f scripts/mod/mk_elfconfig ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/mod/mk_elfconfig
+    fi
+    if [ -f scripts/mod/modpost ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/mod/modpost
+    fi
+    if [ -f scripts/kconfig/conf ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/kconfig/conf
+    fi
+    if [ -f scripts/selinux/mdp/mdp ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/selinux/mdp/mdp
+    fi
+    if [ -f scripts/selinux/genheaders/genheaders ]; then
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/selinux/genheaders/genheaders
+    fi
     if [ -f tools/objtool/objtool ]; then
-      cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || :
       # these are a few files associated with objtool
       cp -a --parents tools/build/Build.include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
       cp -a --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
@@ -1510,6 +1556,9 @@ BuildKernel() {
       cp -a --parents tools/scripts/utilities.mak $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
       # also more than necessary but it's not that many more files
       cp -a --parents tools/objtool/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+      # these can be rebuilt
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/fixdep
+      rm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/objtool
       cp -a --parents tools/lib/str_error_r.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
       cp -a --parents tools/lib/string.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
       cp -a --parents tools/lib/subcmd/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
@@ -2057,6 +2106,12 @@ fi
 #
 #
 %changelog
+* Wed Mar 21 2018 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 4.15.12-gnu.
+
+* Wed Mar 21 2018 Laura Abbott <labbott@redhat.com> - 4.15.12-300
+- Linux v4.15.12
+
 * Tue Mar 20 2018 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 4.15.11-gnu.
 
diff --git a/freed-ora/current/f27/mmu-ALIGN_DOWN-correct-variable.patch b/freed-ora/current/f27/mmu-ALIGN_DOWN-correct-variable.patch
deleted file mode 100644
index 5ea481a6b..000000000
--- a/freed-ora/current/f27/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/freed-ora/current/f27/patch-4.15-gnu-4.15.11-gnu.xz.sign b/freed-ora/current/f27/patch-4.15-gnu-4.15.11-gnu.xz.sign
deleted file mode 100644
index 09e749c67..000000000
--- a/freed-ora/current/f27/patch-4.15-gnu-4.15.11-gnu.xz.sign
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCWrAj+QAKCRC8t8+Hfn1H
-pxubAJ4zi9sEUb6BfY6MqgpugJh9Fge43QCfTcvkjFWfpufIj3PN72Un59DXGPk=
-=It9t
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/f27/patch-4.15-gnu-4.15.12-gnu.xz.sign b/freed-ora/current/f27/patch-4.15-gnu-4.15.12-gnu.xz.sign
new file mode 100644
index 000000000..5e61b278e
--- /dev/null
+++ b/freed-ora/current/f27/patch-4.15-gnu-4.15.12-gnu.xz.sign
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCWrL6vAAKCRC8t8+Hfn1H
+p6aqAJ9vYN0zjn27I4+B0DtkOoH2NsOA8ACeOIt93vlC5bCawZFl4F/aCt4vyeE=
+=+qwF
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f27/sources b/freed-ora/current/f27/sources
index ca4559d2c..36e738b04 100644
--- a/freed-ora/current/f27/sources
+++ b/freed-ora/current/f27/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-libre-4.15-gnu.tar.xz) = a55cc663c6fb1e1cfa7905282b368b5d5888bc2398f0acf37e5bb9a232ded04fd566b1980e654da26aaec005332e458581495184d6bd4cec669181085d4d78a5
-SHA512 (patch-4.15-gnu-4.15.11-gnu.xz) = 0ee05924956716bbac97d5a3282df6a40c90852615be2a9d22f74984880efc6ce61991c3de4241bc4fbeb5c9d869a1d937518dac8bade257359996c053fcb977
+SHA512 (patch-4.15-gnu-4.15.12-gnu.xz) = da2f0479ddd692e8f4f9279d19535413ee69f3b56cf5e3de0bbbe8b32dcac4799d29554f8ce9098adec9e6569264c9437d5c45bc8655153b05ac1bd7b6913251