linux-kernel - linux-next: manual merge of the akpm-current 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>] [day] [month] [year] [list]

Message-ID: <20141110195519.10cef790@canb.auug.org.au>
Date:	Mon, 10 Nov 2014 19:55:19 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Wolfram Sang <wsa@...-dreams.de>,
	Johan Hovold <johan@...nel.org>
Subject: linux-next: manual merge of the akpm-current tree with the
 driver-core tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
drivers/rtc/rtc-omap.c between commit 0929ae376ef3 ("rtc: drop owner
assignment from platform_drivers") from the driver-core tree and commit
700abe25a31a ("rtc: omap: remove DRIVER_NAME macro") from the
akpm-current 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-omap.c
index ae444a8bd602,fba13e53c278..000000000000
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@@ -568,7 -718,8 +718,7 @@@ static struct platform_driver omap_rtc_
  	.remove		= __exit_p(omap_rtc_remove),
  	.shutdown	= omap_rtc_shutdown,
  	.driver		= {
- 		.name	= DRIVER_NAME,
+ 		.name	= "omap_rtc",
 -		.owner	= THIS_MODULE,
  		.pm	= &omap_rtc_pm_ops,
  		.of_match_table = omap_rtc_of_match,
  	},

Content of type "application/pgp-signature" skipped