From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Eduardo Valentin <edubezval@gmail•com>,
Russell King <linux@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Viresh Kumar <viresh.kumar@linaro•org>
Subject: linux-next: manual merge of the thermal-soc tree with the arm tree
Date: Mon, 17 Aug 2015 12:17:54 +1000 [thread overview]
Message-ID: <20150817121754.04736e67@canb.auug.org.au> (raw)
Hi Eduardo,
Today's linux-next merge of the thermal-soc tree got a conflict in:
drivers/thermal/cpu_cooling.c
between commit:
df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
from the arm tree and commits:
02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
from the thermal-soc tree.
I fixed it up (the first two look like two versions of the same patch,
so I used the version from the thermal-soc tree) and can carry the fix
as necessary (no action is required).
Russell: that commit in your tree has no Signed-off-by :-(
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-08-17 2:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 2:17 Stephen Rothwell [this message]
2015-08-17 2:24 ` linux-next: manual merge of the thermal-soc tree with the arm tree Viresh Kumar
2015-08-17 7:55 ` Russell King - ARM Linux
2015-08-17 8:03 ` Stephen Rothwell
2015-08-18 9:33 ` Eduardo Valentin
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=20150817121754.04736e67@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=linux@arm$(echo .)linux.org.uk \
--cc=viresh.kumar@linaro$(echo .)org \
/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