From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Walleij <linus.walleij@linaro.org>, Greg KH <greg@kroah.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Thierry Reding <treding@nvidia.com>
Subject: linux-next: manual merge of the gpio tree with the driver-core tree
Date: Thu, 7 Nov 2019 15:05:50 +1100 [thread overview]
Message-ID: <20191107150550.15df2f35@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]
Hi all,
Today's linux-next merge of the gpio tree got a conflict in:
drivers/gpio/gpio-tegra186.c
between commit:
cc4c831811c2 ("gpio: tegra186: use devm_platform_ioremap_resource_byname()")
from the driver-core tree and commit:
2a3655056730 ("gpio: tegra186: Implement wake event support")
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-tegra186.c
index ef40fbe923cf,8a2a69178925..000000000000
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@@ -407,6 -449,8 +449,7 @@@ static int tegra186_gpio_probe(struct p
unsigned int i, j, offset;
struct gpio_irq_chip *irq;
struct tegra_gpio *gpio;
+ struct device_node *np;
- struct resource *res;
char **names;
int err;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-11-07 4:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 4:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-29 4:57 linux-next: manual merge of the gpio tree with the driver-core tree Stephen Rothwell
2012-11-29 5:17 ` Greg KH
2012-11-30 0:01 ` Grant Likely
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=20191107150550.15df2f35@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bgolaszewski@baylibre.com \
--cc=greg@kroah.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=treding@nvidia.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;
as well as URLs for NNTP newsgroup(s).