From: Wim Van Sebroeck <wim@iguana.be>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@stericsson.com>,
Nicolas Pitre <nico@cam.org>, Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the watchdog tree with the arm tree
Date: Tue, 9 Jun 2009 14:39:14 +0200 [thread overview]
Message-ID: <20090609123914.GD16090@infomag.iguana.be> (raw)
In-Reply-To: <20090609163718.ccefad1d.sfr@canb.auug.org.au>
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.
next prev parent reply other threads:[~2009-06-09 12:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 6:37 Stephen Rothwell
2009-06-09 12:39 ` Wim Van Sebroeck [this message]
2009-06-09 13:18 ` Nicolas Pitre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090609123914.GD16090@infomag.iguana.be \
--to=wim@iguana.be \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nico@cam.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®