linux-kernel - linux-next: manual merge of the usb tree with the driver-core tree

lists.openwall.net		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 linux-cve-announce 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]

Message-ID: <20141128173246.241262c4@canb.auug.org.au>
Date:	Fri, 28 Nov 2014 17:32:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Wolfram Sang <wsa@...-dreams.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Chen <peter.chen@...escale.com>
Subject: linux-next: manual merge of the usb tree with the driver-core tree

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@...b.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,
  	},
  };

Content of type "application/pgp-signature" skipped