From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Boris Brezillon <boris.brezillon@free-electrons.com>,
Jonathan Corbet <corbet@lwn.net>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Mauro Carvalho Chehab <mchehab@s-opensource.com>
Subject: linux-next: manual merge of the nand tree with the jc_docs tree
Date: Tue, 30 May 2017 11:37:23 +1000 [thread overview]
Message-ID: <20170530113723.5b7ac9f1@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-05-30 1:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-30 1:37 Stephen Rothwell [this message]
2017-05-30 7:21 ` linux-next: manual merge of the nand tree with the jc_docs tree Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170530113723.5b7ac9f1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=boris.brezillon@free-electrons.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@s-opensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox