diff options
| -rw-r--r-- | libre/linux-libre-pae/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 14 | ||||
| -rw-r--r-- | libre/linux-libre-pae/0002-HID-core-fix-grouping-by-application.patch (renamed from libre/linux-libre-pae/0003-HID-core-fix-grouping-by-application.patch) | 6 | ||||
| -rw-r--r-- | libre/linux-libre-pae/0002-drm-i915-Increase-LSPCON-timeout.patch | 50 | ||||
| -rw-r--r-- | libre/linux-libre-pae/PKGBUILD | 17 | ||||
| -rw-r--r-- | libre/linux-libre-pae/config | 3 |
5 files changed, 18 insertions, 72 deletions
diff --git a/libre/linux-libre-pae/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/libre/linux-libre-pae/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index 785150403..222de64ee 100644 --- a/libre/linux-libre-pae/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/libre/linux-libre-pae/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,7 +1,7 @@ -From 7e7b8d7a0e74d0d4c74abee0334a771458a3ed79 Mon Sep 17 00:00:00 2001 +From 771e964ed3199a0d98bdd644b22039f5b957ddb1 Mon Sep 17 00:00:00 2001 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> @@ -14,7 +14,7 @@ Signed-off-by: Daniel Micay <danielmicay@gmail.com> 3 files changed, 30 insertions(+) diff --git a/kernel/fork.c b/kernel/fork.c -index 1b27babc4c78..a88dd3ccd31c 100644 +index 8ed48ca2cc43..e02823819ab7 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -103,6 +103,11 @@ @@ -29,7 +29,7 @@ index 1b27babc4c78..a88dd3ccd31c 100644 /* * Minimum number of threads to boot the kernel -@@ -1624,6 +1629,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1625,6 +1630,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -40,7 +40,7 @@ index 1b27babc4c78..a88dd3ccd31c 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2420,6 +2429,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2421,6 +2430,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -84,7 +84,7 @@ index 2d9837c0aff4..eb5236c069fc 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index c3d7583fcd21..6ee37e516869 100644 +index e5222b5fb4fe..c941a66e51d1 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -26,6 +26,9 @@ @@ -98,5 +98,5 @@ index c3d7583fcd21..6ee37e516869 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.18.0 +2.19.0 diff --git a/libre/linux-libre-pae/0003-HID-core-fix-grouping-by-application.patch b/libre/linux-libre-pae/0002-HID-core-fix-grouping-by-application.patch index da196890f..633e29c92 100644 --- a/libre/linux-libre-pae/0003-HID-core-fix-grouping-by-application.patch +++ b/libre/linux-libre-pae/0002-HID-core-fix-grouping-by-application.patch @@ -1,7 +1,7 @@ -From 20acb01da9443e3ca814bb5d17f01b3fea754010 Mon Sep 17 00:00:00 2001 +From b4f39f4eba0486807d870ff8fbdb618185131d6c Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires <benjamin.tissoires@redhat.com> Date: Tue, 4 Sep 2018 15:31:14 +0200 -Subject: [PATCH 3/3] HID: core: fix grouping by application +Subject: [PATCH 2/2] HID: core: fix grouping by application commit f07b3c1da92d ("HID: generic: create one input report per application type") was effectively the same as MULTI_INPUT: @@ -77,5 +77,5 @@ index 773bcb1d4044..5482dd6ae9ef 100644 enum hid_type { -- -2.18.0 +2.19.0 diff --git a/libre/linux-libre-pae/0002-drm-i915-Increase-LSPCON-timeout.patch b/libre/linux-libre-pae/0002-drm-i915-Increase-LSPCON-timeout.patch deleted file mode 100644 index 79860decc..000000000 --- a/libre/linux-libre-pae/0002-drm-i915-Increase-LSPCON-timeout.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 01d91bc0dac1c22f60fb6d225dcacc7fa9ae2d56 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fredrik=20Sch=C3=B6n?= <fredrikschon@gmail.com> -Date: Fri, 17 Aug 2018 22:07:28 +0200 -Subject: [PATCH 2/3] drm/i915: Increase LSPCON timeout -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -100 ms is not enough time for the LSPCON adapter on Intel NUC devices to -settle. This causes dropped display modes at boot or screen reconfiguration. -Empirical testing can reproduce the error up to a timeout of 190 ms. Basic -boot and stress testing at 200 ms has not (yet) failed. - -Increase timeout to 400 ms to get some margin of error. - -Changes from v1: -The initial suggestion of 1000 ms was lowered due to concerns about delaying -valid timeout cases. -Update patch metadata. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107503 -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1570392 -Fixes: 357c0ae9198a ("drm/i915/lspcon: Wait for expected LSPCON mode to settle") -Cc: Shashank Sharma <shashank.sharma@intel.com> -Cc: Imre Deak <imre.deak@intel.com> -Cc: Jani Nikula <jani.nikula@intel.com> -Cc: <stable@vger.kernel.org> # v4.11+ -Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> -Signed-off-by: Fredrik Schön <fredrik.schon@gmail.com> -Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> ---- - drivers/gpu/drm/i915/intel_lspcon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c -index 8ae8f42f430a..6b6758419fb3 100644 ---- a/drivers/gpu/drm/i915/intel_lspcon.c -+++ b/drivers/gpu/drm/i915/intel_lspcon.c -@@ -74,7 +74,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon, - DRM_DEBUG_KMS("Waiting for LSPCON mode %s to settle\n", - lspcon_mode_name(mode)); - -- wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 100); -+ wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 400); - if (current_mode != mode) - DRM_ERROR("LSPCON mode hasn't settled\n"); - --- -2.18.0 - diff --git a/libre/linux-libre-pae/PKGBUILD b/libre/linux-libre-pae/PKGBUILD index 355005d19..a8852d7cf 100644 --- a/libre/linux-libre-pae/PKGBUILD +++ b/libre/linux-libre-pae/PKGBUILD @@ -11,7 +11,7 @@ pkgbase=linux-libre-pae _srcbasever=4.18-gnu -_srcver=4.18.7-gnu +_srcver=4.18.8-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -42,8 +42,7 @@ source=( '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch' - '0002-drm-i915-Increase-LSPCON-timeout.patch' - '0003-HID-core-fix-grouping-by-application.patch' + '0002-HID-core-fix-grouping-by-application.patch' ) validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -51,7 +50,7 @@ validpgpkeys=( ) sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471d3063016a4eb3f68d42879e18ee314ab30716116805fee35b5084b23df2a9' 'SKIP' - 'eb6ac128ed56fa9a499e32939d71d2c4f3afa3c064882c34222c6ac23e2ea0f323155a400525e007093ff9313045c677fbc2f9487d42fd4c3b23a09d8454991f' + 'b65d13364a75dfef4b5f6510fda93e1f36bcedc073c7b90ff238ba991d26f666f7bbca4ec24726e09a962af6d78409ad1737a589e2708e24958fc31bcc67c255' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -59,15 +58,14 @@ sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471 'SKIP' '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' 'SKIP' - '86bc1a5e22c57814d04e7f33112a25eedbe41933a17153abfa36fa25a693723e97b6959b4068728e1ea16e1f1ff1498c58e609f7789e47d53a516b6e62f558c3' + '545152bfb17cd3e05a55fccef2df6a8fbd7646a5e441e49b2fddde8b940f1ee8fe7c6d101084663122c98ef5be472c697a6cb43cc82751d0c204894035f28c68' '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - 'd7e50acea0a21dc4c65d0ac093192e02ed995a6110f714b1f8a3c60c44a4d4da09ffbf90bcf20ce2e285b4f58f3972957e30b26c57e233c483ce049177fdfb13' - '15254ce2163c296f4823b3cfea31f68d4d9f0da3cc8c1aff7ec8d6d957fb1f437b39c4b7737056ba86d2405a8a5fd407bd7c2ff6d273089499daac0630b2bf0e' - '559fe854b46bcb4967d01f97dcc98c9c5ea52a3a3fa70ea6b19d78f0c5b19598d058a82e33006b7b6afd54cf7e073c8622d4a59eac24151685b5ec20dad1eace') + 'faac26d1e404628ccad18ad23dd5a56c28cfd194552870fdaf51944c4d60d284329124154786d37458432425d9fd4e3f076f7c079369c9893222d6df9984297b' + 'f257b7ab860650966e71511aa6fa42eb81f8b686ff4a965b8e48eeed6205fb8048e4b93fdca4c5ef41a390ec628c9a806f1c72bfafbf43f21c9ba5e76d7eb01f') _kernelname=${pkgbase#linux-libre} _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") @@ -88,8 +86,7 @@ prepare() { # Arch's linux patches patch -p1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - patch -p1 -i ../0002-drm-i915-Increase-LSPCON-timeout.patch - patch -p1 -i ../0003-HID-core-fix-grouping-by-application.patch + patch -p1 -i ../0002-HID-core-fix-grouping-by-application.patch # maintain the TTY over USB disconnects # http://www.coreboot.org/EHCI_Gadget_Debug diff --git a/libre/linux-libre-pae/config b/libre/linux-libre-pae/config index 46d228009..3d8dfd5c7 100644 --- a/libre/linux-libre-pae/config +++ b/libre/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.7-gnu Kernel Configuration +# Linux/x86 4.18.8-gnu Kernel Configuration # # @@ -608,7 +608,6 @@ CONFIG_ZSMALLOC=y # CONFIG_PGTABLE_MAPPING is not set # CONFIG_ZSMALLOC_STAT is not set CONFIG_GENERIC_EARLY_IOREMAP=y -# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_FRAME_VECTOR=y # CONFIG_PERCPU_STATS is not set |