From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Felipe Balbi <balbi@ti.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree
Date: Tue, 11 Nov 2014 16:23:22 +1100 [thread overview]
Message-ID: <20141111162322.7be1fade@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 971 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/dwc3/ep0.c
index df38e7ef4976,4c86772126ed..000000000000
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@@ -791,10 -793,8 +793,12 @@@ static void dwc3_ep0_complete_data(stru
trb = dwc->ep0_trb;
+ trace_dwc3_complete_trb(ep0, trb);
+
+ r = next_request(&ep0->request_list);
+ if (!r)
+ return;
+
status = DWC3_TRB_SIZE_TRBSTS(trb->size);
if (status == DWC3_TRBSTS_SETUP_PENDING) {
dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-11 5:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-11 5:23 Stephen Rothwell [this message]
2014-11-11 14:53 ` linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree 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 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=20141111162322.7be1fade@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).