From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kamil Rytarowski <n54@gmx.com>
Subject: linux-next: manual merge of the jc_docs tree with the kbuild tree
Date: Mon, 26 Jun 2017 11:13:31 +1000 [thread overview]
Message-ID: <20170626111331.5443587b@canb.auug.org.au> (raw)
Hi Jonathan,
Today's linux-next merge of the jc_docs tree got a conflict in:
scripts/kernel-doc-xml-ref
between commit:
cb77f0d623ff ("scripts: Switch to more portable Perl shebang")
from the kbuild tree and commit:
52b3f239bb69 ("Docs: clean up some DocBook loose ends")
from the jc_docs tree.
I fixed it up (the latter removed the file, 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-06-26 1:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-26 1:13 Stephen Rothwell [this message]
2017-07-03 2:58 ` linux-next: manual merge of the jc_docs tree with the kbuild tree Stephen Rothwell
2017-07-03 16:43 ` Kamil Rytarowski
2017-07-03 18:13 ` Jonathan Corbet
2017-07-03 18:33 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-03-11 1:07 Stephen Rothwell
2026-01-26 16:41 Mark
2026-01-26 22:55 ` Nathan Chancellor
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=20170626111331.5443587b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=n54@gmx.com \
--cc=yamada.masahiro@socionext.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