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 driver as Dual MIT/GPL") from the nand tree. I fixed it up (I just used the latter version) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgp1fuk8HnAy1.pgp Description: OpenPGP digital signature
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: > > > > 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 ("dt-bindings: mtd: brcmnand: Make nand-ecc-strength and > > nand-ecc-step-size optional") > > > > from the nand tree. > > > > I fixed it up (the latter included the changes from the former, so I > > just used that) and can carry the fix as necessary. This is now fixed > > as far as linux-next is concerned, but any non trivial conflicts should > > be mentioned to your upstream maintainer when your tree is submitted for > > merging. You may also want to consider cooperating with the maintainer > > of the conflicting tree to minimise any particularly complex conflicts. > > > > Can you please share the fix? I might want to include it in the final > PR. > Actually I decided to rebase my branch to avoid all conflicts, no need for the fix, thanks. Miquèl
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 nand.txt with > nand-controller.yaml") > > from Linus' tree and commit: > > 33cc5bd0b87a ("dt-bindings: mtd: brcmnand: Make nand-ecc-strength and > nand-ecc-step-size optional") > > from the nand tree. > > I fixed it up (the latter included the changes from the former, so I > just used that) and can carry the fix as necessary. This is now fixed > as far as linux-next is concerned, but any non trivial conflicts should > be mentioned to your upstream maintainer when your tree is submitted for > merging. You may also want to consider cooperating with the maintainer > of the conflicting tree to minimise any particularly complex conflicts. > Can you please share the fix? I might want to include it in the final PR. Thanks, Miquèl
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 ("dt-bindings: mtd: brcmnand: Make nand-ecc-strength and nand-ecc-step-size optional") from the nand tree. I fixed it up (the latter included the changes from the former, so I just used that) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpnrnfBoAEci.pgp Description: OpenPGP digital signature
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") from the nand tree. I fixed it up (I used the latter version of this file and added the following merge fix patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen RothwellDate: Mon, 19 Feb 2018 09:48:17 +1100 Subject: [PATCH] mtd: nand: fix up for raw Kconfig move Signed-off-by: Stephen Rothwell --- drivers/mtd/nand/raw/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index e6b8c59f2c0d..736ac887303c 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -328,7 +328,7 @@ config MTD_NAND_MARVELL tristate "NAND controller support on Marvell boards" depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \ COMPILE_TEST - depends on HAS_IOMEM + depends on HAS_IOMEM && HAS_DMA help This enables the NAND flash controller driver for Marvell boards, including: -- 2.15.1 -- Cheers, Stephen Rothwell pgpnOryZN0tsY.pgp Description: OpenPGP digital signature
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") from the nand tree. I fixed it up (I used the latter version of this file and added the following merge fix patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Mon, 19 Feb 2018 09:48:17 +1100 Subject: [PATCH] mtd: nand: fix up for raw Kconfig move Signed-off-by: Stephen Rothwell --- drivers/mtd/nand/raw/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index e6b8c59f2c0d..736ac887303c 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -328,7 +328,7 @@ config MTD_NAND_MARVELL tristate "NAND controller support on Marvell boards" depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \ COMPILE_TEST - depends on HAS_IOMEM + depends on HAS_IOMEM && HAS_DMA help This enables the NAND flash controller driver for Marvell boards, including: -- 2.15.1 -- Cheers, Stephen Rothwell pgpnOryZN0tsY.pgp Description: OpenPGP digital signature