From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus Walleij <linus.walleij@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Vladimir Zapolskiy <vladimir_zapolskiy@mentor•com>,
Paul Gortmaker <paul.gortmaker@windriver•com>
Subject: linux-next: manual merge of the gpio tree with the pinctrl tree
Date: Tue, 13 Sep 2016 13:15:53 +1000 [thread overview]
Message-ID: <20160913131553.5d48be65@canb.auug.org.au> (raw)
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
drivers/gpio/gpio-mxc.c
between commit:
e188cbf7564f ("gpio: mxc: shift gpio_mxc_init() to subsys_initcall level")
from the pinctrl tree and commit:
2c8d6c869feb ("gpio: mxc: drop unused MODULE_ tags from non-modular code")
from the gpio tree.
I fixed it up (see below) 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
diff --cc drivers/gpio/gpio-mxc.c
index e38989a4fa0c,e35af5249478..000000000000
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@@ -515,10 -510,4 +515,4 @@@ static int __init gpio_mxc_init(void
{
return platform_driver_register(&mxc_gpio_driver);
}
-postcore_initcall(gpio_mxc_init);
+subsys_initcall(gpio_mxc_init);
-
- MODULE_AUTHOR("Freescale Semiconductor, "
- "Daniel Mack <danielncaiaq.de>, "
- "Juergen Beisert <kernel@pengutronix•de>");
- MODULE_DESCRIPTION("Freescale MXC GPIO");
- MODULE_LICENSE("GPL");
next reply other threads:[~2016-09-13 3:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 3:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-02-16 3:37 linux-next: manual merge of the gpio tree with the pinctrl tree Stephen Rothwell
2016-02-16 8:23 ` Geert Uytterhoeven
2016-02-16 10:16 ` Stephen Rothwell
2014-10-01 6:01 Stephen Rothwell
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=20160913131553.5d48be65@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul.gortmaker@windriver$(echo .)com \
--cc=vladimir_zapolskiy@mentor$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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