From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Wolfram Sang <wsa@the-dreams.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the sound-asoc tree
Date: Mon, 10 Nov 2014 13:38:53 +0900 [thread overview]
Message-ID: <20141110043853.GA25797@kroah.com> (raw)
In-Reply-To: <20141110153132.259d49d9@canb.auug.org.au>
On Mon, Nov 10, 2014 at 03:31:32PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> sound/soc/intel/sst-haswell-pcm.c between commit 2e4f75919e5a ("ASoC:
> Intel: Add PM support to HSW/BDW PCM driver") from the sound-asoc tree
> and commit 3c1af8802e45 ("ASoC: intel: drop owner assignment from
> platform_drivers") from the driver-core 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 sound/soc/intel/sst-haswell-pcm.c
> index 7eb9afc9b33d,ad21e636edc6..000000000000
> --- a/sound/soc/intel/sst-haswell-pcm.c
> +++ b/sound/soc/intel/sst-haswell-pcm.c
> @@@ -1173,9 -899,6 +1173,8 @@@ static const struct dev_pm_ops hsw_pcm_
> static struct platform_driver hsw_pcm_driver = {
> .driver = {
> .name = "haswell-pcm-audio",
> - .owner = THIS_MODULE,
> + .pm = &hsw_pcm_pm,
> +
> },
>
> .probe = hsw_pcm_dev_probe,
Fix looks good, thanks.
greg k-h
next prev parent reply other threads:[~2014-11-10 4:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 4:31 linux-next: manual merge of the driver-core tree with the sound-asoc tree Stephen Rothwell
2014-11-10 4:38 ` Greg KH [this message]
2014-11-10 4:51 ` Stephen Rothwell
2014-11-10 5:07 ` Greg KH
2014-11-10 10:02 ` Mark Brown
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=20141110043853.GA25797@kroah.com \
--to=greg@kroah.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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).