[lkml]   [2009]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the watchdog tree with the arm tree
On Tue, 9 Jun 2009, Wim Van Sebroeck wrote:

> Hi Stephen,
> > Today's linux-next merge of the watchdog tree got a conflict in
> > drivers/watchdog/Makefile between commit
> > 3b937a7dbddbedd9457b33fcc8fa369c0c229c6e ("[ARM] Orion/Kirkwood: rename
> > orion5x_wdt to orion_wdt") from the arm tree and commit
> > e35f878d8313518a20d3c53393d14761dca74624 ("[WATCHDOG] U300 COH 901 327
> > watchdog driver") from the watchdog tree.
> It would have been nice if the orion watchdog rename patch would have been
> sent to the watchdog maintainer also...

The patch has implications touching 2 different ARM subarchitectures
outside the driver itself, so I felt it more appropriate for the rename
to happen all at once and be carried through the ARM tree. The driver
sees no functional changes.
But I agree that I could have sent you a note.

> > Just context changes. I fixed it up (see below) and can carry the fix as
> > necessary.
> I'll have a look at the commit and might pull it into the watchdog tree also.
> That way you shouldn't have any problem with it.

I don't think it'll apply cleanly to the watchdog tree without greater
conflicts with the other ARM related changes.


 \ /
  Last update: 2009-06-09 15:21    [W:0.074 / U:0.848 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site