From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wolfram Sang <wsa@the-dreams.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Chen <peter.chen@freescale.com>
Subject: Re: linux-next: manual merge of the usb tree with the driver-core tree
Date: Tue, 2 Dec 2014 10:10:08 -0800 [thread overview]
Message-ID: <20141202181008.GB11700@kroah.com> (raw)
In-Reply-To: <20141128173246.241262c4@canb.auug.org.au>
On Fri, Nov 28, 2014 at 05:32:46PM +1100, Stephen Rothwell wrote:
> 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,
> },
> };
>
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2014-12-02 18:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-28 6:32 linux-next: manual merge of the usb tree with the driver-core tree Stephen Rothwell
2014-12-02 18:10 ` Greg KH [this message]
-- 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=20141202181008.GB11700@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peter.chen@freescale.com \
--cc=sfr@canb.auug.org.au \
--cc=wsa@the-dreams.de \
/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).