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>,
Robert Jarzmik <robert.jarzmik@free•fr>
Subject: linux-next: manual merge of the usb-gadget tree with the driver-core tree
Date: Mon, 10 Nov 2014 16:08:24 +1100 [thread overview]
Message-ID: <20141110160824.50addb94@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 997 bytes --]
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc/pxa27x_udc.c between commit 6d3f5f2d895b ("usb:
gadget: udc: drop owner assignment from platform_drivers") from the
driver-core tree and commit 1803fe15ad54 ("usb: gadget: pxa27x_udc: add
devicetree support") 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/gadget/udc/pxa27x_udc.c
index 61bceedf515d,69e7b816d880..000000000000
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@@ -2614,6 -2589,8 +2589,7 @@@ MODULE_ALIAS("platform:pxa27x-udc")
static struct platform_driver udc_driver = {
.driver = {
.name = "pxa27x-udc",
- .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(udc_pxa_dt_ids),
},
.probe = pxa_udc_probe,
.remove = pxa_udc_remove,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-10 5:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 5:08 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-18 7:12 linux-next: manual merge of the usb-gadget tree with the driver-core tree Stephen Rothwell
2014-11-18 15:25 ` Felipe Balbi
2014-11-18 16:24 ` Greg KH
2014-11-18 16:40 ` 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=20141110160824.50addb94@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@ti$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robert.jarzmik@free$(echo .)fr \
--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