From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki•net>,
Kukjin Kim <kgene.kim@samsung•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Shailendra Verma <shailendra.capricorn@gmail•com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung•com>
Subject: linux-next: manual merge of the pm tree with the samsung tree
Date: Mon, 17 Aug 2015 11:36:17 +1000 [thread overview]
Message-ID: <20150817113617.56d901e5@canb.auug.org.au> (raw)
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/cpufreq/exynos-cpufreq.c
between commit:
966f2a71a92d ("cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support")
from the samsung tree and commit:
62c3f2fddd43 ("cpufreq: exynos: Fix for memory leak in case SoC name does not match")
from the pm tree.
I fixed it up (I just removed the file) 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-17 1:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 1:36 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-19 2:51 linux-next: manual merge of the pm tree with the samsung tree Stephen Rothwell
2014-05-19 20:40 ` Rafael J. Wysocki
2014-05-20 0:27 ` Kukjin Kim
2014-05-20 12:48 ` Rafael J. Wysocki
2014-05-21 13:32 ` Kukjin Kim
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=20150817113617.56d901e5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=b.zolnierkie@samsung$(echo .)com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@rjwysocki$(echo .)net \
--cc=shailendra.capricorn@gmail$(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