Updated to 5.6.6

3 files changed, 3 insertions, 101 deletions

diff --git a/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch b/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
deleted file mode 100644
index b30143c..0000000
--- a/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From e5016d0b5460c3bed8f78033723ad22775db7725 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Sat, 18 Apr 2020 11:29:04 +0200
-Subject: Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 281e612b4b9587c0c72e30c49ec279587b20da0f which is
-commit 65a691f5f8f0bb63d6a82eec7b0ffd193d8d8a5f upstream.
-
-Rafael writes:
-	It has not been marked for -stable or otherwise requested to be
-	included AFAICS.  Also it depends on other mainline commits that
-	have not been included into 5.6.5.
-
-Reported-by: Toralf Förster <toralf.foerster@gmx.de>
-Reported-by: Rafael J. Wysocki <rafael@kernel.org>
-Cc: Sasha Levin <sashal@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/acpi/ec.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
-index 29b8fa618a02..35dd2f1fb0e6 100644
---- a/drivers/acpi/ec.c
-+++ b/drivers/acpi/ec.c
-@@ -1646,6 +1646,7 @@ static int acpi_ec_add(struct acpi_device *device)
- 
- 		if (boot_ec && ec->command_addr == boot_ec->command_addr &&
- 		    ec->data_addr == boot_ec->data_addr) {
-+			boot_ec_is_ecdt = false;
- 			/*
- 			 * Trust PNP0C09 namespace location rather than
- 			 * ECDT ID. But trust ECDT GPE rather than _GPE
-@@ -1665,12 +1666,9 @@ static int acpi_ec_add(struct acpi_device *device)
- 
- 	if (ec == boot_ec)
- 		acpi_handle_info(boot_ec->handle,
--				 "Boot %s EC initialization complete\n",
-+				 "Boot %s EC used to handle transactions and events\n",
- 				 boot_ec_is_ecdt ? "ECDT" : "DSDT");
- 
--	acpi_handle_info(ec->handle,
--			 "EC: Used to handle transactions and events\n");
--
- 	device->driver_data = ec;
- 
- 	ret = !!request_region(ec->data_addr, 1, "EC data");
--- 
-cgit v1.2.3-1-gf6bb5
-
diff --git a/0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch b/0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch
deleted file mode 100644
index bbe177a..0000000
--- a/0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1f8782c04f587b9e0901f7736c112814dd0dcc47 Mon Sep 17 00:00:00 2001
-From: Prike Liang <Prike.Liang@amd.com>
-Date: Mon, 13 Apr 2020 21:41:14 +0800
-Subject: drm/amdgpu: fix the hw hang during perform system reboot and reset
-
-commit b2a7e9735ab2864330be9d00d7f38c961c28de5d upstream.
-
-The system reboot failed as some IP blocks enter power gate before perform
-hw resource destory. Meanwhile use unify interface to set device CGPG to ungate
-state can simplify the amdgpu poweroff or reset ungate guard.
-
-Fixes: 487eca11a321ef ("drm/amdgpu: fix gfx hang during suspend with video playback (v2)")
-Signed-off-by: Prike Liang <Prike.Liang@amd.com>
-Tested-by: Mengbing Wang <Mengbing.Wang@amd.com>
-Tested-by: Paul Menzel <pmenzel@molgen.mpg.de>
-Acked-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-index 48e2863461b7..c8bf9cb3cebf 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-@@ -2285,6 +2285,8 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)
- {
- 	int i, r;
- 
-+	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);
-+	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);
- 
- 	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
- 		if (!adev->ip_blocks[i].status.valid)
--- 
-cgit v1.2.3-1-gf6bb5
-
diff --git a/PKGBUILD b/PKGBUILD
index 706bd59..ecfade9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@
 pkgbase=linux
 _supver=5
 _majver=6
-_minver=5
+_minver=6
 _gccpatchver='20191217'
 _gccpatchger='9.1'
 _gccpatchker='5.5'
@@ -23,7 +23,7 @@ _gccpatchker='5.5'
   else
     pkgver=${_supver}.${_majver}.${_minver}
   fi
-pkgrel=3
+pkgrel=1
 pkgdesc='Linux'
 url='https://kernel.org'
 arch=(x86_64)
@@ -38,8 +38,6 @@ _srcname=linux-${pkgver}
 source=(
   https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign}
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
-  0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch
   graysky_bdver2-hotfix.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
   ath9k-regdom-hack.patch
@@ -52,11 +50,9 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('92d4ea253eb70a77ea6d891b34406d5c78422d491ea66946e87fb4f1e91b786fd67fb5bf38bc5883f929cb16b916fea2b600d4223457e603c5ca8f1ea5ba8652'
+b2sums=('885c30732c91ea3af1a797db14f1f517a05e0f388c5b854eb404a6b46f8be20debca5fd517c3e9910b012385a96154a7b1fa18f56c1d5927b7575b62ded98b74'
         'SKIP'
         'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e'
-        '4ffbef601d902432e13c9012e3b46f0321c6277aa36a2bc23b2929e6404d0171e881e4b367d29ac7eb02b6c0d9faa06f152d27fdb88f76aa0c27e68c51b466e8'
-        '641284ba5239e23ad7e0f74ca101ba37938c39b46eb3dd90bd8c85cd6feef217ce3b326687c43c52fd984c1fa305e092a3b81a18b02571b36e4152c0bff2f9a9'
         '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e'
         'd76bd0bf237ea2bb7999fd3715cb664d89148cb0ade8057d57cdb40bc0a7954336e50ee077312e5e192398b0f35f055786deb98af9130d57e60f2ea040fbb66f'
         '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
@@ -81,8 +77,6 @@ prepare() {
   # Hotfixes
   echo "Applying hotfixes"
   patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  patch -p1 -i ../0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
-  patch -p1 -i ../0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch
   patch -p1 -i ../sphinx-workaround.patch