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
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree
Date: Tue, 11 Nov 2014 08:53:44 -0600 [thread overview]
Message-ID: <20141111145344.GD25615@saruman> (raw)
In-Reply-To: <20141111162322.7be1fade@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
On Tue, Nov 11, 2014 at 04:23:22PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/dwc3/ep0.c between commit 520fe7633692 ("usb: dwc3: ep0:
> fix for dead code") from the usb-gadget-fixes tree and commit
> ccb072de5702 ("usb: dwc3: ep0: trace ep0 TRBs too") from the usb-gadget
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
resolution looks good to me. Thank you
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
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>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree
Date: Tue, 11 Nov 2014 08:53:44 -0600 [thread overview]
Message-ID: <20141111145344.GD25615@saruman> (raw)
In-Reply-To: <20141111162322.7be1fade@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
On Tue, Nov 11, 2014 at 04:23:22PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/dwc3/ep0.c between commit 520fe7633692 ("usb: dwc3: ep0:
> fix for dead code") from the usb-gadget-fixes tree and commit
> ccb072de5702 ("usb: dwc3: ep0: trace ep0 TRBs too") from the usb-gadget
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
resolution looks good to me. Thank you
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-11-11 14:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-11 5:23 linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree Stephen Rothwell
2014-11-11 14:53 ` Felipe Balbi [this message]
2014-11-11 14:53 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2016-04-20 3:28 Stephen Rothwell
2014-08-22 19:57 Stephen Rothwell
2014-08-22 19:57 ` Stephen Rothwell
2014-08-22 20:48 ` Felipe Balbi
2014-08-22 20:48 ` Felipe Balbi
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=20141111145344.GD25615@saruman \
--to=balbi@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.