diff --git a/kernel/kernel/files/patches/linux/patch-4.8.2.xz b/kernel/kernel/files/patches/linux/patch-4.8.2.xz new file mode 100644 index 00000000..b2d91ab1 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-4.8.2.xz differ diff --git a/kernel/kernel/files/patches/mageia/Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch b/kernel/kernel/files/patches/mageia/Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch new file mode 100644 index 00000000..a30f81df --- /dev/null +++ b/kernel/kernel/files/patches/mageia/Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch @@ -0,0 +1,37 @@ +From e461958e7a7eb8df2e022e02f782dff5f60a44d0 Mon Sep 17 00:00:00 2001 +From: Thomas Backlund +Date: Sun, 16 Oct 2016 20:09:27 +0300 +Subject: [PATCH] Revert "include/uapi/linux/atm_zatm.h: include linux/time.h" + +This reverts commit cf00713a655d3019be7faa184402f16c43a0fed3. + +It causes linux-atm build breakage between glibc headers and kernel headers... + +Fixws are in progress upstream as of: +https://patchwork.kernel.org/patch/9294305/ + +But it's not accepted yet so it might still change, and since its uapi +we dont want to expose changes that might never land upstream. + +Reported by: Pascal Terjam +Signed-off-by: Thomas Backlund + +--- + include/uapi/linux/atm_zatm.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/uapi/linux/atm_zatm.h b/include/uapi/linux/atm_zatm.h +index 5cd4d4d..9c9c6ad 100644 +--- a/include/uapi/linux/atm_zatm.h ++++ b/include/uapi/linux/atm_zatm.h +@@ -14,7 +14,6 @@ + + #include + #include +-#include + + #define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) + /* get pool statistics */ +-- +2.10.1 + diff --git a/kernel/kernel/files/patches/mageia/series b/kernel/kernel/files/patches/mageia/series index 2f8c8bf4..1eff6fc4 100644 --- a/kernel/kernel/files/patches/mageia/series +++ b/kernel/kernel/files/patches/mageia/series @@ -357,6 +357,11 @@ video-mageia-logo.patch ### Tools ### +# wipe powerpc refrence so we can nuke dangling symlinks (mga#17676) +tools-testing-selftest-Makefile-remove-powerpc-reference.patch + ### ### UAPI ### +# breaks linux-arm build +Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch diff --git a/kernel/kernel/files/patches/mageia/tools-testing-selftest-Makefile-remove-powerpc-reference.patch b/kernel/kernel/files/patches/mageia/tools-testing-selftest-Makefile-remove-powerpc-reference.patch new file mode 100644 index 00000000..677e97df --- /dev/null +++ b/kernel/kernel/files/patches/mageia/tools-testing-selftest-Makefile-remove-powerpc-reference.patch @@ -0,0 +1,10 @@ +--- linux/tools/testing/selftests/Makefile.orig ++++ linux/tools/testing/selftests/Makefile +@@ -15,7 +15,6 @@ TARGETS += memory-hotplug + TARGETS += mount + TARGETS += mqueue + TARGETS += net +-TARGETS += powerpc + TARGETS += pstore + TARGETS += ptrace + TARGETS += seccomp diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index adecba86..c1c1040a 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -28,8 +28,8 @@ - patches/linux/patch-4.8.1.xz - + patches/linux/patch-4.8.2.xz + patches/mageia/Revert-ipmi-Start-the-timer-and-thread-on-internal-m.patch @@ -129,6 +129,8 @@ patches/mageia/3rd-rtl8723bs.patch patches/mageia/3rd-rtl8723bs-4.7-buildfix.patch patches/mageia/3rd-rtl8723bs-4.8-buildfix.patch + patches/mageia/tools-testing-selftest-Makefile-remove-powerpc-reference.patch + patches/mageia/Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch @@ -185,8 +187,8 @@ - 2016-10-14 - 4.8.1 + 2016-10-18 + 4.8.2 Version Bump. security