public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* Protocol for merging -omap changes
@ 2006-10-27 12:42 Pavel Machek
  2006-10-27 15:54 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: Pavel Machek @ 2006-10-27 12:42 UTC (permalink / raw)
  To: tony, Russell King, kernel list, vovan888

Hi!

I see that linux-omap still has pretty big difference from
linux-arm... are there any plans at merging them? Is there some way I
could help?

I have bunch of siemens sx1 changes from Vladimir here, and some of
them seem ready to merge... should they be merged with Tony? Or
directly with rmk bringing stuff from -omap tree as needed?
								Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Protocol for merging -omap changes
  2006-10-27 12:42 Protocol for merging -omap changes Pavel Machek
@ 2006-10-27 15:54 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2006-10-27 15:54 UTC (permalink / raw)
  To: Pavel Machek; +Cc: Russell King, kernel list, vovan888

Hi,

* Pavel Machek <pavel@ucw.cz> [061027 15:43]:
> Hi!
> 
> I see that linux-omap still has pretty big difference from
> linux-arm... are there any plans at merging them? Is there some way I
> could help?

Yeah, let's get more of the commonly used omap drivers merged!
 
> I have bunch of siemens sx1 changes from Vladimir here, and some of
> them seem ready to merge... should they be merged with Tony? Or
> directly with rmk bringing stuff from -omap tree as needed?

Core omap stuff goes first to linux-omap tree, and then gets merged
to mainline kernel through RMK. Drivers should go through the
appropriate driver maintainers or LKML.

So please split your patches accordingly. All arch/arm/*omap* and
include/asm-arm/arch-omap patches should be separate from drivers.

Regards,

Tony

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2006-10-27 15:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-27 12:42 Protocol for merging -omap changes Pavel Machek
2006-10-27 15:54 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox