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,
Ben Hutchings <ben@decadent.org.uk>,
Hans de Goede <hdegoede@redhat.com>
Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Date: Thu, 28 May 2015 18:36:17 +1000 [thread overview]
Message-ID: <20150528183617.432ba4f4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 629 bytes --]
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/musb/musb_core.c between commit da96cfc13335 ("usb: musb:
fix order of conditions for assigning end point operations") from the
usb.current tree and commit 47a82730b54c ("usb: musb: Fix platform code
being unable to override ep access ops") from the usb-gadget tree.
I fixed it up (they are the same patch apart from whitespace and the
comments - I used the comments from the usb-gadget tree) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-05-28 8:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-28 8:36 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-01-16 6:23 linux-next: manual merge of the usb-gadget tree with the usb.current tree Stephen Rothwell
2015-01-16 9:56 ` Kaukab, Yousaf
2015-01-13 4:06 Stephen Rothwell
2015-01-13 4:02 Stephen Rothwell
2014-09-08 7:09 Stephen Rothwell
2014-09-08 7:02 Stephen Rothwell
2014-09-08 13:27 ` Felipe Balbi
2014-09-08 13:27 ` Felipe Balbi
2014-07-04 4:51 Stephen Rothwell
2013-12-18 6:09 Stephen Rothwell
2013-07-30 4:08 Stephen Rothwell
2013-07-30 5:50 ` Felipe Balbi
2013-07-30 5:50 ` Felipe Balbi
2013-03-22 3:31 Stephen Rothwell
2013-03-22 6:28 ` Felipe Balbi
2013-03-22 6:28 ` Felipe Balbi
2013-03-22 3:28 Stephen Rothwell
2013-03-22 6:28 ` Felipe Balbi
2013-03-22 6:28 ` 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=20150528183617.432ba4f4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@ti.com \
--cc=ben@decadent.org.uk \
--cc=hdegoede@redhat.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 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.