* linux-next: manual merge of the driver-core tree with the sound-asoc tree
@ 2014-11-10 4:31 Stephen Rothwell
2014-11-10 4:38 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2014-11-10 4:31 UTC (permalink / raw)
To: Greg KH, Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Wolfram Sang
[-- Attachment #1: Type: text/plain, Size: 949 bytes --]
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,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the driver-core tree with the sound-asoc tree
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
2014-11-10 4:51 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2014-11-10 4:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, linux-next, linux-kernel, Wolfram Sang
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the driver-core tree with the sound-asoc tree
2014-11-10 4:38 ` Greg KH
@ 2014-11-10 4:51 ` Stephen Rothwell
2014-11-10 5:07 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2014-11-10 4:51 UTC (permalink / raw)
To: Greg KH; +Cc: Mark Brown, Liam Girdwood, linux-next, linux-kernel, Wolfram Sang
[-- Attachment #1: Type: text/plain, Size: 1417 bytes --]
Hi Greg,
On Mon, 10 Nov 2014 13:38:53 +0900 Greg KH <greg@kroah.com> wrote:
>
> On Mon, Nov 10, 2014 at 03:31:32PM +1100, Stephen Rothwell wrote:
> >
> > 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.
I assume that there was a good reason not to farm these patches out to
their respective maintainers?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the driver-core tree with the sound-asoc tree
2014-11-10 4:51 ` Stephen Rothwell
@ 2014-11-10 5:07 ` Greg KH
2014-11-10 10:02 ` Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2014-11-10 5:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, linux-next, linux-kernel, Wolfram Sang
On Mon, Nov 10, 2014 at 03:51:42PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> On Mon, 10 Nov 2014 13:38:53 +0900 Greg KH <greg@kroah.com> wrote:
> >
> > On Mon, Nov 10, 2014 at 03:31:32PM +1100, Stephen Rothwell wrote:
> > >
> > > 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.
>
> I assume that there was a good reason not to farm these patches out to
> their respective maintainers?
Yes, It was easier to hit everything in one tree, at one time, so that
is what Wolfram did. Sorry for the merge conflicts, I didn't think
anyone would be adding .driver attributes to files after they had been
added to the tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the driver-core tree with the sound-asoc tree
2014-11-10 5:07 ` Greg KH
@ 2014-11-10 10:02 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2014-11-10 10:02 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, Liam Girdwood, linux-next, linux-kernel, Wolfram Sang
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
On Mon, Nov 10, 2014 at 02:07:19PM +0900, Greg KH wrote:
> On Mon, Nov 10, 2014 at 03:51:42PM +1100, Stephen Rothwell wrote:
> > I assume that there was a good reason not to farm these patches out to
> > their respective maintainers?
> Yes, It was easier to hit everything in one tree, at one time, so that
> is what Wolfram did. Sorry for the merge conflicts, I didn't think
> anyone would be adding .driver attributes to files after they had been
> added to the tree.
People are rather more likely to do that if they know that not adding
driver attributes is a thing, and that's more likely to happen if you
tell people that this change is happening, for example by sending the
patches to them. This merge conflict was the first I'd heard of this
being something we wanted to do.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-11-10 10:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2014-11-10 4:51 ` Stephen Rothwell
2014-11-10 5:07 ` Greg KH
2014-11-10 10:02 ` Mark Brown
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).