From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: Git pull request: ARM LPC32XX architecture
Date: Tue, 25 May 2010 18:21:06 +0100 [thread overview]
Message-ID: <20100525172106.GA16204@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <083DF309106F364B939360100EC290F80AC2FF1AE8@eu1rdcrdc1wx030.exi.nxp.com>
On Tue, May 25, 2010 at 05:27:12PM +0200, Kevin Wells wrote:
> It's been a few months since I've posted this patch set and I'd still
> like to get it pulled.
Sorry, it got buried beneath _lots_ of email.
However, I've sent my second and final pull request to Linus yesterday
evening. So far Linus hasn't pulled my tree, so I can't touch it at
the moment.
I think this stuff has missed this window as well. ;(
> As of yesterday, the patchset still applies and works with the latest
> release, although a 'slab.h' patch is needed for 1 file.
>
> Can you pull the original series plus the slab.h patch? (breaks bisect)?
> Or do you want the slab.h fix included in the correct order in the
> Series to be bisect friendly?
Well, there's two ways to get around that - both of which you need to
ensure that no one's pulled your tree yet.
1. Re-do the patches such that the missing include(s) are added.
2. rebase the series on something more recent and fix the slab.h thing
along the way.
Either way means that the series remains bisect-able after merging.
This is not something that should be done lightly however - these kinds
of changes mean that anyone who has pulled your tree is in for some
grief.
next prev parent reply other threads:[~2010-05-25 17:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-12 20:44 Git pull request: ARM LPC32XX architecture Kevin Wells
2010-03-12 21:03 ` Russell King - ARM Linux
2010-03-13 15:50 ` Robert Schwebel
2010-03-14 15:00 ` Russell King - ARM Linux
2010-03-30 16:53 ` Kevin Wells
2010-05-25 15:27 ` Kevin Wells
2010-05-25 17:21 ` Russell King - ARM Linux [this message]
2010-05-26 23:10 ` Kevin Wells
2010-07-27 16:19 ` Kevin Wells
2010-07-27 16:45 ` Russell King - ARM Linux
2010-07-27 16:49 ` Russell King - ARM Linux
2010-07-27 20:00 ` Kevin Wells
2010-07-27 21:44 ` Russell King - ARM Linux
2010-07-28 18:47 ` Kevin Wells
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=20100525172106.GA16204@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 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).