From: Dave Jones <davej@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russell King <rmk+kernel@arm.linux.org.uk>,
Kevin Hilman <khilman@ti.com>, Jaecheol Lee <jc.lee@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: Re: linux-next: manual merge of the cpufreq tree with the cpufreq-current tree
Date: Wed, 14 Mar 2012 23:41:12 -0400 [thread overview]
Message-ID: <20120315034111.GA31961@redhat.com> (raw)
In-Reply-To: <20120315132352.b8c8bbf0242c1f3b31333675@canb.auug.org.au>
On Thu, Mar 15, 2012 at 01:23:52PM +1100, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the cpufreq tree got a conflict in
> drivers/cpufreq/Makefile between commit b09db45c56c2 ("cpufreq: OMAP
> driver depends CPUfreq tables") from the cpufreq-current tree and commit
> a35c50510dd4 ("EXYNOS4X12: Add support cpufreq for EXYNOS4X12") from the
> cpufreq tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Argh, I've managed to get "for 3.4" patches on my fixes branch by mistake.
Given how close we are to 3.3 now, I'll just have Linus pull both branches
when 3.4 opens up.
thanks for catching this.
Dave
next prev parent reply other threads:[~2012-03-15 3:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 2:23 linux-next: manual merge of the cpufreq tree with the cpufreq-current tree Stephen Rothwell
2012-03-15 3:41 ` Dave Jones [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-08 2:39 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=20120315034111.GA31961@redhat.com \
--to=davej@redhat.com \
--cc=jc.lee@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=khilman@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/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