Skip to contentSkip to conversation

Protocol for merging -omap changes

DISCUSSION Pavel Machek 2 participants 2 messages Oct 27, 2006

lore
Share & tools
lore
#0 lore raw

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

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#1 lore raw

Hi,

Quoted 5 lines · Pavel Machek

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!

Quoted 3 lines

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