upgpkg: kernels/linux-libre-xtreme 4.18.9_gnu-1

Signed-off-by: David P <megver83@parabola.nu>

7 files changed, 32 insertions, 164 deletions

diff --git a/kernels/linux-libre-xtreme/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/kernels/linux-libre-xtreme/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index 785150403..e57df3b15 100644
--- a/kernels/linux-libre-xtreme/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/kernels/linux-libre-xtreme/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,8 +1,7 @@
-From 7e7b8d7a0e74d0d4c74abee0334a771458a3ed79 Mon Sep 17 00:00:00 2001
+From 1a47eb71988a919e811ce558f6f58855155c6218 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
- default
+Subject: [PATCH] add sysctl to disallow unprivileged CLONE_NEWUSER by default
 
 Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
 [bwh: Remove unneeded binary sysctl bits]
@@ -14,7 +13,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 +28,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 +39,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 +83,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 +97,5 @@ index c3d7583fcd21..6ee37e516869 100644
  static DEFINE_MUTEX(userns_state_mutex);
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/kernels/linux-libre-xtreme/0002-drm-i915-Increase-LSPCON-timeout.patch b/kernels/linux-libre-xtreme/0002-drm-i915-Increase-LSPCON-timeout.patch
deleted file mode 100644
index 79860decc..000000000
--- a/kernels/linux-libre-xtreme/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/kernels/linux-libre-xtreme/0003-HID-core-fix-grouping-by-application.patch b/kernels/linux-libre-xtreme/0003-HID-core-fix-grouping-by-application.patch
deleted file mode 100644
index da196890f..000000000
--- a/kernels/linux-libre-xtreme/0003-HID-core-fix-grouping-by-application.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 20acb01da9443e3ca814bb5d17f01b3fea754010 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
-
-commit f07b3c1da92d ("HID: generic: create one input report per
-application type") was effectively the same as MULTI_INPUT:
-hidinput->report was never set, so hidinput_match_application()
-always returned null.
-
-Fix that by testing against the real application.
-
-Note that this breaks some old eGalax touchscreens that expect MULTI_INPUT
-instead of HID_QUIRK_INPUT_PER_APP. Enable this quirk for backward
-compatibility on all non-Win8 touchscreens.
-
-link: https://bugzilla.kernel.org/show_bug.cgi?id=200847
-link: https://bugzilla.kernel.org/show_bug.cgi?id=200849
-link: https://bugs.archlinux.org/task/59699
-link: https://github.com/NixOS/nixpkgs/issues/45165
-
-Cc: stable@vger.kernel.org # v4.18+
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
- drivers/hid/hid-input.c      | 4 ++--
- drivers/hid/hid-multitouch.c | 3 +++
- include/linux/hid.h          | 1 +
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
-index ab93dd5927c3..a137d2835f32 100644
---- a/drivers/hid/hid-input.c
-+++ b/drivers/hid/hid-input.c
-@@ -1579,6 +1579,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid,
- 	input_dev->dev.parent = &hid->dev;
- 
- 	hidinput->input = input_dev;
-+	hidinput->application = application;
- 	list_add_tail(&hidinput->list, &hid->inputs);
- 
- 	INIT_LIST_HEAD(&hidinput->reports);
-@@ -1674,8 +1675,7 @@ static struct hid_input *hidinput_match_application(struct hid_report *report)
- 	struct hid_input *hidinput;
- 
- 	list_for_each_entry(hidinput, &hid->inputs, list) {
--		if (hidinput->report &&
--		    hidinput->report->application == report->application)
-+		if (hidinput->application == report->application)
- 			return hidinput;
- 	}
- 
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 45968f7970f8..1a987345692a 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -1476,6 +1476,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
- 	 */
- 	hdev->quirks |= HID_QUIRK_INPUT_PER_APP;
- 
-+	if (id->group != HID_GROUP_MULTITOUCH_WIN_8)
-+		hdev->quirks |= HID_QUIRK_MULTI_INPUT;
-+
- 	timer_setup(&td->release_timer, mt_expired_timeout, 0);
- 
- 	ret = hid_parse(hdev);
-diff --git a/include/linux/hid.h b/include/linux/hid.h
-index 773bcb1d4044..5482dd6ae9ef 100644
---- a/include/linux/hid.h
-+++ b/include/linux/hid.h
-@@ -520,6 +520,7 @@ struct hid_input {
- 	const char *name;
- 	bool registered;
- 	struct list_head reports;	/* the list of reports */
-+	unsigned int application;	/* application usage for this input */
- };
- 
- enum hid_type {
--- 
-2.18.0
-
diff --git a/kernels/linux-libre-xtreme/PKGBUILD b/kernels/linux-libre-xtreme/PKGBUILD
index ece26ba5a..add850576 100644
--- a/kernels/linux-libre-xtreme/PKGBUILD
+++ b/kernels/linux-libre-xtreme/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgbase=linux-libre-xtreme
 _srcbasever=4.18-gnu
-_srcver=4.18.7-gnu
+_srcver=4.18.9-gnu
 _hardenedver=a
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -22,7 +22,7 @@ _srcname=linux-${_srcbasever%-*}
 _archpkgver=${_srcver%-*}
 pkgver=${_srcver//-/_}
 pkgrel=1
-rcnrel=armv7-x7
+rcnrel=armv7-x9
 arch=(i686 x86_64 armv7h)
 url="https://wiki.parabola.nu/Xtreme"
 license=(GPL2)
@@ -61,8 +61,6 @@ 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'
 )
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -72,9 +70,9 @@ validpgpkeys=(
 )
 sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471d3063016a4eb3f68d42879e18ee314ab30716116805fee35b5084b23df2a9'
             'SKIP'
-            'eb6ac128ed56fa9a499e32939d71d2c4f3afa3c064882c34222c6ac23e2ea0f323155a400525e007093ff9313045c677fbc2f9487d42fd4c3b23a09d8454991f'
+            '72486a515539b2420daa6fb41c41f5994dbc4572bdacd80f75fb965398b6e12ed06c491ddab263adc36c5d48da52e1b5cf1145f4f808665dffc64ba16bfc90d4'
             'SKIP'
-            '037ffe18d550d31c692ca817373342f3da49008bb42780f130812eeb49cc30a6b69d839b723e211a1b7ba6e358f6e07cec216dc2243390a48df8118028be1711'
+            '60ac5793455044f8d1acf9c09397168b2f43c964e43941dbfccc6c7a05bb2288a9ab74147a76da4015e0b5ead18d6f598443ef04ebf14fd231e7746fc8bf6b9a'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -82,9 +80,9 @@ sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            'ee37f8e805b907c3d35e3d928599995ec78da86863c3ce204cb5b5bf439fc7f858fa7c7119202a4b305e664d0f09823be756d12b48e7dc8fa3ac0bd6bc901402'
-            'f7d78e4242bbdaa75a974daf50526d8fbbd7d3a5a14e55d672916229bbc9438d036228ab9c268820dc6b45c5640e72158894cbd4ef9bfd3c66f40aeab20c6ee0'
-            '5b81fecfc24b2a74b26043b005700493b6338ebc517a6a42112eba317bcf2c21bf2c902612a25f7750504444258a71402933a889aafe5497b1a1a8911b230a8b'
+            '4d85d5d680a695e80504e6a22a102dbc7285ad9ff56a53c23ecaebbe3088e150f6815e90ade3fa8296e6185c8cd658d06c56457ac850d58d1004976603e9f5f5'
+            '1ab1118eac9782c659cf73e54204b11a1582a53b72f9f48c8a25e3da832e7037b1e4db16f4e8e37f2a60216a5254dcd9307323c4dc9290e705fd373da4bb8c8a'
+            'f02b7f7128899ac170fd5856727537b9b0abc4ba17c6b8d7992a1d6e5bc0492e5accf6f5014172327959f5753b0adc0283c8e76e1cf154f389e4a5f4787e7304'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
@@ -106,9 +104,7 @@ sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471
             '073c48fea2989334451b9020e8151c0385b07affcb2bc5f778fd5f9d2d8182e40dcd04edde4d53648c1ed8cea4721afc04267a72e429be3612d2f77f5d0fd459'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            'd7e50acea0a21dc4c65d0ac093192e02ed995a6110f714b1f8a3c60c44a4d4da09ffbf90bcf20ce2e285b4f58f3972957e30b26c57e233c483ce049177fdfb13'
-            '15254ce2163c296f4823b3cfea31f68d4d9f0da3cc8c1aff7ec8d6d957fb1f437b39c4b7737056ba86d2405a8a5fd407bd7c2ff6d273089499daac0630b2bf0e'
-            '559fe854b46bcb4967d01f97dcc98c9c5ea52a3a3fa70ea6b19d78f0c5b19598d058a82e33006b7b6afd54cf7e073c8622d4a59eac24151685b5ec20dad1eace')
+            '78b8020105e7aafb84f32de6a7fb12b5dcb466f1d36d5188d78064d3d11a2a996a7ea4c7f9ba8a927fb9e4bbbfc6ac2913d03aa8b8257d8a771a93b7b8658092')
   
 _kernelname=${pkgbase#linux-libre}
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
@@ -161,13 +157,9 @@ prepare() {
     patch -p1 -i ../linux-hardened-${_srcver%-*}.${_hardenedver}.patch
 
     # Arch's linux-hardened patches
-    patch -p1 -i ../0002-drm-i915-Increase-LSPCON-timeout.patch
-    patch -p1 -i ../0003-HID-core-fix-grouping-by-application.patch
   else
     # 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
   fi
 
   # maintain the TTY over USB disconnects
diff --git a/kernels/linux-libre-xtreme/config.armv7h b/kernels/linux-libre-xtreme/config.armv7h
index 875b06211..8bee0af32 100644
--- a/kernels/linux-libre-xtreme/config.armv7h
+++ b/kernels/linux-libre-xtreme/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.18.6-gnu Kernel Configuration
+# Linux/arm 4.18.9-gnu Kernel Configuration
 #
 
 #
@@ -57,7 +57,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_USELIB=y
+# CONFIG_USELIB is not set
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_AUDITSYSCALL=y
diff --git a/kernels/linux-libre-xtreme/config.i686 b/kernels/linux-libre-xtreme/config.i686
index 4a48d71bc..2fce64fcb 100644
--- a/kernels/linux-libre-xtreme/config.i686
+++ b/kernels/linux-libre-xtreme/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.6-gnu Kernel Configuration
+# Linux/x86 4.18.9-gnu Kernel Configuration
 #
 
 #
@@ -1124,14 +1124,14 @@ CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_OSF=m
 CONFIG_NF_TABLES=m
-# CONFIG_NF_TABLES_SET is not set
+CONFIG_NF_TABLES_SET=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_COUNTER=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
@@ -1146,7 +1146,7 @@ CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_FIB=m
 CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -5888,7 +5888,13 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LEGACY=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_VIA is not set
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
@@ -5943,7 +5949,9 @@ CONFIG_FB_I810_I2C=y
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
 # CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_NEOMAGIC is not set
diff --git a/kernels/linux-libre-xtreme/config.x86_64 b/kernels/linux-libre-xtreme/config.x86_64
index 4306ce25a..953fb17cd 100644
--- a/kernels/linux-libre-xtreme/config.x86_64
+++ b/kernels/linux-libre-xtreme/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.7-gnu Kernel Configuration
+# Linux/x86 4.18.9-gnu Kernel Configuration
 #
 
 #