From f9213745c78d526cd61acb407a394928870159cc Mon Sep 17 00:00:00 2001 From: Mark Weiman Date: Sun, 25 Mar 2018 13:34:23 -0400 Subject: [PATCH] Update to 4.15.12-1 --- .SRCINFO | 16 ++++----- ...sallow-unprivileged-CLONE_NEWUSER-by.patch | 6 ++-- ...y-use-the-alternate-fixed-mode-if-it.patch | 12 +++---- 90-linux.hook | 2 +- PKGBUILD | 33 +++++++++---------- linux.preset | 2 +- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4a1aa1a..a2766a6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = linux-vfio - pkgver = 4.15.10 + pkgver = 4.15.12 pkgrel = 1 url = http://www.kernel.org/ arch = x86_64 @@ -13,8 +13,8 @@ pkgbase = linux-vfio options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.10.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.10.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.12.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.12.sign source = config source = 60-linux.hook source = 90-linux.hook @@ -27,16 +27,16 @@ pkgbase = linux-vfio validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 sha256sums = SKIP - sha256sums = bbc4e9dc11c15493bd74bf1aae76741ea0e170bc3a07ba9489048bdc9ff85671 + sha256sums = 74d2ac2ea103c907213223fd4ff710ad53e1d8a2d612db18e10d3dda9f1a6b79 sha256sums = SKIP sha256sums = f38927db126ec7141ea2dd70cabb2ef378552672b31db4ab621493928497abd7 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 - sha256sums = 8f407ad5ff6eff106562ba001c36a281134ac9aa468a596aea660a4fe1fd60b5 - sha256sums = 99d0102c8065793096b8ea2ccc01c41fa3dcb96855f9f6f2c583b2372208c6f9 + sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 + sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 1a4a992199d4d70f7f35735f63a634bb605c2b594b7352ad5fd54512737d2784 sha256sums = 7cb4a5da6bf551dbb2db2e0b4e4d0774ee98cc30d9e617e030b27e6cba3e6293 - sha256sums = 7b7363b53c68f52b119df994c9c08d4f29271b408f021366ab23f862518bd9bc - sha256sums = ac996455cddccc312d93e63845d92b2d8ab8fb53208a221948d28c76c678d215 + sha256sums = 4ffdc2a458845c2a7c03c735477dbf51b5b01b10568bf577b37a29e872135cab + sha256sums = 12b281dc45f1954cc3f52276927bb2965c3132c0a8bd7f485869ced2c541d485 pkgname = linux-vfio pkgdesc = The Linux-vfio 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 a92ee30..b39ed26 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,5 +1,5 @@ -From 4aefcc4253233dce6ac5938e01371074958b8f1c Mon Sep 17 00:00:00 2001 -Message-Id: <4aefcc4253233dce6ac5938e01371074958b8f1c.1517188106.git.jan.steffens@gmail.com> +From 188720e92122385994143a06cb16a930053eb503 Mon Sep 17 00:00:00 2001 +Message-Id: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com> From: Serge Hallyn Date: Fri, 31 May 2013 19:12:12 +0100 Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by @@ -99,5 +99,5 @@ index 246d4d4ce5c7..f64432b45cec 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.16.1 +2.16.2 diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch index e570b9c..2383c31 100644 --- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch +++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -1,7 +1,7 @@ -From 3383f4060f7fe25afd5f863fe169fd2f286ab237 Mon Sep 17 00:00:00 2001 -Message-Id: <3383f4060f7fe25afd5f863fe169fd2f286ab237.1517188106.git.jan.steffens@gmail.com> -In-Reply-To: <4aefcc4253233dce6ac5938e01371074958b8f1c.1517188106.git.jan.steffens@gmail.com> -References: <4aefcc4253233dce6ac5938e01371074958b8f1c.1517188106.git.jan.steffens@gmail.com> +From 704e31424615c87ad82424a9b09a452d762daed0 Mon Sep 17 00:00:00 2001 +Message-Id: <704e31424615c87ad82424a9b09a452d762daed0.1520639721.git.jan.steffens@gmail.com> +In-Reply-To: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com> +References: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com> From: Jim Bride Date: Mon, 6 Nov 2017 13:38:57 -0800 Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's @@ -24,7 +24,7 @@ Signed-off-by: Jim Bride 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index 158438bb0389..69b16df868ea 100644 +index add4b2434aa3..14a8bef9fdfe 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1616,7 +1616,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1, @@ -38,5 +38,5 @@ index 158438bb0389..69b16df868ea 100644 } -- -2.16.1 +2.16.2 diff --git a/90-linux.hook b/90-linux.hook index 04c78d7..be0d886 100644 --- a/90-linux.hook +++ b/90-linux.hook @@ -6,6 +6,6 @@ Target = boot/vmlinuz-%PKGBASE% Target = usr/lib/initcpio/* [Action] -Description = Updating %PKGBASE% initcpio +Description = Updating %PKGBASE% initcpios... When = PostTransaction Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/PKGBUILD b/PKGBUILD index 656177e..719b5dd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=linux-vfio _srcname=linux-4.15 -pkgver=4.15.10 +pkgver=4.15.12 pkgrel=1 arch=('x86_64') url="http://www.kernel.org/" @@ -30,16 +30,16 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" ) sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP' - 'bbc4e9dc11c15493bd74bf1aae76741ea0e170bc3a07ba9489048bdc9ff85671' + '74d2ac2ea103c907213223fd4ff710ad53e1d8a2d612db18e10d3dda9f1a6b79' 'SKIP' 'f38927db126ec7141ea2dd70cabb2ef378552672b31db4ab621493928497abd7' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' - '8f407ad5ff6eff106562ba001c36a281134ac9aa468a596aea660a4fe1fd60b5' - '99d0102c8065793096b8ea2ccc01c41fa3dcb96855f9f6f2c583b2372208c6f9' + '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' + 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '1a4a992199d4d70f7f35735f63a634bb605c2b594b7352ad5fd54512737d2784' '7cb4a5da6bf551dbb2db2e0b4e4d0774ee98cc30d9e617e030b27e6cba3e6293' - '7b7363b53c68f52b119df994c9c08d4f29271b408f021366ab23f862518bd9bc' - 'ac996455cddccc312d93e63845d92b2d8ab8fb53208a221948d28c76c678d215') + '4ffdc2a458845c2a7c03c735477dbf51b5b01b10568bf577b37a29e872135cab' + '12b281dc45f1954cc3f52276927bb2965c3132c0a8bd7f485869ced2c541d485') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -71,15 +71,14 @@ prepare() { # Overrides for missing acs capabilities patch -p1 -i "${srcdir}/add-acs-overrides.patch" - cp -Tf ../config .config + cat ../config - >.config <