Received-SPF: pass (google.com: domain of linux-kernel+bounces-22917-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Thu, 11 Jan 2024 11:53:41 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Hans de Goede <hdegoede@redhat.com>, Mark Gross <markgross@kernel.org>,
 Guenter Roeck <linux@roeck-us.net>
Cc: Armin Wolf <W_Armin@gmx.de>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the
 hwmon-staging tree
Message-ID: <20240111115341.662478d0@canb.auug.org.au>
In-Reply-To: <20231204132252.065ad867@canb.auug.org.au>
References: <20231204132252.065ad867@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/o1TMqZk4pVTC85Dio.ZGgcS";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/o1TMqZk4pVTC85Dio.ZGgcS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 4 Dec 2023 13:22:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>=20
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>=20
>   drivers/platform/x86/wmi.c
>=20
> between commit:
>=20
>   9ad55f14cc30 ("hwmon: (dell-smm) Add support for WMI SMM interface")
>=20
> from the hwmon-staging tree and commits:
>=20
>   75c487fcb69c ("platform/x86: intel-wmi-sbl-fw-update: Use bus-based WMI=
 interface")
>   2340f12023ef ("platform/x86/intel/wmi: thunderbolt: Use bus-based WMI i=
nterface")
>=20
> from the drivers-x86 tree.
>=20
> 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[] =3D {
>   	"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
>   };
>  =20

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

--=20
Cheers,
Stephen Rothwell

--Sig_/o1TMqZk4pVTC85Dio.ZGgcS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWfPBUACgkQAVBC80lX
0Gy+PAf/epW+McZt3o87dcjtY5M00tJFUTrumEQ4hto3s095ZQ9R+vJSk6tbh5+S
xaiQ4hiuBAqNQplyjj7cum8I17KY5lBbQQkEWx1rTcm80JCllzx3rTffcGm0MmFs
XaPDUqN1wlczgA0h3OunSQ4zYAawDh48450yBNcs8caU4jVP0kvZDz8gOmQd+1NS
Q23jKQlfaWbgsujI5Eeu1kvlA6K6pUSl8dbG0BroHIm4Wn5vSwFqV37L+EiPJojA
yKyzysCDxlh+I2/kJOCUpkys3xO5W3OBlnqTDBxV3rs7hUeZHaCwtTkdqbimfxNP
xX3BdNs5gREFjSI7SWgDS9Jy1eqKPA==
=LYde
-----END PGP SIGNATURE-----

--Sig_/o1TMqZk4pVTC85Dio.ZGgcS--