| Message ID | 20231204132252.065ad867@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2511238vqy;
Sun, 3 Dec 2023 18:23:18 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IFfB/cR7N1x7zcj2PSQmRyzyBZzoTE8Sv0ZwAlVQVtag1OlrvVxyLhbiTVXiiROZIMkjmcg
X-Received: by 2002:a05:6870:a110:b0:1f9:697a:69e1 with SMTP id
m16-20020a056870a11000b001f9697a69e1mr3778297oae.16.1701656598023;
Sun, 03 Dec 2023 18:23:18 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1701656597; cv=none;
d=google.com; s=arc-20160816;
b=VtYLidB4xPwldDnsykWITOft/31jVAXk4yBVSNwiPK0FLBsfwEEnjO0WO9WMoCaSiN
B4ydvt+ODbcD+oswbS2pz10aZ2k/UuGVihsdV/jOKqmMJjm1AUNBtCHN2ExmtDdLv/tO
A1uJ7BLSmDx3BR9on064T25ps8baKmI/3kE2UF9nvn5kBeyiiHdkFFY1hQu3Icx7DUFn
sRXSf7ePBIL++eKOYTPfUgU/VY0iHX+BNKsTPyFryu7ttLuzzJ6FlxYwoy/Lb8RK1VLW
NcoSTWL5J9VYgROoFtP3kcaniBJutB6H18TFHogt4oWTPmMuV9sU0ilHvEPQzrKt7WSI
O8Cg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=xFb81dgPot++0Rm5Gwsc/XhjSKpeH1BXs5fHWqrZU+k=;
fh=RQEd5V7r6mMPwTJvUJDOcSkEQDqMHCnqlx+03EKy9rg=;
b=wNrzbUSAaFIXp5CnMAHaIuWCZ5mxswYD3VG+D2KCOBESX9DAZCiJL/T+h7TMu6yir4
BZlsFiU9tP5BGXjnmhbu7YleStq0ZDBIZ+uQMS87PndicAzkxidqfFaQ/2PdysrW0PiU
jss2nsCkaA79xlRGoQ1Fna+ZZZVrtflMnZYtIJokun3e8KnG++uvsgudwX2zK6zVcd7Y
jkNJACvkYboiE/TMI+EK+t18OpKinEBI9ZudXB1atBNWsskKSkdp6p+4YO7SD6iLIMaZ
5IyZHHkkGOD9kh2KXdwgw7vi1flvl8VkYygBDTnWuPIhW7rUiusNrBT+kqsZQ6o58EqE
bCsg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=fXSqR8wx;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4])
by mx.google.com with ESMTPS id
d17-20020a634f11000000b005c66b0c7676si2516212pgb.256.2023.12.03.18.23.17
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 03 Dec 2023 18:23:17 -0800 (PST)
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;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=fXSqR8wx;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by howler.vger.email (Postfix) with ESMTP id AE07D806135D;
Sun, 3 Dec 2023 18:23:15 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230141AbjLDCW5 (ORCPT <rfc822;pwkd43@gmail.com> + 99 others);
Sun, 3 Dec 2023 21:22:57 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48444 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229510AbjLDCW4 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 3 Dec 2023 21:22:56 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1508FC3;
Sun, 3 Dec 2023 18:23:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1701656577;
bh=xFb81dgPot++0Rm5Gwsc/XhjSKpeH1BXs5fHWqrZU+k=;
h=Date:From:To:Cc:Subject:From;
b=fXSqR8wxcIynlamuqDBW96ZsUp9jjM0cbkypwIllWsyK9d9C048ZrO3NIO/I9sGvz
9YzNP6poY9zfoNBt9ooYR1u737+K1GI6HPMPbGBAZnjUbBmccjgWYCuIbrKgT2eHWa
SXl+u6QuAH5ZUQBuNeI4yICcw/V5WrUt1/BXYvvRAB49KdOZ37ix/jZVG0KNaAZoZo
2LEouzw9Kiv1pg93QESpPVf0KOIMqOWgb0GKxDnCzVE0M5gzJ2g4/ujnY2mh6ACEGm
89QJO+a+q5qqkZsR6hd721n5QGR4ketUqousRWe44UFQBx8Y/BEfVs31WqoLtdf49F
Vqn4y2S+IJBgw==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4Sk6rw0WCsz4x1p;
Mon, 4 Dec 2023 13:22:56 +1100 (AEDT)
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
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]);
Sun, 03 Dec 2023 18:23:15 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1784316268708213468
X-GMAIL-MSGID: 1784316268708213468
|
| Series |
linux-next: manual merge of the drivers-x86 tree with the hwmon-staging tree
|
|
Commit Message
Stephen Rothwell
Dec. 4, 2023, 2:22 a.m. UTC
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.
Comments
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.
diff --cc drivers/platform/x86/wmi.c index d68a96a2c570,cb7e74f2b009..000000000000 --- a/drivers/platform/x86/wmi.c