linux-next: manual merge of the nand tree with Linus' tree

Hi all, Today's linux-next merge of the nand tree got a conflict in: drivers/mtd/nand/raw/mtk_ecc.h between commit: d2912cb15bdd ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500") from Linus' tree and commit: b74e6985bfe8 ("mtd: rawnand: mtk: Re-license MTK NAND

Re: linux-next: manual merge of the nand tree with Linus' tree

Hi Stephen, Miquel Raynal wrote on Thu, 27 Jun 2019 16:51:37 +0200: > Hi Stephen, > > Stephen Rothwell wrote on Tue, 4 Jun 2019 > 10:54:18 +1000: > > > Hi all, > > > > Today's linux-next merge of the nand tree got a conflict in: > > > >

Re: linux-next: manual merge of the nand tree with Linus' tree

Hi Stephen, Stephen Rothwell wrote on Tue, 4 Jun 2019 10:54:18 +1000: > Hi all, > > Today's linux-next merge of the nand tree got a conflict in: > > Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt > > between commit: > > a5f2246fb913 ("dt: bindings: mtd: replace references to

linux-next: manual merge of the nand tree with Linus' tree

Hi all, Today's linux-next merge of the nand tree got a conflict in: Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt between commit: a5f2246fb913 ("dt: bindings: mtd: replace references to nand.txt with nand-controller.yaml") from Linus' tree and commit: 33cc5bd0b87a

linux-next: manual merge of the nand tree with Linus' tree

Hi Boris, Today's linux-next merge of the nand tree got a conflict in: drivers/mtd/nand/Kconfig between commit: f23def803861 ("mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA") from Linus' tree and commit: 93db446a424c ("mtd: nand: move raw NAND related code to the raw/ subdir")

linux-next: manual merge of the nand tree with Linus' tree

Hi Boris, Today's linux-next merge of the nand tree got a conflict in: drivers/mtd/nand/Kconfig between commit: f23def803861 ("mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA") from Linus' tree and commit: 93db446a424c ("mtd: nand: move raw NAND related code to the raw/ subdir")