From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Grant Likely <grant.likely@secretlab•ca>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Bill Pemberton <wfp5p@virginia•edu>,
Linus Walleij <linus.walleij@linaro•org>
Subject: Re: linux-next: manual merge of the gpio tree with the driver-core tree
Date: Wed, 28 Nov 2012 21:17:19 -0800 [thread overview]
Message-ID: <20121129051719.GC4375@kroah.com> (raw)
In-Reply-To: <20121129155723.60035c6419fd9a00f46e4d69@canb.auug.org.au>
On Thu, Nov 29, 2012 at 03:57:23PM +1100, Stephen Rothwell wrote:
> Hi Grant,
>
> Today's linux-next merge of the gpio tree got a conflict in
> drivers/gpio/gpio-em.c between commit 3836309d9346 ("gpio: remove use of
> __devinit") from the driver-core tree and commit 7385500a49b7 ("gpio/em:
> convert to linear IRQ domain") from the gpio 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:[~2012-11-29 5:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2012-11-30 0:01 ` Grant Likely
-- strict thread matches above, loose matches on Subject: below --
2019-11-07 4:05 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=20121129051719.GC4375@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=grant.likely@secretlab$(echo .)ca \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=wfp5p@virginia$(echo .)edu \
/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