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;
Date:   Thu, 17 Nov 2022 12:29:04 +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:     Guenter Roeck <linux@roeck-us.net>,
        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: <20221117122904.6759427e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ZrAe3J9UC6yBWIu=QNLLhrx";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/ZrAe3J9UC6yBWIu=QNLLhrx
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the thermal tree got a conflict in:

  drivers/thermal/thermal_sysfs.c

between commit:

  05eeee2b51b4 ("thermal/core: Protect sysfs accesses to thermal operations=
 with thermal zone mutex")

from the pm tree and commits:

  dca20ad5acb7 ("thermal/core: Add a generic thermal_zone_get_trip() functi=
on")
  aed8b46d141c ("thermal/core: Add a generic thermal_zone_set_trip() functi=
on")

from the thermal tree.

This was just too painful to fix up, so please fix it yourselves or
supply me with a resolution.

I have dropped the thermal tree for today.

--=20
Cheers,
Stephen Rothwell

--Sig_/ZrAe3J9UC6yBWIu=QNLLhrx
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN1jmEACgkQAVBC80lX
0Gw5JAf+InuoFbcBGvMK06drQZHaw3V7I4Ip58ojEaqwaXh8L8NidKx+4FDqihs2
3inCYcQF73aFWITgeiaN9lXHxY4vh9pb8TghAifiwgeffgU4n/anraheIrk1DbKd
BdY2/PeqkF16N26fOHqXtqLz89gRdcNlWXbKuqsVQSgA8V0ZOmeZaMjuyehcX937
JpFRhZjgjS/s9onE8oI8YITkPDNkINNE4Gcs7FGlLvd7BzqlPCAnU3KNNYzfMZQR
J78w9nVhu/YZ3X/gvS9um3ff8HY4KOeNJQQ/RqnyT6gPnoUEChRWufRLhJHDVPUR
F4wGWy9ICmRYTdSjgHhYx8R1/hucvA==
=YhCn
-----END PGP SIGNATURE-----

--Sig_/ZrAe3J9UC6yBWIu=QNLLhrx--