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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20211231131803.08fb5d49@xps13>
Date:   Fri, 31 Dec 2021 13:18:03 +0100
From:   Miquel Raynal <miquel.raynal@...tlin.com>
To:     Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>
Cc:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        arm@...nel.org, soc@...nel.org, linux-kernel@...r.kernel.org,
        Krzysztof Kozlowski <krzk@...nel.org>
Subject: Re: [GIT PULL 2/2] memory: omap: drivers for v5.17

Hello,

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

> Hi Krzysztof, Arnd, Olof,
> 
> krzysztof.kozlowski@...onical.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