lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:	Mon, 10 Nov 2014 15:31:32 +1100
From:	Stephen Rothwell <>
To:	Greg KH <>, Mark Brown <>,
	Liam Girdwood <>
	Wolfram Sang <>
Subject: linux-next: manual merge of the driver-core tree with the
 sound-asoc tree

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).

Stephen Rothwell          

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,

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists