From: Russell King <rmk@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Dmitry Baryshkov <dbaryshkov@gmail.com>
Subject: Re: linux-next: arm/mer-current merge conflict
Date: Fri, 6 Jun 2008 11:10:12 +0100 [thread overview]
Message-ID: <20080606101012.GA18231@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20080603140421.183cefe5.sfr@canb.auug.org.au>
On Tue, Jun 03, 2008 at 02:04:21PM +1000, Stephen Rothwell wrote:
> Hi Russell,
>
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/mach-pxa/tosa.c between commit
> 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 ("[ARM] pxa: fix tosa.c build
> error") from the arm-current tree and commit
> a37cba9e5315bb57e8eb135e401ba35e4b2338ac ("[ARM] 5048/2: Clean up tosa
> and spitz resetting") from the arm tree. I used the latter since the
> former's commit message implied that this was the right fix.
Yes, I'm aware of there being two fixes in my tree for that. One is
the fix suitable for -rc kernels, the other is the proper fix, which
has a higher impact.
The merge conflict will be resolved probably around merge window time -
I hope this doesn't cause you too much of a problem?
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2008-06-06 10:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-03 4:04 linux-next: arm/mer-current merge conflict Stephen Rothwell
2008-06-06 10:10 ` Russell King [this message]
2008-06-06 11:19 ` 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=20080606101012.GA18231@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=dbaryshkov@gmail.com \
--cc=linux-next@vger.kernel.org \
--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 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.