Messages in this thread | | | Date | Wed, 26 May 2010 13:38:15 +1000 | From | Stephen Rothwell <> | 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |