From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kevin Hilman <khilman@baylibre.com>,
Carlo Caione <carlo@caione.org>,
Linus Walleij <linus.walleij@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Deepak <deepak_das@mentor.com>
Subject: linux-next: manual merge of the amlogic tree with the pinctrl tree
Date: Thu, 15 Sep 2016 10:19:08 +1000 [thread overview]
Message-ID: <20160915101908.08f24fe1@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the amlogic tree got a conflict in:
drivers/base/pinctrl.c
between commit:
23b4ed268076 ("driver: base: pinctrl: return error from pinctrl_bind_pins()")
from the pinctrl tree and commit:
eb4ec68acf5e ("driver: base: pinctrl: return error from pinctrl_bind_pins()")
from the amlogic tree.
I fixed it up (I used the version from the pinctrl tree) 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:[~2016-09-15 0:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 0:19 Stephen Rothwell [this message]
2016-09-15 12:22 ` linux-next: manual merge of the amlogic tree with the pinctrl tree Linus Walleij
2016-09-15 21:18 ` Kevin Hilman
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=20160915101908.08f24fe1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=carlo@caione.org \
--cc=deepak_das@mentor.com \
--cc=khilman@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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