| Message ID | 20230105100302.00b1c5cd@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp12301wrt;
Wed, 4 Jan 2023 15:06:26 -0800 (PST)
X-Google-Smtp-Source:
AMrXdXtY55v9S0eph9Ov/6jm2W/D+hh+h0vcpY3QQ4skYW6UYSnvZ18zefssDu0Vz+hMXTceADAk
X-Received: by 2002:a17:906:5619:b0:7c0:faca:52c with SMTP id
f25-20020a170906561900b007c0faca052cmr42496488ejq.37.1672873586622;
Wed, 04 Jan 2023 15:06:26 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1672873586; cv=none;
d=google.com; s=arc-20160816;
b=oJ21djm4t6s4zITmY8raJmlq9I+dguzTiSAl41G7ZJ3kl7IoEbhcHBLyoEA3oG6BOs
eAQg84mCwUXy3n833DoThVp2B9xnAa54UNaxEtqjJebBUxJsctFSKa8QW0q06h7KCeGN
RYmZqcb9UjTiKcVmPKPsMa7pOk4lywE1pZHlCAKF9MdcVKb+RzOulC3xe/H19Cvc1uMr
MmMnfqSTwKCLhH4vPde3HpLcSHTHUnBuA5gS4n3SpXZs8tVao+qzavepqPsBoiXdOoTJ
bXSFYSpabWZG64DSxP/l+b4hnZmqV0omhtDLGGDJYgp1khCPXNo+6s9QYE4Ln4CR5d71
8hFQ==
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=YB0hJcpraawuKA1dE5txTbZJubHg4syLjM+ce6VinJI=;
b=sYNodO4GkSaVYozy/BDkOvif04CZyY7o8USCxJnZaCUWRWtuiCv1hcy4ebXzv33Eq3
/Q3g5PZstAHsQmadweI1wdvq5glFYi1ZGJT1jAaVePOTRDGpgynSX+iAl9fPYkglCISk
/cLGO4bg7B/l/hA3++5SgHp7ER+9yGg/nc51FlPBVb3p8CrAL00FO4h3JKrSCrrmYheB
xhImfnjGaICo0kjO+AUNDiqxqmIjgL2lJ3zhgr/21Iy/N6t9U23Bf0ijtkvssDn+4Hv2
rQyfQMjbL6RaQrK/UvRrsXV6CMti9YDXGbmp1gcrUjxhrDSlkHHrWd3gvL9az/AuT+4z
UHLQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=U1l29gCW;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
di15-20020a170906730f00b007c14d966ebasi34519829ejc.404.2023.01.04.15.06.02;
Wed, 04 Jan 2023 15:06:26 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=U1l29gCW;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229986AbjADXDJ (ORCPT <rfc822;tmhikaru@gmail.com> + 99 others);
Wed, 4 Jan 2023 18:03:09 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60154 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229967AbjADXDH (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 4 Jan 2023 18:03:07 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37C139E;
Wed, 4 Jan 2023 15:03:06 -0800 (PST)
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 ECDHE (P-256) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4NnQB01lDCz4y0W;
Thu, 5 Jan 2023 10:03:04 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1672873385;
bh=YB0hJcpraawuKA1dE5txTbZJubHg4syLjM+ce6VinJI=;
h=Date:From:To:Cc:Subject:From;
b=U1l29gCWEE3CA0htK9qJVDQNQdqmJqpXjGX1STDqp07j8lwBzx8b/5hcBA+Vxn8eK
QChZdv+lG67w9CDW8E3lpXD6LJTjwxlXKlGUfQkDfPZJ1V97wB03uooU3kS5dU0t0B
7m7dcsqyVPz+pKPC4VL+OiToNPk1RbBnJHZprbF74HKUdrxPuVOyfNTtGFAKfj0VJx
lqa2n3CmlGE8yMhBxQAezI7LYbmLHMSgyUdSXv8KcltS6O3poHqIDwRqSAXx+/g3TY
QYiieDMPu7nfkuSAcJ+5n9/O4vOWroSqiFmpIlSwzczzO+XjYNdEvtSyefxEYtrnVs
q71Uu9/NuZ9oQ==
Date: Thu, 5 Jan 2023 10:03:02 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
Zhang Rui <rui.zhang@intel.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Daniel Lezcano <daniel.lezcano@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Subject: linux-next: manual merge of the thermal tree with the pm tree
Message-ID: <20230105100302.00b1c5cd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Th_1jjRpUTa/0Qt/QlTJHeC";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1754135093983569763?=
X-GMAIL-MSGID: =?utf-8?q?1754135093983569763?=
|
| Series |
linux-next: manual merge of the thermal tree with the pm tree
|
|
Commit Message
Stephen Rothwell
Jan. 4, 2023, 11:03 p.m. UTC
Hi all,
Today's linux-next merge of the thermal tree got a conflict in:
drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
between commit:
d91a4714e54e ("thermal/int340x/processor_thermal: Use Intel TCC library")
from the pm tree and commit:
e503a68ebfe3 ("thermal/intel/int340x: Replace parameter to simplify")
from the thermal 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.
diff --cc drivers/thermal/intel/int340x_thermal/processor_thermal_device.c index a2ea22f2bffd,317703027ce9..000000000000 --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c