From: Nicolas Pitre <nico@cam.org>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>,
Linus Walleij <linus.walleij@stericsson.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the watchdog tree with the arm tree
Date: Tue, 09 Jun 2009 09:18:00 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.2.00.0906090913520.31536@xanadu.home> (raw)
In-Reply-To: <20090609123914.GD16090@infomag.iguana.be>
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
prev parent reply other threads:[~2009-06-09 13:18 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
2009-06-09 13:18 ` Nicolas Pitre [this message]
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=alpine.LFD.2.00.0906090913520.31536@xanadu.home \
--to=nico@cam.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--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 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®