From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Eduardo Valentin <edubezval@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Zhang Rui <rui.zhang@intel•com>,
Sascha Hauer <s.hauer@pengutronix•de>
Subject: linux-next: manual merge of the thermal-soc tree with the thermal tree
Date: Mon, 4 Jul 2016 12:55:22 +1000 [thread overview]
Message-ID: <20160704125522.011806af@canb.auug.org.au> (raw)
Hi Eduardo,
Today's linux-next merge of the thermal-soc tree got conflicts in:
drivers/thermal/thermal_core.c
drivers/thermal/thermal_helpers.c
drivers/thermal/thermal_sysfs.c
between commits from the thermal tree and the same (or similar) patches
from the thermal-soc tree.
It looks like a the patches have been slightly changed when applied to the
thermal tree and then more commist have been applied to the thermal-soc
tree, so there are a few conflicts generated. Please fix up these trees.
I fixed it up (I used what seemed the appropriate versions - which may
or may not be the right ones) and can carry the fixes 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
next reply other threads:[~2016-07-04 2:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 2:55 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-08-04 1:29 linux-next: manual merge of the thermal-soc tree with the thermal tree Stephen Rothwell
2015-03-24 2:11 Stephen Rothwell
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=20160704125522.011806af@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=edubezval@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rui.zhang@intel$(echo .)com \
--cc=s.hauer@pengutronix$(echo .)de \
/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