diff options
author | graysky | 2018-06-22 15:17:31 -0400 |
---|---|---|
committer | graysky | 2018-06-22 15:17:31 -0400 |
commit | 157da94dcf43e4f5a5ed329975635a8275088cc2 (patch) | |
tree | 1ed0b8dbef76840da7b6af8487698fbc064ce406 | |
parent | 2ebec87de86e6571eeb98444594d40fc9a352a2a (diff) | |
download | aur-157da94dcf43e4f5a5ed329975635a8275088cc2.tar.gz |
Update to 4.16.17-1
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 2 | ||||
-rw-r--r-- | 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch | 125 | ||||
-rw-r--r-- | 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch (renamed from 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch) | 2 | ||||
-rw-r--r-- | PKGBUILD | 13 |
5 files changed, 10 insertions, 142 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Fri Jun 22 18:40:02 UTC 2018 +# Fri Jun 22 19:17:31 UTC 2018 pkgbase = linux-ck pkgver = 4.16.17 pkgrel = 1 @@ -22,8 +22,7 @@ pkgbase = linux-ck source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz source = http://ck.kolivas.org/patches/4.0/4.16/4.16-ck1/patch-4.16-ck1.xz source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - source = 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch - source = 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch + source = 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 sha256sums = SKIP sha256sums = 13f658fe58d3255d2e63fd236d90a2a1603fb5ab68b4a3ca7249b99033cb1d75 @@ -34,9 +33,8 @@ pkgbase = linux-ck sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d sha256sums = 61cd4b129eac475ad82fcdbbf9952b80e81e7c893776c00e3b6a658b950d0b26 - sha256sums = 8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd - sha256sums = 2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446 - sha256sums = 8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e + sha256sums = e397e2fcdcee9fc132728e984a82542be1810adc91bb20a7e07ca0925b69b108 + sha256sums = 871900a3e918a5d52588af691f9eded0897ac4a7c97dcc66f4a0bca7af37c07e pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.171 diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index 3dd9a7d7039e..0865b352bd53 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -2,7 +2,7 @@ From ee91df95bf010fad44be5d2564e7d40038987f19 Mon Sep 17 00:00:00 2001 Message-Id: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> From: Serge Hallyn <serge.hallyn@canonical.com> Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> diff --git a/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch b/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch deleted file mode 100644 index ecd2d721d1c1..000000000000 --- a/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch +++ /dev/null @@ -1,125 +0,0 @@ -From f593e0bde601ff2b4f84b7363e4dfcbbda652e6d Mon Sep 17 00:00:00 2001 -Message-Id: <f593e0bde601ff2b4f84b7363e4dfcbbda652e6d.1527290717.git.jan.steffens@gmail.com> -In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> -References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> -From: Mika Westerberg <mika.westerberg@linux.intel.com> -Date: Mon, 23 Apr 2018 14:16:03 +0300 -Subject: [PATCH 2/3] ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 - -WDAT table on Lenovo Z50-70 is using RTC SRAM (ports 0x70 and 0x71) to -store state of the timer. This conflicts with Linux RTC driver -(rtc-cmos.c) who fails to reserve those ports for itself preventing RTC -from functioning. In addition the WDAT table seems not to be fully -functional because it does not reset the system when the watchdog times -out. - -On this system iTCO_wdt works just fine so we simply prefer to use it -instead of WDAT. This makes RTC working again and also results working -watchdog via iTCO_wdt. - -Reported-by: Peter Milley <pbmilley@gmail.com> -Link: https://bugzilla.kernel.org/show_bug.cgi?id=199033 -Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> -Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> ---- - drivers/acpi/acpi_watchdog.c | 59 ++++++++++++++++++++++++++++++------ - 1 file changed, 49 insertions(+), 10 deletions(-) - -diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c -index ebb626ffb5fa..4bde16fb97d8 100644 ---- a/drivers/acpi/acpi_watchdog.c -+++ b/drivers/acpi/acpi_watchdog.c -@@ -12,41 +12,80 @@ - #define pr_fmt(fmt) "ACPI: watchdog: " fmt - - #include <linux/acpi.h> -+#include <linux/dmi.h> - #include <linux/ioport.h> - #include <linux/platform_device.h> - - #include "internal.h" - -+static const struct dmi_system_id acpi_watchdog_skip[] = { -+ { -+ /* -+ * On Lenovo Z50-70 there are two issues with the WDAT -+ * table. First some of the instructions use RTC SRAM -+ * to store persistent information. This does not work well -+ * with Linux RTC driver. Second, more important thing is -+ * that the instructions do not actually reset the system. -+ * -+ * On this particular system iTCO_wdt seems to work just -+ * fine so we prefer that over WDAT for now. -+ * -+ * See also https://bugzilla.kernel.org/show_bug.cgi?id=199033. -+ */ -+ .ident = "Lenovo Z50-70", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "20354"), -+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Z50-70"), -+ }, -+ }, -+ {} -+}; -+ -+static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void) -+{ -+ const struct acpi_table_wdat *wdat = NULL; -+ acpi_status status; -+ -+ if (acpi_disabled) -+ return NULL; -+ -+ if (dmi_check_system(acpi_watchdog_skip)) -+ return NULL; -+ -+ status = acpi_get_table(ACPI_SIG_WDAT, 0, -+ (struct acpi_table_header **)&wdat); -+ if (ACPI_FAILURE(status)) { -+ /* It is fine if there is no WDAT */ -+ return NULL; -+ } -+ -+ return wdat; -+} -+ - /** - * Returns true if this system should prefer ACPI based watchdog instead of - * the native one (which are typically the same hardware). - */ - bool acpi_has_watchdog(void) - { -- struct acpi_table_header hdr; -- -- if (acpi_disabled) -- return false; -- -- return ACPI_SUCCESS(acpi_get_table_header(ACPI_SIG_WDAT, 0, &hdr)); -+ return !!acpi_watchdog_get_wdat(); - } - EXPORT_SYMBOL_GPL(acpi_has_watchdog); - - void __init acpi_watchdog_init(void) - { - const struct acpi_wdat_entry *entries; - const struct acpi_table_wdat *wdat; - struct list_head resource_list; - struct resource_entry *rentry; - struct platform_device *pdev; - struct resource *resources; - size_t nresources = 0; -- acpi_status status; - int i; - -- status = acpi_get_table(ACPI_SIG_WDAT, 0, -- (struct acpi_table_header **)&wdat); -- if (ACPI_FAILURE(status)) { -+ wdat = acpi_watchdog_get_wdat(); -+ if (!wdat) { - /* It is fine if there is no WDAT */ - return; - } --- -2.17.0 - diff --git a/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch index 78f97b2ddb3e..f24b2ebbbccd 100644 --- a/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch +++ b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch @@ -4,7 +4,7 @@ In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffe References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> From: Jani Nikula <jani.nikula@intel.com> Date: Wed, 16 May 2018 11:01:10 +0300 -Subject: [PATCH 3/3] Revert "drm/i915/edp: Allow alternate fixed mode for eDP +Subject: [PATCH 2/2] Revert "drm/i915/edp: Allow alternate fixed mode for eDP if available." This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e. @@ -87,8 +87,7 @@ source=( "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" # enable_additional_cpu_optimizations_for_gcc "http://ck.kolivas.org/patches/4.0/4.16/4.16-ck${_ckpatchversion}/${_ckpatchname}.xz" 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch - 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch + 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -104,9 +103,8 @@ sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' '61cd4b129eac475ad82fcdbbf9952b80e81e7c893776c00e3b6a658b950d0b26' - '8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd' - '2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446' - '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e') + 'e397e2fcdcee9fc132728e984a82542be1810adc91bb20a7e07ca0925b69b108' + '871900a3e918a5d52588af691f9eded0897ac4a7c97dcc66f4a0bca7af37c07e') _kernelname=${pkgbase#linux} : ${_kernelname:=-ARCH} @@ -123,11 +121,8 @@ prepare() { # disable USER_NS for non-root users by default patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - # https://bugs.archlinux.org/task/56780 - patch -Np1 -i ../0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch - # https://bugs.archlinux.org/task/56711 - patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch + patch -Np1 -i ../0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch # fix naming schema in EXTRAVERSION of ck patch set sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../${_ckpatchname}" |