Re: linux-next: manual merge of the driver-core tree with the sound-asoc tree

2014-11-10 Thread Mark Brown
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

Re: linux-next: manual merge of the driver-core tree with the sound-asoc tree

2014-11-09 Thread Greg KH
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 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/

Re: linux-next: manual merge of the driver-core tree with the sound-asoc tree

2014-11-09 Thread Stephen Rothwell
Hi Greg, On Mon, 10 Nov 2014 13:38:53 +0900 Greg KH 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

Re: linux-next: manual merge of the driver-core tree with the sound-asoc tree

2014-11-09 Thread Greg KH
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

linux-next: manual merge of the driver-core tree with the sound-asoc tree

2014-11-09 Thread Stephen Rothwell
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_driver