From: eric.y.miao@gmail.com (Eric Miao)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] pxa: patches for next merge window
Date: Fri, 26 Feb 2010 17:05:01 +0800 [thread overview]
Message-ID: <f17812d71002260105q54c26198jc9b61851c35ae8ef@mail.gmail.com> (raw)
In-Reply-To: <20100225212915.GA24043@n2100.arm.linux.org.uk>
On Fri, Feb 26, 2010 at 5:29 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Thu, Feb 25, 2010 at 08:51:13PM +0000, Russell King - ARM Linux wrote:
>> Err, you've rebased your tree since I last pulled it, and this now results
>> in the following, and a load of duplicated commits between the two trees.
>>
>> This is not nice, please don't rebase stuff which I've already pulled.
>>
>> I'm going to think about what to do about this; I can't trivially drop
>> your previous work from my tree.
>
> What happened to this commit?
>
> [ARM] pxa/ttc_dkb: remove duplicate macro definition
>
Hi Russell,
This one actually has been merged into 'fix' and been there in -rc8
already. Now we have to live with this duplicate commit, it's my fault.
> which follows:
>
> [ARM] pxa/raumfeld: add defconfig
> [ARM] pxa/raumfeld: add platform support
>
> in your previous pull request? ?I can find these two in your latest with
> different commit IDs, but not the pxa/ttc_dkb patch.
>
I've sorted this out by merging your devel branch back, and rebased
the remaining patches on top of it. Please try re-pull. A rough test
here at my side shows a clean merge so far.
Thanks
next prev parent reply other threads:[~2010-02-26 9:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-25 2:49 [GIT PULL] pxa: patches for next merge window Eric Miao
2010-02-25 20:51 ` Russell King - ARM Linux
2010-02-25 21:29 ` Russell King - ARM Linux
2010-02-26 2:50 ` Eric Miao
2010-02-26 9:05 ` Eric Miao [this message]
2010-02-28 16:14 ` Russell King - ARM Linux
2010-03-01 0:42 ` Nicolas Pitre
2010-03-01 13:23 ` Eric Miao
2010-03-01 15:16 ` Russell King - ARM Linux
2010-03-02 4:48 ` Eric Miao
2010-03-01 9:39 ` Uwe Kleine-König
2010-03-01 9:48 ` Russell King - ARM Linux
2010-03-01 10:11 ` Paul Mundt
2010-03-01 10:27 ` Uwe Kleine-König
2010-03-02 0:33 ` Stephen Rothwell
2010-03-01 10:12 ` Uwe Kleine-König
2010-03-01 16:40 ` Linus Torvalds
2010-03-01 16:58 ` Linus Torvalds
2010-03-01 17:07 ` Russell King - ARM Linux
-- strict thread matches above, loose matches on Subject: below --
2010-12-22 9:09 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=f17812d71002260105q54c26198jc9b61851c35ae8ef@mail.gmail.com \
--to=eric.y.miao@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).