From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Shailendra Verma <shailendra.capricorn@gmail.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: linux-next: manual merge of the arm-soc tree with Linus' tree
Date: Mon, 24 Aug 2015 09:55:48 +1000 [thread overview]
Message-ID: <20150824095548.6bb25c3a@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
drivers/cpufreq/exynos-cpufreq.c
between commit:
62c3f2fddd43 ("cpufreq: exynos: Fix for memory leak in case SoC name does not match")
from Linus' tree and commits:
ac4c90c82e4d ("cpufreq: exynos: remove exynos5250 specific cpufreq driver support")
966f2a71a92d ("cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support")
from the arm-soc tree.
I fixed it up (the latter commit removed the file, so I did that) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2015-08-23 23:55 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-23 23:55 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-27 0:39 linux-next: manual merge of the arm-soc tree with Linus' tree Stephen Rothwell
2022-05-27 15:38 ` Hawkins, Nick
2022-05-28 0:29 ` Stephen Rothwell
2019-06-23 22:54 Stephen Rothwell
2018-10-28 23:14 Stephen Rothwell
2018-10-29 15:02 ` Tony Lindgren
2018-10-28 23:08 Stephen Rothwell
2016-09-05 0:58 Stephen Rothwell
2016-09-05 18:26 ` Russell King - ARM Linux
2016-09-06 10:17 ` Arnd Bergmann
2016-09-06 10:42 ` Russell King - ARM Linux
2016-09-25 16:07 ` Robert Jarzmik
2016-01-20 22:40 Stephen Rothwell
2015-06-01 0:25 Stephen Rothwell
2015-06-01 7:12 ` Michal Simek
2014-01-30 0:19 Stephen Rothwell
2014-01-30 5:33 ` Kevin Hilman
2014-01-30 21:47 ` Mike Turquette
2014-01-23 0:23 Stephen Rothwell
2013-08-27 8:29 Stephen Rothwell
2013-08-27 16:17 ` Stephen Warren
2013-08-28 0:06 ` Stephen Rothwell
2013-08-27 8:26 Stephen Rothwell
2013-07-08 4:03 Stephen Rothwell
2013-03-18 3:49 Stephen Rothwell
2012-10-04 4:33 Stephen Rothwell
2012-07-30 2:53 Stephen Rothwell
2012-03-15 6:50 Stephen Rothwell
2012-03-15 9:51 ` Laurent Pinchart
2012-03-15 20:01 ` Arnd Bergmann
2012-03-15 21:36 ` Rafael J. Wysocki
2012-03-08 6:07 Stephen Rothwell
2011-11-24 0:58 Stephen Rothwell
2011-11-24 15:55 ` Arnd Bergmann
2011-11-06 23:33 Stephen Rothwell
2011-11-07 19:07 ` Arnd Bergmann
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=20150824095548.6bb25c3a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=b.zolnierkie@samsung.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rafael.j.wysocki@intel.com \
--cc=shailendra.capricorn@gmail.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).