linux-kernel - linux-next: manual merge of the watchdog 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: <20130225121732.29aad0f57349a5dce64ffd47@canb.auug.org.au>
Date:	Mon, 25 Feb 2013 12:17:32 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Wim Van Sebroeck <wim@...ana.be>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sachin Kamat <sachin.kamat@...aro.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Wolfram Sang <w.sang@...gutronix.de>
Subject: linux-next: manual merge of the watchdog tree with Linus' tree

Hi Wim,

Today's linux-next merge of the watchdog tree got a conflict in
drivers/rtc/rtc-stmp3xxx.c between commit c8a6046e1e0b ("drivers/rtc: use
of_match_ptr() macro") from Linus' tree and commit e02f5cf6b648 ("rtc:
stmp3xxx: add wdt-accessor function") from the watchdog 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-stmp3xxx.c
index b2a8ed9,cc9a9b6..0000000
--- a/drivers/rtc/rtc-stmp3xxx.c
+++ b/drivers/rtc/rtc-stmp3xxx.c
@@@ -26,7 -26,8 +26,9 @@@
  #include <linux/rtc.h>
  #include <linux/slab.h>
  #include <linux/of_device.h>
 +#include <linux/of.h>
+ #include <linux/stmp_device.h>
+ #include <linux/stmp3xxx_rtc_wdt.h>
  
  #include <mach/common.h>
  

Content of type "application/pgp-signature" skipped