5.11.11

3 files changed, 17 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e2d95616824..21b3dcd0290a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-zen-g14
 	pkgdesc = Linux ZEN with patch for Zephyrus G14 (GA401I)
-	pkgver = 5.11.8.zen1
+	pkgver = 5.11.11.zen1
 	pkgrel = 1
-	url = https://github.com/zen-kernel/zen-kernel/commits/v5.11.8-zen1
+	url = https://github.com/zen-kernel/zen-kernel/commits/v5.11.11-zen1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -16,21 +16,23 @@ pkgbase = linux-zen-g14
 	makedepends = xmlto
 	makedepends = git
 	options = !strip
-	source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.11.8-zen1
-	source = config-5.11.8.zen1::https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-zen&id=c2f27f65bb10f3b4e7048a3b2938687329ee9e62
-	source = i8042.patch
+	source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.11.11-zen1
+	source = config-5.11.11.zen1::https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-zen&id=e90f68035a7497185426ccffb0b1bbfc7c1bed0a
 	source = https://github.com/dolohow/uksm/raw/master/v5.x/uksm-5.11.patch
 	source = https://lab.retarded.farm/zappel/zGentoo/-/raw/master/sys-kernel/gentoo-sources-g14/files/0001-HID-asus-Filter-keyboard-EC-for-old-ROG-keyboard.patch
 	source = https://lab.retarded.farm/zappel/zGentoo/-/raw/master/sys-kernel/gentoo-sources-g14/files/0002-HID-ASUS-Add-support-for-ASUS-N-Key-keyboard_fanmode.patch
+	source = https://lab.retarded.farm/zappel/zGentoo/-/raw/master/sys-kernel/gentoo-sources-g14/files/0001-HID-asus-Add-support-for-2021-ASUS-N-Key-keyboard.patch
+	source = https://lab.retarded.farm/zappel/zGentoo/-/raw/master/sys-kernel/gentoo-sources-g14/files/0001-WMI-asus-Reduce-G14-and-G15-match-to-min-product-nam.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
 	sha256sums = SKIP
-	sha256sums = 1bcc8a0cf210b676e9861f309c0501df642474a7d727549c6144651e77276fc9
-	sha256sums = 6c1ac099878622b258adee05e70be226f263b93a8a7ca9c021d2b3c8abab31ac
+	sha256sums = df59b8605e86ee358f905b19cc3db9eef06356e8170a1785a0a0b1e27d071004
 	sha256sums = 34f4ae617a2407fed2ba347b663d31f39c1ec9b390e1ea5ea636c91a4cc6f875
 	sha256sums = d9f5742fed4406396698897aa042d4d5fdbfd7c51add7483a777f9ab41901aac
 	sha256sums = 9a8ff7948b16c1ad2ab23f390fd9a2cad4c765821bae7a2a1e4a61b79ffee522
+	sha256sums = 2edfb8dbb0fe7202191c51a5f645559c5da9f800e8aad2f8a4fd2731092138ff
+	sha256sums = eec1d016c5f53f1d808701b6c038db2e73a61310713f859d99bf97b9c793cefe
 
 pkgname = linux-zen-g14
 	pkgdesc = The Linux ZEN with patch for Zephyrus G14 (GA401I) kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index c1e4687fe1b8..d58ca7d22b5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=linux-zen-g14
 _pkgbase=linux-zen
-pkgver=5.11.8.zen1
+pkgver=5.11.11.zen1
 pkgrel=1
 pkgdesc='Linux ZEN with patch for Zephyrus G14 (GA401I)'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -18,11 +18,12 @@ options=('!strip')
 _srcname=zen-kernel
 source=(
   "$_srcname::git+https://github.com/zen-kernel/zen-kernel?signed#tag=$_srctag"
-  "config-$pkgver::https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-zen&id=c2f27f65bb10f3b4e7048a3b2938687329ee9e62"
-  i8042.patch
+  "config-$pkgver::https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-zen&id=e90f68035a7497185426ccffb0b1bbfc7c1bed0a"
   "https://github.com/dolohow/uksm/raw/master/v5.x/uksm-5.11.patch"
   "https://lab.retarded.farm/zappel/zGentoo/-/raw/master/sys-kernel/gentoo-sources-g14/files/0001-HID-asus-Filter-keyboard-EC-for-old-ROG-keyboard.patch"
   "https://lab.retarded.farm/zappel/zGentoo/-/raw/master/sys-kernel/gentoo-sources-g14/files/0002-HID-ASUS-Add-support-for-ASUS-N-Key-keyboard_fanmode.patch"
+  "https://lab.retarded.farm/zappel/zGentoo/-/raw/master/sys-kernel/gentoo-sources-g14/files/0001-HID-asus-Add-support-for-2021-ASUS-N-Key-keyboard.patch"
+  "https://lab.retarded.farm/zappel/zGentoo/-/raw/master/sys-kernel/gentoo-sources-g14/files/0001-WMI-asus-Reduce-G14-and-G15-match-to-min-product-nam.patch"
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -30,11 +31,12 @@ validpgpkeys=(
   'A2FF3A36AAA56654109064AB19802F8B0D70FC30'  # Jan Alexander Steffens (heftig)
 )
 sha256sums=('SKIP'
-            '1bcc8a0cf210b676e9861f309c0501df642474a7d727549c6144651e77276fc9'
-            '6c1ac099878622b258adee05e70be226f263b93a8a7ca9c021d2b3c8abab31ac'
+            'df59b8605e86ee358f905b19cc3db9eef06356e8170a1785a0a0b1e27d071004'
             '34f4ae617a2407fed2ba347b663d31f39c1ec9b390e1ea5ea636c91a4cc6f875'
             'd9f5742fed4406396698897aa042d4d5fdbfd7c51add7483a777f9ab41901aac'
-            '9a8ff7948b16c1ad2ab23f390fd9a2cad4c765821bae7a2a1e4a61b79ffee522')
+            '9a8ff7948b16c1ad2ab23f390fd9a2cad4c765821bae7a2a1e4a61b79ffee522'
+            '2edfb8dbb0fe7202191c51a5f645559c5da9f800e8aad2f8a4fd2731092138ff'
+            'eec1d016c5f53f1d808701b6c038db2e73a61310713f859d99bf97b9c793cefe')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
diff --git a/i8042.patch b/i8042.patch
deleted file mode 100644
index b5ed294016b2..000000000000
--- a/i8042.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -780,6 +780,30 @@
- 			DMI_MATCH(DMI_BOARD_VENDOR, "PK"),
- 		},
- 	},
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"),
-+		},
-+	},
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"),
-+		},
-+	},
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
-+		},
-+	},
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"),
-+		},
-+	},
- 	{ }
- };
-