linux-next: manual merge of the watchdog tree with the arm tree

linux-next: manual merge of the watchdog tree with the arm tree

[Stephen Rothwell]

Hi Wim,

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.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/watchdog/Makefile
index c3afa14,9eb74b7..0000000
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@@ -40,7 -41,8 +41,8 @@@ obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx
  obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
  obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
  obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
 -obj-$(CONFIG_ORION5X_WATCHDOG) += orion5x_wdt.o
 +obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
+ obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
  
  # AVR32 Architecture
  obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o

Re: linux-next: manual merge of the watchdog tree with the arm tree

[Wim Van Sebroeck]

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...

> 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.

Kind regards,
Wim.

Re: linux-next: manual merge of the watchdog tree with the arm tree

[Nicolas Pitre]

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.


Nicolas