From: Mark Brown <broonie@kernel.org>
To: Zhang Rui <rui.zhang@intel.com>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Jonathan Corbet <corbet@lwn.net>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the thermal tree with Linus' tree
Date: Fri, 20 Sep 2019 13:46:28 +0100 [thread overview]
Message-ID: <20190920124628.GE3822@sirena.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 812 bytes --]
Hi all,
Today's linux-next merge of the thermal tree got conflicts in:
Documentation/driver-api/thermal/index.rst
Documentation/driver-api/thermal/sysfs-api.rst
Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst
between commit:
eaf7b46083a7e34 ("docs: thermal: add it to the driver API")
from Linus' tree and commit:
af3e0fe9c66370a ("docs: thermal: add it to the driver API")
from the thermal tree.
I fixed it up 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-09-20 12:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 12:46 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-08-14 23:20 linux-next: manual merge of the thermal tree with Linus' tree Stephen Rothwell
2021-09-26 23:50 Stephen Rothwell
2012-11-05 0:46 Stephen Rothwell
2012-11-05 1:17 ` Zhang Rui
2012-11-05 6:47 ` Zhang Rui
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=20190920124628.GE3822@sirena.co.uk \
--to=broonie@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).