diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 6 | ||||
| -rw-r--r-- | 0002-drm-i915-Increase-LSPCON-timeout.patch | 50 | ||||
| -rw-r--r-- | 0003-HID-core-fix-grouping-by-application.patch | 4 | ||||
| -rw-r--r-- | PKGBUILD | 33 | ||||
| -rw-r--r-- | config | 16 |
6 files changed, 45 insertions, 88 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Sat Sep 8 06:02:10 UTC 2018 +# Thu Sep 13 19:05:28 UTC 2018 pkgbase = linux-rc - pkgver = 4.18.7rc1 + pkgver = 4.18.8rc1 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -11,28 +11,26 @@ pkgbase = linux-rc makedepends = bc makedepends = libelf options = !strip - source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.6.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.6.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.18.7-rc1.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.18.7-rc1.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.7.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.7.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.18.8-rc1.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.18.8-rc1.sign source = config source = 60-linux.hook source = 90-linux.hook source = linux.preset source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - source = 0002-drm-i915-Increase-LSPCON-timeout.patch source = 0003-HID-core-fix-grouping-by-application.patch - sha256sums = 05db97fd6891217af6d4203bdc442ef2af78d7902b6a8e9bd348682704c22894 + sha256sums = f03b425e262a71e5079736706233a4e9afaf77c8462b552b4d6db2d33f5af731 sha256sums = SKIP - sha256sums = 270e6a2e468d334cf635eb1411659bf7a642a4437466dadf95a61de206958553 + sha256sums = 14bcc539c706dcd008cf7b72c6b537d3c63587ce56720692ca15195085f134a5 sha256sums = SKIP - sha256sums = 83d768f19193f6795b8159d81c6775b9f62f4994f2a0d8371ac243e7b0890db8 + sha256sums = da713ca0f1f3b2207e84b3c0ddd1fb00530413dd0987ef5165852b9c889b1024 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 - sha256sums = 88ebd373a61446b0b157d8493807ee7058d288cd480a48fbc156ca5c5422d203 - sha256sums = 656da605ca5dad52dcf638d6d2c79d9bdaa48a3e3ea984dc6025da7bac8ded1d - sha256sums = 19a3463bce0e0bf23bdd890deffe35bab8e0ce1eb999e23fe6f756ebc87b5059 + sha256sums = b014187b6b9d3078c45b7c09b1ba1ccb315d69d73ccd4f59dc26fcbc50155409 + sha256sums = dbd2603d608b74b920350a62279060b77fe6756e3913cec7c739a4106048a1ad pkgname = linux-rc pkgdesc = The release candidate kernel and modules 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 8c5e92793445..3d7840b91e11 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,4 +1,4 @@ -From 7e7b8d7a0e74d0d4c74abee0334a771458a3ed79 Mon Sep 17 00:00:00 2001 +From 288a921a8658bb478fe3c16120529fcd20f6d5d0 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/4] add sysctl to disallow unprivileged CLONE_NEWUSER by @@ -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/0002-drm-i915-Increase-LSPCON-timeout.patch b/0002-drm-i915-Increase-LSPCON-timeout.patch deleted file mode 100644 index ce28562a17a0..000000000000 --- a/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/4] 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/0003-HID-core-fix-grouping-by-application.patch b/0003-HID-core-fix-grouping-by-application.patch index fb9cb72d6df2..a1ecf420b779 100644 --- a/0003-HID-core-fix-grouping-by-application.patch +++ b/0003-HID-core-fix-grouping-by-application.patch @@ -1,4 +1,4 @@ -From 20acb01da9443e3ca814bb5d17f01b3fea754010 Mon Sep 17 00:00:00 2001 +From 2f2c07d184241b9f133ebe4498575a9f8cda6d1e 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/4] HID: core: fix grouping by application @@ -77,5 +77,5 @@ index 773bcb1d4044..5482dd6ae9ef 100644 enum hid_type { -- -2.18.0 +2.19.0 @@ -5,8 +5,8 @@ pkgbase=linux-rc pkgrel=1 _srcname=linux-4.18 -_stable=4.18.6 -_patchver=4.18.7 +_stable=4.18.7 +_patchver=4.18.8 _rcver=1 pkgver=${_patchver}rc${_rcver} _rcpatch=patch-${_patchver}-rc${_rcver} @@ -23,24 +23,23 @@ source=( 90-linux.hook # pacman hook for initramfs regeneration linux.preset # standard config files for mkinitcpio ramdisk 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 + # the 0004 patch is not needed for rc1 builds ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('05db97fd6891217af6d4203bdc442ef2af78d7902b6a8e9bd348682704c22894' +sha256sums=('f03b425e262a71e5079736706233a4e9afaf77c8462b552b4d6db2d33f5af731' 'SKIP' - '270e6a2e468d334cf635eb1411659bf7a642a4437466dadf95a61de206958553' + '14bcc539c706dcd008cf7b72c6b537d3c63587ce56720692ca15195085f134a5' 'SKIP' - '83d768f19193f6795b8159d81c6775b9f62f4994f2a0d8371ac243e7b0890db8' + 'da713ca0f1f3b2207e84b3c0ddd1fb00530413dd0987ef5165852b9c889b1024' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '88ebd373a61446b0b157d8493807ee7058d288cd480a48fbc156ca5c5422d203' - '656da605ca5dad52dcf638d6d2c79d9bdaa48a3e3ea984dc6025da7bac8ded1d' - '19a3463bce0e0bf23bdd890deffe35bab8e0ce1eb999e23fe6f756ebc87b5059') + 'b014187b6b9d3078c45b7c09b1ba1ccb315d69d73ccd4f59dc26fcbc50155409' + 'dbd2603d608b74b920350a62279060b77fe6756e3913cec7c739a4106048a1ad') _kernelname=${pkgbase#linux} @@ -52,6 +51,14 @@ prepare() { echo "-$pkgrel" > localversion.10-pkgrel echo "$_kernelname" > localversion.20-pkgname + msg2 "Applying rc patches..." + # add upstream patch + # ONLY comment out for initial rc (ie 4.10 --> 4.10.1rc1) -- needed for all others + #patch -p1 -i "$srcdir/patch-${_stable}" + + # add rc patch + patch -p1 -i "$srcdir/$_rcpatch" + local src for src in "${source[@]}"; do src="${src%%::*}" @@ -64,14 +71,6 @@ prepare() { msg2 "Setting config..." cp ../config .config - msg2 "Applying rc patches..." - # add upstream patch - # ONLY comment out for initial rc (ie 4.10 --> 4.10.1rc1) -- needed for all others - #patch -p1 -i "$srcdir/patch-${_stable}" - - # add rc patch - patch -p1 -i "$srcdir/$_rcpatch" - # get kernel version make prepare @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.5-arch1 Kernel Configuration +# Linux/x86 4.18.7-arch1 Kernel Configuration # # @@ -319,6 +319,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -380,7 +381,15 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_SIG=y +# CONFIG_MODULE_SIG_FORCE is not set +CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set +# CONFIG_MODULE_SIG_SHA224 is not set +# CONFIG_MODULE_SIG_SHA256 is not set +# CONFIG_MODULE_SIG_SHA384 is not set +CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_HASH="sha512" CONFIG_MODULE_COMPRESS=y # CONFIG_MODULE_COMPRESS_GZIP is not set CONFIG_MODULE_COMPRESS_XZ=y @@ -9387,7 +9396,7 @@ CONFIG_CRYPTO_SHA1_MB=m CONFIG_CRYPTO_SHA256_MB=m CONFIG_CRYPTO_SHA512_MB=m CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_TGR192=m @@ -9495,6 +9504,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y # # Certificates for signature checking # +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set |