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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 881 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Miquel Raynal]

Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> 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

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

[Miquel Raynal]

Hi Stephen,

Miquel Raynal <miquel.raynal@bootlin.com> wrote on Thu, 27 Jun 2019
16:51:37 +0200:

> Hi Stephen,
> 
> Stephen Rothwell <sfr@canb.auug.org.au> 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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 788 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]