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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100526133815.e62bacb8.sfr@canb.auug.org.au>
Date:	Wed, 26 May 2010 13:38:15 +1000
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,
	Wolfram Sang <w.sang@...gutronix.de>,
	Linus <torvalds@...ux-foundation.org>
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/watchdog/imx2_wdt.c between commit
bb2fd8a844d3a9209599b5fb694b30ac46a56ef0 ("watchdog: Driver for the
watchdog timer on Freescale IMX2 (and later) processors") from Linus'
tree and commit 1216b28847276929d920296e34b4e8226eaf4e79 ("watchdog:
Driver for the watchdog timer on Freescale IMX2 (and later) processors")
from the watchdog tree.

These are two versions of the same patch.  I used the version from Linus'
tree - but I do need to ask what is the point of having a patch in
linux-next for two days and then submitting a different version of the
patch to Linus?  The changes are not insignificant. Both patches have the
same Author date and SOB etc lines.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped