From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <yamada.masahiro@socionext.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicolas Dichtel <nicolas.dichtel@6wind.com>,
Naohiro Aota <naota@elisp.net>
Subject: linux-next: manual merge of the kbuild tree with the input-current tree
Date: Tue, 28 Mar 2017 09:55:32 +1100 [thread overview]
Message-ID: <20170328095532.04abad61@canb.auug.org.au> (raw)
Hi Masahiro,
Today's linux-next merge of the kbuild tree got a conflict in:
include/uapi/linux/Kbuild
between commit:
5659495a7a14 ("uapi: add missing install of userio.h")
from the input-current tree and commit:
65017bab8a9e ("uapi: export all headers under uapi directories")
from the kbuild tree.
I fixed it up (the latter supercedes the former, so I just used it) 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-03-27 22:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-27 22:55 Stephen Rothwell [this message]
2017-03-28 0:52 ` linux-next: manual merge of the kbuild tree with the input-current tree Masahiro Yamada
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=20170328095532.04abad61@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=naota@elisp.net \
--cc=nicolas.dichtel@6wind.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