linux-kernel - linux-next: manual merge of the driver-core tree with the mfd 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20141110152426.7f1f3da8@canb.auug.org.au>
Date:	Mon, 10 Nov 2014 15:24:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Lee Jones <lee.jones@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Pankaj Dubey <pankaj.dubey@...sung.com>,
	Wolfram Sang <wsa@...-dreams.de>
Subject: linux-next: manual merge of the driver-core tree with the mfd tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/syscon.c between commit d4ad08b424c1 ("mfd: syscon:
Decouple syscon interface from platform devices") from the mfd tree and
commit 78a835416ad6 ("mfd: 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@...b.auug.org.au

diff --cc drivers/mfd/syscon.c
index 72373b113885,e85c052b302c..000000000000
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@@ -219,7 -166,7 +219,6 @@@ static const struct platform_device_id 
  static struct platform_driver syscon_driver = {
  	.driver = {
  		.name = "syscon",
- 		.owner = THIS_MODULE,
 -		.of_match_table = of_syscon_match,
  	},
  	.probe		= syscon_probe,
  	.id_table	= syscon_ids,

Content of type "application/pgp-signature" skipped