linux-kernel - Re: linux-next: manual merge of the watchdog tree with the mfd 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120518083234.GW3074@spo001.leaseweb.com>
Date:	Fri, 18 May 2012 10:32:34 +0200
From:	Wim Van Sebroeck <wim@...ana.be>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Aaron Sierra <asierra@...-inc.com>,
	Guenter Roeck <linux@...ck-us.net>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	Randy Dunlap <rdunlap@...otime.net>,
	linux-watchdog@...r.kernel.org
Subject: Re: linux-next: manual merge of the watchdog tree with the mfd tree

Hi Stephen,

> Today's linux-next merge of the watchdog tree got a conflict in
> drivers/watchdog/iTCO_wdt.c between commit 887c8ec7219f ("watchdog:
> Convert iTCO_wdt driver to mfd model") from the  tree and commit
> c3614aa19d3e ("watchdog: iTCO_wdt.c: fix printk format warnings") from
> the watchdog tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks for fixing this up.

But I'm a bit surprised: I wasn't Cc'ed about this patch to Convert
the iTCO_wdt driver to the mfd model...

Kind regards,
Wim.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/