Messages in this thread | | | Date | Fri, 25 Dec 2009 10:52:28 +0100 | From | Wim Van Sebroeck <> | Subject | Re: linux-next: manual merge of the watchdog tree with the tree |
| |
Thanks Stephen,
That was indeed correct. I fixed the patch.
Kind regards, Wim.
> Hi Wim, > > Today's linux-next merge of the watchdog tree got a conflict in > drivers/watchdog/rm9k_wdt.c between commit > de4148f3ef54b644a181ad75a6fb4b373f2b01f0 ("MIPS: eXcite: Remove > platform") from Linus' tree and commit > f277223000a651df741e2e3367b498049139298d ("[WATCHDOG] use resource_size > ()") from the watchdog tree. > > The former commit removes the file changed by the latter. I just removed > the file. > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > http://www.canb.auug.org.au/~sfr/
| |