linux-kernel - linux-next: manual merge of the watchdog tree with the sh 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: <20110223143446.8646373f.sfr@canb.auug.org.au>
Date:	Wed, 23 Feb 2011 14:34:46 +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,
	Paul Mundt <lethal@...ux-sh.org>
Subject: linux-next: manual merge of the watchdog tree with the sh tree

Hi Wim,

Today's linux-next merge of the watchdog tree got a conflict in
drivers/watchdog/shwdt.c between commits b1fa888e0124 ("watchdog: shwdt:
Kill off mmap stub and superfluous comments") and 8f5585ec3d17
("watchdog: shwdt: driver model conversion") from the sh tree and commit
e273d97a2281 ("watchdog: cleanup spaces before tabs") from the watchdog
tree.

The spaces seem to have been cleaned up in the former patches, so I used
the sh tree version of this file.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped