From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Wolfram Sang <wsa@the-dreams•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Peter Chen <peter.chen@freescale•com>
Subject: linux-next: manual merge of the usb tree with the driver-core tree
Date: Fri, 28 Nov 2014 17:32:46 +1100 [thread overview]
Message-ID: <20141128173246.241262c4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 848 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/chipidea/core.c between commit 5bc879a6a271 ("usb:
chipidea: drop owner assignment from platform_drivers") from the
driver-core tree and commit 8076932ff2fc ("usb: chipidea: add system
power management support") from the usb 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/chipidea/core.c
index 947ed6e78be2,e14eafb2a05e..000000000000
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@@ -751,6 -867,8 +867,7 @@@ static struct platform_driver ci_hdrc_d
.remove = ci_hdrc_remove,
.driver = {
.name = "ci_hdrc",
+ .pm = &ci_pm_ops,
- .owner = THIS_MODULE,
},
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-28 6:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-28 6:32 Stephen Rothwell [this message]
2014-12-02 18:10 ` linux-next: manual merge of the usb tree with the driver-core tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2013-02-18 4:32 Stephen Rothwell
2013-02-18 4:45 ` Greg KH
2013-01-28 10:35 Stephen Rothwell
2013-01-28 10:46 ` Felipe Balbi
2013-01-28 10:23 Stephen Rothwell
2013-01-29 13:41 ` Greg KH
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=20141128173246.241262c4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=peter.chen@freescale$(echo .)com \
--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