[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5710C86A.9060108@ti.com>
Date: Fri, 15 Apr 2016 13:54:34 +0300
From: Roger Quadros <rogerq@...com>
To: Boris Brezillon <boris.brezillon@...e-electrons.com>,
<javier@...hile0.org>, <fcooper@...com>, <nsekhar@...com>,
<linux-mtd@...ts.infradead.org>, <linux-omap@...r.kernel.org>
CC: Tony Lindgren <tony@...mide.com>, <computersforpeace@...il.com>,
<dwmw2@...radead.org>, <ezequiel@...guardiasur.com.ar>,
<devicetree@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v6 00/17] memory: omap-gpmc: mtd: nand: Support GPMC NAND
on non-OMAP platforms
On 15/04/16 13:09, Boris Brezillon wrote:
> Hi Roger,
>
> On Fri, 15 Apr 2016 12:34:04 +0300
> Roger Quadros <rogerq@...com> wrote:
>
>> Tony & Boris,
>>
>> On 14/04/16 00:25, Tony Lindgren wrote:
>>> * Roger Quadros <rogerq@...com> [160407 03:10]:
>>>> Hi,
>>>>
>>>> As this series has cross dependency between omap and mtd subsystems,
>>>> I'll set up a immutable branch which omap-soc and l2-mtd must
>>>> merge in together to avoid any conflicts/breakage during integration.
>>>>
>>>> Brian has acked all mtd patches. Tony needs to give his Ack for the
>>>> gpmc driver part and then I can provide the immutable branch.
>>>
>>> Looks good to me, please feel free to add:
>>>
>>> Acked-by: Tony Lindgren <tony@...mide.com>
>>>
>>
>> I've added Tony and Rob's Acked-by tags and pushed the patches at the
>> below PULL request.
>>
>> Please take this into omap-soc and l2-mtd trees. Thanks.
>
> I Pulled this branch into nand/next and had to resolve a few conflicts
> (as you may have noticed, a few other reworks in the NAND and MTD layer
> have been merged in the meantime).
OK. I'm not sure how well this will play when this merges into liunx-next
via the omap-soc tree.
Instead, can you please create a non-mutable nand/base for me (which could be
today's nand/next) and I can base my branch on that and Tony can use my
branch without causing any merge-conflict in linux-next?
If this doesn't look OK please advice an alternative. Thanks.
cheers,
-roger
>
> It compiles, but I'm not sure it works correctly (I pushed the result
> to nand/next-with-gpmc-rework [1]). Could you test it before I push this
> to nand/next?
>
> Thanks,
>
> Boris
>
> [1]https://github.com/linux-nand/linux/tree/nand/next-with-gpmc-rework
>
>
Powered by blists - more mailing lists