* linux-next: manual merge of the thermal tree with the jc_docs tree
@ 2019-08-23 2:04 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-08-23 2:04 UTC (permalink / raw)
To: Zhang Rui, Jonathan Corbet
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Mauro Carvalho Chehab
[-- Attachment #1: Type: text/plain, Size: 774 bytes --]
Hi all,
Today's linux-next merge of the thermal tree got a conflict in:
Documentation/driver-api/thermal/index.rst
between commit:
eaf7b46083a7 ("docs: thermal: add it to the driver API")
from the jc_docs tree and commit:
af3e0fe9c663 ("docs: thermal: add it to the driver API")
from the thermal tree.
I fixed it up (the former just has an SPDX tag at the top) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-08-23 2:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-23 2:04 linux-next: manual merge of the thermal tree with the jc_docs tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).