* OK to base some patches on lmb branch?
@ 2010-07-07 10:52 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2010-07-07 10:52 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: linux-omap
Hi Russell,
Is your lmb branch going to stay static?
I'd like to base a patch unifying omap3 map_io on top of that
to avoid merge conflicts:
https://patchwork.kernel.org/patch/108775/
Otherwise it will conflict with your LMB related patch
"Convert to use ->reserve method to reserve boot time memory".
Regards,
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
* OK to base some patches on lmb branch?
@ 2010-07-07 10:52 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2010-07-07 10:52 UTC (permalink / raw)
To: linux-arm-kernel
Hi Russell,
Is your lmb branch going to stay static?
I'd like to base a patch unifying omap3 map_io on top of that
to avoid merge conflicts:
https://patchwork.kernel.org/patch/108775/
Otherwise it will conflict with your LMB related patch
"Convert to use ->reserve method to reserve boot time memory".
Regards,
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: OK to base some patches on lmb branch?
2010-07-07 10:52 ` Tony Lindgren
@ 2010-07-09 14:49 ` Russell King - ARM Linux
-1 siblings, 0 replies; 6+ messages in thread
From: Russell King - ARM Linux @ 2010-07-09 14:49 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-arm-kernel, linux-omap
On Wed, Jul 07, 2010 at 01:52:14PM +0300, Tony Lindgren wrote:
> Hi Russell,
>
> Is your lmb branch going to stay static?
Not at the moment, I'm still tweaking things in there, and the main
lmb conversion commit needs a better description... I think there's
also a few bits missing from the discontigmem removal patch.
^ permalink raw reply [flat|nested] 6+ messages in thread
* OK to base some patches on lmb branch?
@ 2010-07-09 14:49 ` Russell King - ARM Linux
0 siblings, 0 replies; 6+ messages in thread
From: Russell King - ARM Linux @ 2010-07-09 14:49 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 07, 2010 at 01:52:14PM +0300, Tony Lindgren wrote:
> Hi Russell,
>
> Is your lmb branch going to stay static?
Not at the moment, I'm still tweaking things in there, and the main
lmb conversion commit needs a better description... I think there's
also a few bits missing from the discontigmem removal patch.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: OK to base some patches on lmb branch?
2010-07-09 14:49 ` Russell King - ARM Linux
@ 2010-08-02 13:16 ` Tony Lindgren
-1 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2010-08-02 13:16 UTC (permalink / raw)
To: Russell King - ARM Linux; +Cc: linux-arm-kernel, linux-omap
* Russell King - ARM Linux <linux@arm.linux.org.uk> [100709 17:42]:
> On Wed, Jul 07, 2010 at 01:52:14PM +0300, Tony Lindgren wrote:
> > Hi Russell,
> >
> > Is your lmb branch going to stay static?
>
> Not at the moment, I'm still tweaking things in there, and the main
> lmb conversion commit needs a better description... I think there's
> also a few bits missing from the discontigmem removal patch.
Back online now from a vacation.
I have separated the omap common map_io patches into a branch based
on your lmb branch and merged into omap for-next.
Will not merge into omap-for-linus until I have a confirmation
from you it will stay static.
Regards,
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
* OK to base some patches on lmb branch?
@ 2010-08-02 13:16 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2010-08-02 13:16 UTC (permalink / raw)
To: linux-arm-kernel
* Russell King - ARM Linux <linux@arm.linux.org.uk> [100709 17:42]:
> On Wed, Jul 07, 2010 at 01:52:14PM +0300, Tony Lindgren wrote:
> > Hi Russell,
> >
> > Is your lmb branch going to stay static?
>
> Not at the moment, I'm still tweaking things in there, and the main
> lmb conversion commit needs a better description... I think there's
> also a few bits missing from the discontigmem removal patch.
Back online now from a vacation.
I have separated the omap common map_io patches into a branch based
on your lmb branch and merged into omap for-next.
Will not merge into omap-for-linus until I have a confirmation
from you it will stay static.
Regards,
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-08-02 13:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-07 10:52 OK to base some patches on lmb branch? Tony Lindgren
2010-07-07 10:52 ` Tony Lindgren
2010-07-09 14:49 ` Russell King - ARM Linux
2010-07-09 14:49 ` Russell King - ARM Linux
2010-08-02 13:16 ` Tony Lindgren
2010-08-02 13:16 ` Tony Lindgren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.