From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linus Walleij <linus.walleij@linaro.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Laxman Dewangan <ldewangan@nvidia.com>,
"Andrew F. Davis" <afd@ti.com>
Subject: Re: linux-next: manual merge of the gpio tree with the mfd tree
Date: Wed, 9 Mar 2016 12:35:23 +0700 [thread overview]
Message-ID: <20160309053523.GN13692@x1> (raw)
In-Reply-To: <20160309143725.412f97b3@canb.auug.org.au>
On Wed, 09 Mar 2016, Stephen Rothwell wrote:
> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> drivers/gpio/gpio-tps65912.c
>
> between commits:
>
> 65b6555971d0 ("mfd: tps65912: Remove old driver in preparation for new driver")
> ca801a22f465 ("gpio: tps65912: Add GPIO driver for the TPS65912 PMIC")
>
> from the mfd tree and commit:
>
> 0964ac703edf ("gpio: tps65912: Use devm_gpiochip_add_data() for gpio registration")
>
> from the gpio tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
I sent out a pull-request for this already.
Please pull 'ib-mfd-regulator-gpio-4.6' from my tree.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2016-03-09 5:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 3:37 linux-next: manual merge of the gpio tree with the mfd tree Stephen Rothwell
2016-03-09 5:35 ` Lee Jones [this message]
2016-03-09 10:41 ` Linus Walleij
-- strict thread matches above, loose matches on Subject: below --
2019-06-28 7:28 Stephen Rothwell
2019-07-09 0:15 ` Stephen Rothwell
2019-07-09 13:20 ` Linus Walleij
2016-02-16 3:33 Stephen Rothwell
2011-06-22 3:51 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=20160309053523.GN13692@x1 \
--to=lee.jones@linaro.org \
--cc=afd@ti.com \
--cc=ldewangan@nvidia.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).