Re: Microblaze little-endian port + driver changes

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Grant Likely
Date: Saturday, October 9, 2010 - 11:02 pm

On Tue, Sep 28, 2010 at 11:52 PM, Michal Simek <monstr@monstr.eu> wrote:

[cc'ing sfr re: pending linux-next merge conflict]

Hi Michal,

Can you please remove the following patches from your linux-next branch:

of: GPIO: Fix OF probing on little-endian systems
of: MTD: Fix OF probing on little-endian systems
of: Fix uart16550 initialization on little-endian systems

The emaclite patch can stay since it has a proper acked-by from both
davem and I.

I had picked up all three, and then later replaced the of_serial patch
with a better one. However, because it is also in your tree it will
cause a linux-next conflict when Stephen tries to merge.

For device tree patches that touch code outside of arch/microblaze, I
would like them to not show up in linux-next before I've acked them to
avoid this exact problem.  I don't have a problem with device tree
patches going in via another tree, but I need to know about it so that
I can keep things coordinated.

Stephen, when/if you see the conflict, please take the copy of
of_serial.c from my tree.

Thanks,
g.
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Microblaze little-endian port + driver changes, Michal Simek, (Tue Sep 28, 10:52 pm)
Re: Microblaze little-endian port + driver changes, Grant Likely, (Sat Oct 9, 11:02 pm)
Re: Microblaze little-endian port + driver changes, Michal Simek, (Sun Oct 10, 4:34 pm)