From: Russell King <rmk@arm.linux.org.uk>
To: Tony Lindgren <tony@atomide.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-omap@vger.kernel.org, Richard Woodruff <r-woodruff2@ti.com>,
linux-next@vger.kernel.org, Felipe Balbi <felipe.balbi@nokia.com>,
Wim Van Sebroeck <wim@iguana.be>,
Syed Mohammed Khasim <khasim@ti.com>,
David Brownell <david-b@pacbell.net>
Subject: Re: [PATCH] ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict (Re: linux-next: manual merge of the arm tree)
Date: Tue, 14 Oct 2008 21:40:23 +0100 [thread overview]
Message-ID: <20081014204022.GB20614@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20081014203017.GH8150@atomide.com>
On Tue, Oct 14, 2008 at 01:30:24PM -0700, Tony Lindgren wrote:
> And here's the patch for Russell to avoid the merge conflict.
> Also in Russell's patch tracking system as patch 5302/1.
This evening, only now having the time to investigate what's going
on there (as a result of added your other patch to fix the build
error I reported on Saturday) it turns out to be much more trivial
a conflict than I was suspecting from sfr's description.
However, the results of the final merge with 'master' on my devel
branch never go to Linus, so your patch may still be required.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
prev parent reply other threads:[~2008-10-14 20:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 2:27 linux-next: manual merge of the arm tree Stephen Rothwell
2008-10-14 7:59 ` Russell King
2008-10-14 8:07 ` David Brownell
2008-10-14 20:08 ` Tony Lindgren
2008-10-14 20:30 ` [PATCH] ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict (Re: linux-next: manual merge of the arm tree) Tony Lindgren
2008-10-14 20:40 ` Russell King [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=20081014204022.GB20614@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=david-b@pacbell.net \
--cc=felipe.balbi@nokia.com \
--cc=khasim@ti.com \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=r-woodruff2@ti.com \
--cc=sfr@canb.auug.org.au \
--cc=tony@atomide.com \
--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;
as well as URLs for NNTP newsgroup(s).