* linux-next: manual merge of the nand tree with the jc_docs tree
@ 2017-05-30 1:37 Stephen Rothwell
2017-05-30 7:21 ` Boris Brezillon
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2017-05-30 1:37 UTC (permalink / raw)
To: Boris Brezillon, Jonathan Corbet
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Mauro Carvalho Chehab
Hi Boris,
Today's linux-next merge of the nand tree got a conflict in:
drivers/mtd/nand/nand_base.c
between commit:
b6f6c29454d2 ("mtd: adjust kernel-docs to avoid Sphinx/kerneldoc warnings")
from the jc_docs tree and commit:
c79d63fd272c ("mtd: nand: Remove support for block locking/unlocking")
from the nand tree.
I fixed it up (the latter just removed the code modified by the former,
so I did 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the nand tree with the jc_docs tree
2017-05-30 1:37 linux-next: manual merge of the nand tree with the jc_docs tree Stephen Rothwell
@ 2017-05-30 7:21 ` Boris Brezillon
0 siblings, 0 replies; 2+ messages in thread
From: Boris Brezillon @ 2017-05-30 7:21 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jonathan Corbet, Linux-Next Mailing List,
Linux Kernel Mailing List, Mauro Carvalho Chehab
Hi Stephen,
On Tue, 30 May 2017 11:37:23 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Boris,
>
> Today's linux-next merge of the nand tree got a conflict in:
>
> drivers/mtd/nand/nand_base.c
>
> between commit:
>
> b6f6c29454d2 ("mtd: adjust kernel-docs to avoid Sphinx/kerneldoc warnings")
>
> from the jc_docs tree and commit:
>
> c79d63fd272c ("mtd: nand: Remove support for block locking/unlocking")
>
> from the nand tree.
>
> I fixed it up (the latter just removed the code modified by the former,
> so I did 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.
I just dropped commit c79d63fd272c from my nand/next branch. I'll queue
it for the next release.
Thanks,
Boris
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-30 7:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-30 1:37 linux-next: manual merge of the nand tree with the jc_docs tree Stephen Rothwell
2017-05-30 7:21 ` Boris Brezillon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox