linux-kernel - linux-next: manual merge of the driver-core tree with the hwmon-staging 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>] [day] [month] [year] [list]

Message-ID: <20141112150519.06cb7c34@canb.auug.org.au>
Date:	Wed, 12 Nov 2014 15:05:19 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Guenter Roeck <linux@...ck-us.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Wolfram Sang <wsa@...-dreams.de>,
	Neelesh Gupta <neelegup@...ux.vnet.ibm.com>
Subject: linux-next: manual merge of the driver-core tree with the
 hwmon-staging tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/hwmon/ibmpowernv.c between commit e349d9d5b3f9 ("hwmon:
(ibmpowernv) Use platform 'id_table' to probe the device") from the
hwmon-staging tree and commit 2a1ed077189a ("hwmon: 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/hwmon/ibmpowernv.c
index c7577b8f17a8,58ea44ec6c77..000000000000
--- a/drivers/hwmon/ibmpowernv.c
+++ b/drivers/hwmon/ibmpowernv.c
@@@ -301,20 -309,9 +301,19 @@@ static int ibmpowernv_probe(struct plat
  	return PTR_ERR_OR_ZERO(hwmon_dev);
  }
  
 +static const struct platform_device_id opal_sensor_driver_ids[] = {
 +	{
 +		.name = "opal-sensor",
 +	},
 +	{ }
 +};
 +MODULE_DEVICE_TABLE(platform, opal_sensor_driver_ids);
 +
  static struct platform_driver ibmpowernv_driver = {
 -	.driver = {
 -		.name = DRVNAME,
 +	.probe		= ibmpowernv_probe,
 +	.id_table	= opal_sensor_driver_ids,
 +	.driver		= {
- 		.owner	= THIS_MODULE,
 +		.name	= DRVNAME,
  	},
  };
  

Content of type "application/pgp-signature" skipped