Updated; asus wmi patch seems mainlined.

4 files changed, 6 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc8a8771c681..c775af61d74c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-amd
-	pkgver = 5.6.v.4
+	pkgver = 5.6.v.5
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -16,12 +16,10 @@ pkgbase = linux-amd
 	source = config.x86_64
 	source = linux-amd.preset
 	source = 5012_enable-cpu-optimizations-for-gcc91.patch
-	source = asusbat.patch
 	sha256sums = SKIP
-	sha256sums = 0d6b813dfce30333f61eca57b42b36367ede4fad66abeeab973bb1170010f9ce
+	sha256sums = dcf938e044b44db4732576b3e8da9eda1790e1931215c3c63fe0c7151d70d6dc
 	sha256sums = 71caf34adf69e9e2567a38cfc951d1c60b13dbe87f58a9acfeb3fe48ffdc9d08
 	sha256sums = cc739c9c9f7ce08e6bbc161b8232208bbc00820342a32fb1f69bff6326ae1370
-	sha256sums = c0a1604da4e0ae360f0c93a9adf244f9a8cffb5d219c94c0a58e23fb2c007a68
 
 pkgname = linux-amd
 	pkgdesc = Linux kernel for AMD CPU based hardware
diff --git a/PKGBUILD b/PKGBUILD
index 7dfb207e30f4..c5cd98ad4832 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=linux-amd
 _srcname=linux
-gitver=v5.6.4
-pkgver=5.6.v.4
+gitver=v5.6.5
+pkgver=5.6.v.5
 pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
@@ -21,18 +21,14 @@ source=('git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git'
         "${pkgbase}.preset"
 	# patch from our gentoo overlords
 	5012_enable-cpu-optimizations-for-gcc91.patch
-	# asus WMI patch
-	asusbat.patch
 )
 sha256sums=('SKIP'
 	#config.x86_64
-            '0d6b813dfce30333f61eca57b42b36367ede4fad66abeeab973bb1170010f9ce'
+            'dcf938e044b44db4732576b3e8da9eda1790e1931215c3c63fe0c7151d70d6dc'
 	#.preset file
             '71caf34adf69e9e2567a38cfc951d1c60b13dbe87f58a9acfeb3fe48ffdc9d08'
 	#patch gentoo
             'cc739c9c9f7ce08e6bbc161b8232208bbc00820342a32fb1f69bff6326ae1370'
-	#Asusbat gitfile
-            'c0a1604da4e0ae360f0c93a9adf244f9a8cffb5d219c94c0a58e23fb2c007a68'
            )
 
 _kernelname=${pkgbase#linux}
@@ -59,8 +55,6 @@ prepare() {
   git apply ../5012_enable-cpu-optimizations-for-gcc91.patch
   # get kernel version
   yes "" | make prepare
-  # Implement suggested asus_wmi change
-  git apply ../asusbat.patch
 
   # load configuration
   # Configure the kernel. Replace the line below with one of your choice.
diff --git a/asusbat.patch b/asusbat.patch
deleted file mode 100644
index cf85eeb6e001..000000000000
--- a/asusbat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- drivers/platform/x86/asus-wmi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index 612ef5526226..12435e747a5d 100644
---- a/drivers/platform/x86/asus-wmi.c
-+++ b/drivers/platform/x86/asus-wmi.c
-@@ -427,7 +427,7 @@ static int asus_wmi_battery_add(struct power_supply *battery)
- 	/* The WMI method does not provide a way to specific a battery, so we
- 	 * just assume it is the first battery.
- 	 */
--	if (strcmp(battery->desc->name, "BAT0") != 0)
-+	if ( (strcmp(battery->desc->name, "BAT0") != 0) && (strcmp(battery->desc->name, "BATT") != 0) )
- 		return -ENODEV;
- 
- 	if (device_create_file(&battery->dev,
diff --git a/config.x86_64 b/config.x86_64
index d552b95d6f56..c3b170ddb084 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.4 Kernel Configuration
+# Linux/x86 5.6.5 Kernel Configuration
 #
 
 #