From: Felipe Balbi <balbi@ti•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Alexandre Courbot <gnurou@gmail•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Felipe Balbi <balbi@ti•com>, Greg KH <greg@kroah•com>
Subject: Re: linux-next: manual merge of the gen-gpio tree with the usb tree
Date: Wed, 17 Apr 2013 09:37:36 +0300 [thread overview]
Message-ID: <20130417063736.GA10582@arwen.pp.htv.fi> (raw)
In-Reply-To: <20130417154715.cd3036b3cc791800938119c4@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 606 bytes --]
Hi,
On Wed, Apr 17, 2013 at 03:47:15PM +1000, Stephen Rothwell wrote:
> Hi Alexandre,
>
> Today's linux-next merge of the gen-gpio tree got a conflict in
> drivers/usb/otg/Kconfig between commit a0e631235a04 ("usb: phy: move all
> PHY drivers to drivers/usb/phy/") from the usb tree and commit
> 76ec9d18b897 ("Convert selectors of GENERIC_GPIO to GPIOLIB") from the
> gen-gpio tree.
>
> The former patch removed the file, so I did that and then applied the
> following patch and can carry the fix as necessary (no action is
> required).
Thanks Stephen, looks alright :-)
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-04-17 6:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-17 5:47 linux-next: manual merge of the gen-gpio tree with the usb tree Stephen Rothwell
2013-04-17 6:37 ` Felipe Balbi [this message]
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=20130417063736.GA10582@arwen.pp.htv.fi \
--to=balbi@ti$(echo .)com \
--cc=gnurou@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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