From: Greg KH <greg@kroah.com>
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,
Thierry Reding <thierry.reding@avionic-design.de>
Subject: Re: linux-next: manual merge of the pinctrl tree with the driver-core tree
Date: Tue, 22 Jan 2013 21:03:14 -0800 [thread overview]
Message-ID: <20130123050314.GA3450@kroah.com> (raw)
In-Reply-To: <20130123155852.e8b35c4e85b0c65c4635b422@canb.auug.org.au>
On Wed, Jan 23, 2013 at 03:58:52PM +1100, Stephen Rothwell wrote:
> Hi Linus,
>
> Today's linux-next merge of the pinctrl tree got a conflict in
> drivers/pinctrl/pinctrl-nomadik.c between commit 9e0c1fb29a7c ("pinctrl:
> Convert to devm_ioremap_resource()") from the driver-core tree and commit
> 50f690d85e4e ("pinctrl/nomadik: simplify GPIO probe") from the pinctrl
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2013-01-23 5:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 4:58 linux-next: manual merge of the pinctrl tree with the driver-core tree Stephen Rothwell
2013-01-23 5:03 ` Greg KH [this message]
2013-01-23 8:28 ` Linus Walleij
-- strict thread matches above, loose matches on Subject: below --
2014-11-10 6:29 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=20130123050314.GA3450@kroah.com \
--to=greg@kroah.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=thierry.reding@avionic-design.de \
/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).