From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] pxa: patches for next merge window
Date: Sun, 28 Feb 2010 16:14:49 +0000 [thread overview]
Message-ID: <20100228161449.GD16745@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <f17812d71002260105q54c26198jc9b61851c35ae8ef@mail.gmail.com>
On Fri, Feb 26, 2010 at 05:05:01PM +0800, Eric Miao wrote:
> 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.
That isn't a fix - merging my devel branch just causes more problems
because it regularly gets rebuilt.
The 'devel' branch contains individual patches, and is regularly re-
generated from individual sub-branches.
The 'devel-stable' branch (internal) contains work pulled from other
people, and the 'stable' bit means that I once pulled, I don't wind
the tree back at any point. This gets merged into 'devel' as the last
merge.
Your original set of commits were merged into 'devel-stable' and has
had other trees merged on top of those.
You've destroyed your original commits, so this calls into question my
entire 'devel-stable' branch.
I've still not decided what to do about this. I'll ask Linus to merge
most of the 'devel' stuff without 'devel-stable' merged into mainline
to move stuff forward - this means _no_ _one's_ git work will be merged
through my tree, at least initially.
However, I'm putting 'devel-stable' on hold; I'll let the other ARM git
maintainers discuss this and work out what they're going to do about
this mess. One solution is to destroy the 'devel-stable' branch in
its entirety, and get everyone to resend all their pull requests.
That's *not* nice.
I also won't be pulling any more git trees until this issue is resolved -
it would be stupid to pull more git trees on top of 'devel-stable' at
this point.
next prev parent reply other threads:[~2010-02-28 16:14 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
2010-02-28 16:14 ` Russell King - ARM Linux [this message]
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=20100228161449.GD16745@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--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 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.