From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Felipe Balbi <balbi@ti•com>, Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Wolfram Sang <wsa@the-dreams•de>,
Dinh Nguyen <dinguyen@opensource•altera.com>
Subject: linux-next: manual merge of the usb-gadget tree with the driver-core tree
Date: Tue, 18 Nov 2014 18:12:22 +1100 [thread overview]
Message-ID: <20141118181222.451b84d1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb: dwc2: drop
owner assignment from platform_drivers") from the driver-core tree and
commit 117777b2c3bb ("usb: dwc2: Move gadget probe function into
platform code") from the usb-gadget tree.
I fixed it up (the latter removed the code changed by the former, so I
did that) 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:[~2014-11-18 7:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-18 7:12 Stephen Rothwell [this message]
2014-11-18 15:25 ` linux-next: manual merge of the usb-gadget tree with the driver-core tree Felipe Balbi
2014-11-18 16:24 ` Greg KH
2014-11-18 16:40 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2014-11-10 5:08 Stephen Rothwell
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=20141118181222.451b84d1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@ti$(echo .)com \
--cc=dinguyen@opensource$(echo .)altera.com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=wsa@the-dreams$(echo .)de \
/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