From: Vignesh Raghavendra <vigneshr@ti.com>
To: Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>
Cc: <linux-mtd@lists.infradead.org>,
Tudor Ambarus <Tudor.Ambarus@microchip.com>,
Frieder Schrempf <frieder.schrempf@kontron.de>
Subject: Re: [GIT PULL] mtd: nand: Changes for 5.14
Date: Fri, 25 Jun 2021 12:01:28 +0530 [thread overview]
Message-ID: <c02e435b-6c6e-ec6d-b912-e7bb997baa03@ti.com> (raw)
In-Reply-To: <20210623120125.1f02792e@xps13>
Hi Miquel,
On 6/23/21 3:31 PM, Miquel Raynal wrote:
> Hi Richard,
>
> This is the NAND PR for 5.14.
>
> This PR includes patches from the memory bus tree after merge of an
> immutable branch provided by Krzysztof Kozlowski; I hope this is the
> right way to handle such situation.
>
> There is also a known conflict with the devicetree tree which is trivial
> to resolve:
>
> 9b358af7c818 ("dt-bindings: mux: Convert mux controller
> bindings to schema") -> Updates all the files referencing the mux-controller.txt
> binding as the file name changed (s/txt/yaml/).
>
> 6947ad674944 ("dt-bindings: mtd: Convert ti, am654-hbmc.txt to
> YAML schema")
> -> Converts one of these files to yaml, the reference to
> mux-controller.{txt,yaml} being dropped during the conversion.
>
> It is then only needed to just take the ti,am654-hbmc yaml conversion
> as it is.
This commit is in mtd/next and not in nand/next. So this PR should not
result in conflict on ti,am654-hbmc.txt.
[...]
Regards
Vignesh
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2021-06-25 6:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 10:01 [GIT PULL] mtd: nand: Changes for 5.14 Miquel Raynal
2021-06-25 6:31 ` Vignesh Raghavendra [this message]
2021-06-25 7:44 ` Miquel Raynal
2021-06-30 10:56 ` Richard Weinberger
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=c02e435b-6c6e-ec6d-b912-e7bb997baa03@ti.com \
--to=vigneshr@ti.com \
--cc=Tudor.Ambarus@microchip.com \
--cc=frieder.schrempf@kontron.de \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox