[arch-commits] Commit in linux-lts/trunk (3 files)

Jan Steffens heftig at archlinux.org
Sat Apr 18 23:08:23 UTC 2020


    Date: Saturday, April 18, 2020 @ 23:08:22
  Author: heftig
Revision: 380506

5.4.33-2

Added:
  linux-lts/trunk/revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
Modified:
  linux-lts/trunk/PKGBUILD
  linux-lts/trunk/config

------------------------------------------------------------------+
 PKGBUILD                                                         |    8 +
 config                                                           |    4 
 revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch |   50 ++++++++++
 3 files changed, 57 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-18 23:08:05 UTC (rev 380505)
+++ PKGBUILD	2020-04-18 23:08:22 UTC (rev 380506)
@@ -2,7 +2,7 @@
 
 pkgbase=linux-lts
 pkgver=5.4.33
-pkgrel=1
+pkgrel=2
 pkgdesc='LTS Linux'
 url="https://www.kernel.org/"
 arch=(x86_64)
@@ -18,6 +18,7 @@
   config         # the main kernel config file
   0001-add-sysctl-and-CONFIG-for-unprivileged_userns_clone.patch
   sphinx-workaround.patch
+  revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -26,9 +27,10 @@
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 sha256sums=('b5579621302a6169b389b64dd9ef084df3bb2f11d91dd73273f76e2323223861'
             'SKIP'
-            '0c318ec33c82b4ea41117b4d0ab464775e13dc6e8b20aea6c655eb4887eafa0e'
+            '8b202067f6f0adbe2f8d4290624005f4fa1fff32aaa42f979c9ab03f6b74b62f'
             'a13581d3c6dc595206e4fe7fcf6b542e7a1bdbe96101f0f010fc5be49f99baf2'
-            'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e')
+            'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e'
+            '9fd93b899e03accd31ab357a70e538220c424ce8769e63a8b961fa627ab27c0a')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase

Modified: config
===================================================================
--- config	2020-04-18 23:08:05 UTC (rev 380505)
+++ config	2020-04-18 23:08:22 UTC (rev 380506)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.30 Kernel Configuration
+# Linux/x86 5.4.33 Kernel Configuration
 #
 
 #
@@ -4440,7 +4440,7 @@
 CONFIG_I2C_FSI=m
 # end of I2C Hardware Bus support
 
-# CONFIG_I2C_STUB is not set
+CONFIG_I2C_STUB=m
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set

Added: revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
===================================================================
--- revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch	                        (rev 0)
+++ revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch	2020-04-18 23:08:22 UTC (rev 380506)
@@ -0,0 +1,50 @@
+From df541c011f5d731447d5c99fd77d77c2191d0c6d Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh at 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
+
+From: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+
+This reverts commit ce7a61a0d57d2dd613941d8aef82a5b54fb2e396 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 at gmx.de>
+Reported-by: Rafael J. Wysocki <rafael at kernel.org>
+Cc: Sasha Levin <sashal at kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+---
+ drivers/acpi/ec.c |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/drivers/acpi/ec.c
++++ b/drivers/acpi/ec.c
+@@ -1573,6 +1573,7 @@ static int acpi_ec_add(struct acpi_devic
+ 
+ 		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
+@@ -1592,12 +1593,9 @@ static int acpi_ec_add(struct acpi_devic
+ 
+ 	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");


More information about the arch-commits mailing list