From: Russell King <rmk@arm•linux.org.uk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Eric Miao <eric.y.miao@gmail•com>, linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the pxa tree
Date: Wed, 17 Sep 2008 22:40:45 +0100 [thread overview]
Message-ID: <20080917214045.GB5475@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20080918063109.5aee733d.sfr@canb.auug.org.au>
On Thu, Sep 18, 2008 at 06:31:09AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the pxa tree got a conflict in
> arch/arm/mach-pxa/spitz.c between commit
> fced80c735941fa518ac67c0b61bbe153fb8c050 ("[ARM] Convert asm/io.h to
> linux/io.h") from the arm tree and commit
> 546ed5880bf813e1386696c02d288d7ffba517d6 ("[ARM] pxa/spitz: use SPI-based
> driver for ads7846, corgi-lcd and max1111") from the pxa tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix.
If you wait a bit, kicking my tree out will resolve that (since those
changes have been merged today.)
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2008-09-17 21:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-17 20:31 linux-next: manual merge of the pxa tree Stephen Rothwell
2008-09-17 21:40 ` Russell King [this message]
2008-09-17 22:14 ` Stephen Rothwell
2008-09-17 22:28 ` Russell King
2008-09-18 0:02 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-09-18 18:46 Stephen Rothwell
2008-09-18 19:00 ` Eric Miao
2008-09-14 19:27 Stephen Rothwell
[not found] ` <20080915052750.0b0c924c.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2008-09-15 13:18 ` Ned Forrester
2008-09-16 3:02 ` Eric Miao
2008-09-25 4:57 ` [spi-devel-general] " David Brownell
2008-09-25 7:49 ` Eric Miao
[not found] ` <f17812d70809250049g3f3b86e7x12dab8cc4f8b1cd6-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-09-25 8:20 ` David Brownell
2008-09-11 22:35 Stephen Rothwell
2008-09-12 0:49 ` Eric Miao
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=20080917214045.GB5475@flint.arm.linux.org.uk \
--to=rmk@arm$(echo .)linux.org.uk \
--cc=eric.y.miao@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.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