Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/i2c/busses/i2c-i801.c
between commit:
fd4e93083129 ("i2c: i801: Add lis3lv02d for Dell Precision M6800")
from the i2c-host tree and commit:
cc0809b752c7 ("platform/x86: dell-smo8800: Move instantiation of lis3lv02d i2c_client from i2c-i801 to dell-lis3lv02d")
from the drivers-x86 tree.
I fixed it up (I used the latter version of this file and applied the
following merge fix patch) 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.
rom: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 10 Jan 2025 14:29:46 +1100
Subject: [PATCH] fix up for "platform/x86: dell-smo8800: Move instantiation of
lis3lv02d i2c_client from i2c-i801 to dell-lis3lv02d"
interacting with "i2c: i801: Add lis3lv02d for Dell Precision M6800"
from hte i2c-host tree
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/platform/x86/dell/dell-lis3lv02d.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/platform/x86/dell/dell-lis3lv02d.c b/drivers/platform/x86/dell/dell-lis3lv02d.c
index d2b34e10c5eb..48a937c90ea9 100644
--- a/drivers/platform/x86/dell/dell-lis3lv02d.c
+++ b/drivers/platform/x86/dell/dell-lis3lv02d.c
@@ -46,6 +46,7 @@ static const struct dmi_system_id lis3lv02d_devices[] __initconst = {
DELL_LIS3LV02D_DMI_ENTRY("Latitude E6330", 0x29),
DELL_LIS3LV02D_DMI_ENTRY("Latitude E6430", 0x29),
DELL_LIS3LV02D_DMI_ENTRY("Precision 3540", 0x29),
+ DELL_LIS3LV02D_DMI_ENTRY("Precision M6800", 0x29),
DELL_LIS3LV02D_DMI_ENTRY("Vostro V131", 0x1d),
DELL_LIS3LV02D_DMI_ENTRY("Vostro 5568", 0x29),
DELL_LIS3LV02D_DMI_ENTRY("XPS 15 7590", 0x29),
--
2.45.2
--
Cheers,
Stephen Rothwell
Attachment:
pgpBGo5kcQx6L.pgp
Description: OpenPGP digital signature
