linux-kernel - linux-next: manual merge of the driver-core tree with the watchdog 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: <20141215141114.575b8767@canb.auug.org.au>
Date:	Mon, 15 Dec 2014 14:11:14 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Wim Van Sebroeck <wim@...ana.be>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Xiubo Li <Li.Xiubo@...escale.com>,
	Wolfram Sang <wsa@...-dreams.de>
Subject: linux-next: manual merge of the driver-core tree with the watchdog
 tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/watchdog/imx2_wdt.c between commit 6dc21678dbd9 ("watchdog:
imx2_wdt: Add power management support") from the watchdog tree and
commit fa21a580dea4 ("watchdog: 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/watchdog/imx2_wdt.c
index b333283b24a7,65b84d8c0b93..000000000000
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@@ -383,8 -337,6 +383,7 @@@ static struct platform_driver imx2_wdt_
  	.shutdown	= imx2_wdt_shutdown,
  	.driver		= {
  		.name	= DRIVER_NAME,
- 		.owner	= THIS_MODULE,
 +		.pm     = &imx2_wdt_pm_ops,
  		.of_match_table = imx2_wdt_dt_ids,
  	},
  };

Content of type "application/pgp-signature" skipped