Re: [GIT PULL 2/2] memory: omap: drivers for v5.17

Miquel Raynal
2021-12-31T12:18:09Z

Hello,

miquel.raynal@bootlin.com wrote on Thu, 30 Dec 2021 16:49:01 +0100:

> Hi Krzysztof, Arnd, Olof,
>
> krzysztof.kozlowski@canonical.com wrote on Fri, 24 Dec 2021 12:11:24
> +0100:
>
> > Hi Arnd and Olof,
> >
> > Separate topic branch for omap-gpmc driver. This includes changes to
> > mtd-nand-omap2 driver (acked by Miquel) *which will conflict NAND tree*:
> >
> > 1. The "of_device_id omap_nand_ids" is moved to header
> > ../platform_data/mtd-nand-omap2.h.
> > 2. New compatible is added to above "of_device_id omap_nand_ids".
> >
> > One way to avoid pushing this conflict to Linus, would be if Miquel would
> > actually pull this request instead of soc tree.
>
> Sorry for the mess, I didn't spot the conflict when sending my Ack to
> Krysztof.
>
> I will pull this to simplify the handling.

Pulled into nand/next, thanks!

Miquèl