Skip to contentSkip to conversation

OK to base some patches on lmb branch?

DISCUSSION Tony Lindgren 2 participants 3 messages Jul 7, 2010 – Aug 2, 2010

lore
Share & tools
lore
#0 lore raw

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

#1 lore raw
Quoted 3 lines · Tony Lindgren

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.

#2 lore raw
Quoted 8 lines · Russell King - ARM Linux
Quoted 3 lines · Tony Lindgren

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