linux-kernel - linux-next: manual merge of the driver-core tree with Linus' 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: <20141215140901.65a72ddb@canb.auug.org.au>
Date:	Mon, 15 Dec 2014 14:09:01 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Wolfram Sang <wsa@...-dreams.de>,
	Guenter Roeck <linux@...ck-us.net>
Subject: linux-next: manual merge of the driver-core tree with Linus' tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/rtc/rtc-snvs.c between commit 88221c32f985 ("rtc: snvs: fix
build with CONFIG_PM_SLEEP disabled") from Linus' tree and commit
0929ae376ef3 ("rtc: 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/rtc/rtc-snvs.c
index 942b267c6271,f04c378b781a..000000000000
--- a/drivers/rtc/rtc-snvs.c
+++ b/drivers/rtc/rtc-snvs.c
@@@ -367,8 -327,7 +367,7 @@@ MODULE_DEVICE_TABLE(of, snvs_dt_ids)
  static struct platform_driver snvs_rtc_driver = {
  	.driver = {
  		.name	= "snvs_rtc",
- 		.owner	= THIS_MODULE,
 -		.pm	= &snvs_rtc_pm_ops,
 +		.pm	= SNVS_RTC_PM_OPS,
  		.of_match_table = snvs_dt_ids,
  	},
  	.probe		= snvs_rtc_probe,

Content of type "application/pgp-signature" skipped