From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Zhang Rui <rui.zhang@intel•com>, Jonathan Corbet <corbet@lwn•net>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>
Subject: linux-next: manual merge of the thermal tree with the jc_docs tree
Date: Fri, 23 Aug 2019 12:04:54 +1000 [thread overview]
Message-ID: <20190823120454.654577c5@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2019-08-23 2:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190823120454.654577c5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+samsung@kernel$(echo .)org \
--cc=rui.zhang@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox