From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] Consolidate clks_register() and similar
Date: Tue, 12 Jan 2010 17:35:16 +0000 [thread overview]
Message-ID: <20100112173516.GE5633@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <BD79186B4FD85F4B8E60E381CAEE190902089AA3@mi8nycmail19.Mi8.com>
On Tue, Jan 12, 2010 at 12:29:00PM -0500, H Hartley Sweeten wrote:
> On Tuesday, January 12, 2010 5:17 AM, Russell King wrote,
> > I don't think it's -rc material (not a bug fix) so 2.6.34.
>
> It's not a bug fix but due to how often people patch the various
> clock sources it might be better to get this is soon so that merge
> conflicts don't show up.
Things in the tables tends to change, rather than the code which sets
them up. I don't think there'll be much in the way of conflicts.
> >> This should take care of davinci. Tested on v2.6.33-rc3 + $SUBJECT patch.
> >
> > Shall I queue this for merging after my patch, or are there likely to
> > be conflicts in this area?
>
> BTW, arch/arm/mach-ep93xx/clock.c might need to be rebased due to you
> applying 5875/1 and 5879/1 to your git-curr (ep93xx branch).
It merged fine - more the problem was 5875/1 vs 5879/1 which could only
be applied with GNU patch with fuzz.
next prev parent reply other threads:[~2010-01-12 17:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-10 17:28 [PATCH] Consolidate clks_register() and similar Russell King - ARM Linux
2010-01-10 22:23 ` Jeremy Kerr
2010-01-10 23:12 ` Russell King - ARM Linux
2010-01-11 1:04 ` Ben Dooks
2010-01-11 17:26 ` H Hartley Sweeten
2010-01-11 17:28 ` Russell King - ARM Linux
2010-01-11 22:06 ` Kevin Hilman
2010-01-12 12:17 ` Russell King - ARM Linux
2010-01-12 17:29 ` H Hartley Sweeten
2010-01-12 17:35 ` Russell King - ARM Linux [this message]
2010-01-12 17:43 ` H Hartley Sweeten
2010-01-12 18:57 ` Russell King - ARM Linux
2010-01-12 19:16 ` Kevin Hilman
2010-01-12 0:11 ` Eric Miao
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=20100112173516.GE5633@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/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).