Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Date:   Mon, 4 Dec 2023 13:22:52 +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: linux-next: manual merge of the drivers-x86 tree with the
 hwmon-staging tree
Message-ID: <20231204132252.065ad867@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/XF++MVm_gx2QHZFmpd18R1q";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/XF++MVm_gx2QHZFmpd18R1q
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 i=
nterface")
  2340f12023ef ("platform/x86/intel/wmi: thunderbolt: Use bus-based WMI int=
erface")

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.

--=20
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[] =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

--Sig_/XF++MVm_gx2QHZFmpd18R1q
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVtN/wACgkQAVBC80lX
0GzSPgf+NKKG7X74SSAVuR/t7gmmZOmxugC8XKjaOCqOgRHqw2IiDJ54XeaSQCLA
V97HgOHfc76Co5gEsxH8f+uyo3/kmHi6y2PwrjPqDDdcnyXTZsDiPS/w5K6DMGd+
OH5pvPUbaXQdU94Usl89YJQZ2h/1s3+gou/+Ii4cSKT9TQCOgnzZT8d/Ei8ySvz3
R2E783AArqgrcXVAW0kZpwgK+BwitnLLXZNQBe26NMGK9H9+U3naDq8lNgP7JKDb
ZEmXQ/FxKeFj7vofWpQCnXJJpE4955B6sECTGnlxFGJZT/xxBFRkhRfI1KuCE1D3
rfAHE5cFO2bYQsyVLLxO88thiqJufg==
=bF2W
-----END PGP SIGNATURE-----

--Sig_/XF++MVm_gx2QHZFmpd18R1q--