[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sun, 10 Oct 2010 00:02:06 -0600
From: Grant Likely <grant.likely@...retlab.ca>
To: Michal Simek <monstr@...str.eu>,
Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-kernel@...r.kernel.org, john.williams@...alogix.com,
edgar.iglesias@...il.com, duyl@...inx.com, linnj@...inx.com,
microblaze-uclinux@...e.uq.edu.au
Subject: Re: Microblaze little-endian port + driver changes
On Tue, Sep 28, 2010 at 11:52 PM, Michal Simek <monstr@...str.eu> wrote:
> Hi everybody,
>
> here is the first bunch of patches which is necessary to apply
> to get microblaze little-endian AXI version work.
>
> All patches are placed in microblaze-next branch and they are also
> merged to linux-next branch.
>
> Grant: I would like to ask you if you can please take a look
> at little-endian driver changes.
[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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists