* linux-next: manual merge of the watchdog tree with the sh tree
@ 2011-02-23 3:34 Stephen Rothwell
2011-02-23 7:42 ` Wim Van Sebroeck
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-02-23 3:34 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-next, linux-kernel, Paul Mundt
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the watchdog tree with the sh tree
2011-02-23 3:34 linux-next: manual merge of the watchdog tree with the sh tree Stephen Rothwell
@ 2011-02-23 7:42 ` Wim Van Sebroeck
0 siblings, 0 replies; 2+ messages in thread
From: Wim Van Sebroeck @ 2011-02-23 7:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Paul Mundt
Hi Stephen,
> 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.
I will redo that patch tonight so that you don't have any issues with it tomorrow.
Thanks,
Wim.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-23 7:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-23 3:34 linux-next: manual merge of the watchdog tree with the sh tree Stephen Rothwell
2011-02-23 7:42 ` Wim Van Sebroeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox