* linux-next: manual merge of the watchdog tree with the tree
@ 2009-12-23 22:19 Stephen Rothwell
2009-12-25 9:52 ` Wim Van Sebroeck
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-12-23 22:19 UTC (permalink / raw)
To: Wim Van Sebroeck
Cc: linux-next, linux-kernel, Ralf Baechle, H Hartley Sweeten
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the watchdog tree with the tree
2009-12-23 22:19 linux-next: manual merge of the watchdog tree with the tree Stephen Rothwell
@ 2009-12-25 9:52 ` Wim Van Sebroeck
2009-12-26 12:10 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Wim Van Sebroeck @ 2009-12-25 9:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Ralf Baechle, H Hartley Sweeten
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/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the watchdog tree with the tree
2009-12-25 9:52 ` Wim Van Sebroeck
@ 2009-12-26 12:10 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-12-26 12:10 UTC (permalink / raw)
To: Wim Van Sebroeck
Cc: linux-next, linux-kernel, Ralf Baechle, H Hartley Sweeten
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
Hi Wim,
On Fri, 25 Dec 2009 10:52:28 +0100 Wim Van Sebroeck <wim@iguana•be> wrote:
>
> That was indeed correct. I fixed the patch.
Thanks for that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-26 12:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-23 22:19 linux-next: manual merge of the watchdog tree with the tree Stephen Rothwell
2009-12-25 9:52 ` Wim Van Sebroeck
2009-12-26 12:10 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox