Date:   Wed, 25 Jan 2023 09:39:33 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Daniel Lezcano <daniel.lezcano@linaro.org>,
        Zhang Rui <rui.zhang@intel.com>
Cc:     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: <20230125093933.518d9010@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/8X56z72XDNrLkoib226AOCr";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  drivers/thermal/intel/intel_pch_thermal.c

between commit:

  fee19c692160 ("thermal: intel: intel_pch: Use generic trip points")

from the pm tree and commit:

  9e631aa90c97 ("thermal/drivers/intel: Use generic trip points for intel_p=
ch")

from the thermal tree.

These commits are very similar, so I just used the former version (since
it was newer).

I fixed it up (see above) 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

--Sig_/8X56z72XDNrLkoib226AOCr
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPQXiUACgkQAVBC80lX
0GwvqAf+O0y6gS41QyoyCFlF4r6xlLQ1YOChRhkMcbCSGIdzvPLTDro0H1SYHxQu
V8SGj6g0ioA9ZjBAD8H1dQ4pCl5R6fdO5yNhUjLKqPLSfS/NDuLMFvciA5HvojBw
T7T3bQyw8/bfuNF9ZV0/B/469VTAqrLqR5OohAgqysPr9RJMa1SDKC9GzXykWYYY
aMo3zEjIalwi3i6zoB1fbfWe2e3MeK2vS+nBtWJwXuHDCC8XxCx71KQ9xigIic/P
hIizv50yogd75u9H3+eaVVAFMaeGKCPxKRG7cuBXiZIxOqiDpcC6aBfuqwNDCLiP
kqpm2Abldm/dG6dmzqjWZ+0YehYrbw==
=mZkh
-----END PGP SIGNATURE-----

--Sig_/8X56z72XDNrLkoib226AOCr--