Re: [GIT PULL] mtd: nand: Changes for 5.14

[Miquel Raynal <miquel.raynal@bootlin.com>]

Hi Vignesh,

Vignesh Raghavendra <vigneshr@ti.com> wrote on Fri, 25 Jun 2021
12:01:28 +0530:

> 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.

Mmmh right, I mixed the two in my mind. At least the sentence is ready
for the final PR :)

Thanks,
Miquèl

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/