From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
arm@kernel.org, soc@kernel.org, linux-kernel@vger.kernel.org,
Krzysztof Kozlowski <krzk@kernel.org>
Subject: Re: [GIT PULL 2/2] memory: omap: drivers for v5.17
Date: Fri, 31 Dec 2021 13:18:03 +0100 [thread overview]
Message-ID: <20211231131803.08fb5d49@xps13> (raw)
In-Reply-To: <20211230164901.4fbf8cc3@xps13>
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
next prev parent reply other threads:[~2021-12-31 12:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-24 11:11 [GIT PULL 1/2] memory: drivers for v5.17 Krzysztof Kozlowski
2021-12-24 11:11 ` [GIT PULL 2/2] memory: omap: " Krzysztof Kozlowski
2021-12-30 15:49 ` Miquel Raynal
2021-12-31 12:18 ` Miquel Raynal [this message]
2022-01-08 22:00 ` [GIT PULL 1/2] memory: " patchwork-bot+linux-soc
2022-01-23 12:00 ` Krzysztof Kozlowski
2022-01-27 9:33 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211231131803.08fb5d49@xps13 \
--to=miquel.raynal@bootlin.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=krzk@kernel.org \
--cc=krzysztof.kozlowski@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=soc@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.