From: Felipe Balbi <balbi@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@ti.com>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the tree
Date: Tue, 2 Apr 2013 11:41:39 +0300 [thread overview]
Message-ID: <20130402084139.GK30286@arwen.pp.htv.fi> (raw)
In-Reply-To: <20130402171143.ba5dc16d004310542d611b79@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
Hi,
On Tue, Apr 02, 2013 at 05:11:43PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/chipidea/udc.c between commit adf0f735e61a ("usb: chipidea:
> move debug files creation/removal to the core") from the usb tree and
> commit dc9e2873b740 ("usb: chipidea: let udc-core manage gadget->dev")
> from the usb-gadget tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
looks alright to me, thank you.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-04-02 8:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 6:11 Stephen Rothwell
2013-04-02 8:41 ` 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=20130402084139.GK30286@arwen.pp.htv.fi \
--to=balbi@ti.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=greg@kroah.com \
--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
all inboxes | Powered by JetHome®