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,
Ralf Baechle <ralf@linux-mips•org>,
H Hartley Sweeten <hartleys@visionengravers•com>
Subject: Re: linux-next: manual merge of the watchdog tree with the tree
Date: Fri, 25 Dec 2009 10:52:28 +0100 [thread overview]
Message-ID: <20091225095228.GH5402@infomag.iguana.be> (raw)
In-Reply-To: <20091224091904.72ef2708.sfr@canb.auug.org.au>
Thanks Stephen,
That was indeed correct. I fixed the patch.
Kind regards,
Wim.
> Hi Wim,
>
> Today's linux-next merge of the watchdog tree got a conflict in
> drivers/watchdog/rm9k_wdt.c between commit
> de4148f3ef54b644a181ad75a6fb4b373f2b01f0 ("MIPS: eXcite: Remove
> platform") from Linus' tree and commit
> f277223000a651df741e2e3367b498049139298d ("[WATCHDOG] use resource_size
> ()") from the watchdog tree.
>
> The former commit removes the file changed by the latter. I just removed
> the file.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
next prev parent reply other threads:[~2009-12-25 9:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-23 22:19 linux-next: manual merge of the watchdog tree with the tree Stephen Rothwell
2009-12-25 9:52 ` Wim Van Sebroeck [this message]
2009-12-26 12:10 ` Stephen Rothwell
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=20091225095228.GH5402@infomag.iguana.be \
--to=wim@iguana$(echo .)be \
--cc=hartleys@visionengravers$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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