From: Russell King <rmk@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wim Van Sebroeck <wim@iguana.be>, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the watchdog tree with the arm tree
Date: Fri, 20 Mar 2009 08:19:15 +0000 [thread overview]
Message-ID: <20090320081915.GA17251@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20090320135849.8f71cdbc.sfr@canb.auug.org.au>
On Fri, Mar 20, 2009 at 01:58:49PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the watchdog tree got a conflict in
> drivers/watchdog/omap_wdt.c between commit
> 39a80c7f379e1c1d3e63b204b8353b7381d0a3d5 ("[ARM] omap: watchdog: convert
> clocks to match by devid and conid") from the arm tree and commit
> 47efb2337f6f450c995712762c0bcf6ce073171f ("[WATCHDOG] More coding-style
> and trivial clean-up") from the watchdog tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Wim, what changes are you carrying to this driver which also touch its
clk API use? Please send these changes to me.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2009-03-20 8:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-20 2:58 linux-next: manual merge of the watchdog tree with the arm tree Stephen Rothwell
2009-03-20 8:19 ` Russell King [this message]
2009-03-20 9:04 ` Wim Van Sebroeck
2009-03-20 9:15 ` Wim Van Sebroeck
2009-03-20 9:24 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-06-09 6:37 Stephen Rothwell
2009-06-09 12:39 ` Wim Van Sebroeck
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=20090320081915.GA17251@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wim@iguana.be \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.