linux-next: manual merge of the drivers-x86 tree with the hwmon-staging tree

linux-next: manual merge of the drivers-x86 tree with the hwmon-staging tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1493 bytes --]

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  drivers/platform/x86/wmi.c

between commit:

  9ad55f14cc30 ("hwmon: (dell-smm) Add support for WMI SMM interface")

from the hwmon-staging tree and commits:

  75c487fcb69c ("platform/x86: intel-wmi-sbl-fw-update: Use bus-based WMI interface")
  2340f12023ef ("platform/x86/intel/wmi: thunderbolt: Use bus-based WMI interface")

from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/platform/x86/wmi.c
index d68a96a2c570,cb7e74f2b009..000000000000
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@@ -106,7 -106,8 +106,9 @@@ MODULE_DEVICE_TABLE(acpi, wmi_device_id
  static const char * const allow_duplicates[] = {
  	"05901221-D566-11D1-B2F0-00A0C9062910",	/* wmi-bmof */
  	"8A42EA14-4F2A-FD45-6422-0087F7A7E608",	/* dell-wmi-ddv */
 +	"F1DDEE52-063C-4784-A11E-8A06684B9B01",	/* dell-smm-hwmon */
+ 	"44FADEB1-B204-40F2-8581-394BBDC1B651",	/* intel-wmi-sbl-fw-update */
+ 	"86CCFD48-205E-4A77-9C48-2021CBEDE341",	/* intel-wmi-thunderbolt */
  	NULL
  };
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drivers-x86 tree with the hwmon-staging tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1334 bytes --]

Hi all,

On Mon, 4 Dec 2023 13:22:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
> 
>   drivers/platform/x86/wmi.c
> 
> between commit:
> 
>   9ad55f14cc30 ("hwmon: (dell-smm) Add support for WMI SMM interface")
> 
> from the hwmon-staging tree and commits:
> 
>   75c487fcb69c ("platform/x86: intel-wmi-sbl-fw-update: Use bus-based WMI interface")
>   2340f12023ef ("platform/x86/intel/wmi: thunderbolt: Use bus-based WMI interface")
> 
> from the drivers-x86 tree.
> 
> diff --cc drivers/platform/x86/wmi.c
> index d68a96a2c570,cb7e74f2b009..000000000000
> --- a/drivers/platform/x86/wmi.c
> +++ b/drivers/platform/x86/wmi.c
> @@@ -106,7 -106,8 +106,9 @@@ MODULE_DEVICE_TABLE(acpi, wmi_device_id
>   static const char * const allow_duplicates[] = {
>   	"05901221-D566-11D1-B2F0-00A0C9062910",	/* wmi-bmof */
>   	"8A42EA14-4F2A-FD45-6422-0087F7A7E608",	/* dell-wmi-ddv */
>  +	"F1DDEE52-063C-4784-A11E-8A06684B9B01",	/* dell-smm-hwmon */
> + 	"44FADEB1-B204-40F2-8581-394BBDC1B651",	/* intel-wmi-sbl-fw-update */
> + 	"86CCFD48-205E-4A77-9C48-2021CBEDE341",	/* intel-wmi-thunderbolt */
>   	NULL
>   };
>   

This is now a conflict between the hwmon-staging tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drivers-x86 tree with the hwmon-staging tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1886 bytes --]

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  MAINTAINERS

between commits:

  548820e21ce1 ("hwmon: (asus_wmi_sensors) Support X370 Asus WMI.")
  b87611d43757 ("hwmon: (asus_wmi_ec_sensors) Support B550 Asus WMI.")

from the hwmon-staging tree and commit:

  0a6509b0926d ("platform/x86: Add Asus TF103C dock driver")

from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 41c43425f7f9,1dd2cbff0c6b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3017,20 -2988,13 +3017,27 @@@ W:	http://acpi4asus.sf.ne
  F:	drivers/platform/x86/asus*.c
  F:	drivers/platform/x86/eeepc*.c
  
+ ASUS TF103C DOCK DRIVER
+ M:	Hans de Goede <hdegoede@redhat.com>
+ L:	platform-driver-x86@vger.kernel.org
+ S:	Maintained
+ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
+ F:	drivers/platform/x86/asus-tf103c-dock.c
+ 
 +ASUS WMI HARDWARE MONITOR DRIVER
 +M:	Ed Brindley <kernel@maidavale.org>
 +M:	Denis Pauk <pauk.denis@gmail.com>
 +L:	linux-hwmon@vger.kernel.org
 +S:	Maintained
 +F:	drivers/hwmon/asus_wmi_sensors.c
 +
 +ASUS WMI EC HARDWARE MONITOR DRIVER
 +M:	Eugene Shalygin <eugene.shalygin@gmail.com>
 +M:	Denis Pauk <pauk.denis@gmail.com>
 +L:	linux-hwmon@vger.kernel.org
 +S:	Maintained
 +F:	drivers/hwmon/asus_wmi_ec_sensors.c
 +
  ASUS WIRELESS RADIO CONTROL DRIVER
  M:	João Paulo Rechi Vita <jprvita@gmail.com>
  L:	platform-driver-x86@vger.kernel.org

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]