From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: What's inside the pxa tree for this merge window
Date: Mon, 21 Sep 2009 21:09:23 +0100 [thread overview]
Message-ID: <20090921200923.GF30821@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <Pine.LNX.4.64.0909212111490.17328@axis700.grange>
On Mon, Sep 21, 2009 at 09:19:46PM +0200, Guennadi Liakhovetski wrote:
> On Fri, 18 Sep 2009, Russell King - ARM Linux wrote:
>
> > On Fri, Sep 18, 2009 at 08:43:47AM +0200, Matej Kenda wrote:
> > > On Thu, 2009-09-10 at 19:46 +0800, Eric Miao wrote:
> > > > Here's the preview of request-pull result, please let me know if there
> > > > is anything missed, thanks.
> > > >
> > > > URL: git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
> > > >
> > > >
> > > > Matej Kenda (2):
> > > > [ARM] pxa: add support for the IskraTel XCEP board
> > > > [ARM] pxa: add defconfig for IskraTel XCEP board
> > >
> > > Eric, what is the current status of this request? Do I need to repost
> > > the patches to included into 2.6.32?
> > >
> > > Russell discarded them from his patch system, because they are on your
> > > list.
> >
> > I discarded them _because_ Eric handled them, which is what I said in the
> > comments when I discarded them.
>
> Ok, I did do my best to get patches in the right order in the mainline,
> but it all failed. AFAICS, v4l and sh are already in the mainline with a
> _wrongly_ resolved mefge conflict, which, most likely, breaks the
> sh_mobile_ceu_camera.c driver, and the three PXA platforms, patches for
> which should have been applied before both those trees and still haven't
> been applied are broken until the patches do get in and the later those
> patches get applied the longer the interval with the broken for them
> bisection is going to be.
Meanwhile I have to consider that we have several bug fixes outstanding,
and since I can't send Linus a pull request every day (max once a week)
I have to be very careful about when I send stuff.
So I only get _two_ opportunities during a merge window to send a pull
request.
I'm going to wait until tomorrow before sending my final pull for this
window, which is the penultimate day before the window closes.
Don't blame me for these delays - it's not my choice to impose such
delays. I'd really like to fix those broken platforms right now. I
just can't do so without causing additional delays for other issues.
Blame Linus for imposing the "max one pull a week" rule on me.
next prev parent reply other threads:[~2009-09-21 20:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-10 11:46 What's inside the pxa tree for this merge window Eric Miao
2009-09-10 11:54 ` Daniel Mack
2009-09-10 12:15 ` Guennadi Liakhovetski
2009-09-10 12:23 ` Eric Miao
2009-09-10 12:32 ` Daniel Mack
2009-09-10 12:35 ` Eric Miao
2009-09-10 12:44 ` Daniel Mack
2009-09-10 13:05 ` Guennadi Liakhovetski
2009-09-10 13:09 ` Daniel Mack
2009-09-14 11:03 ` Guennadi Liakhovetski
2009-09-14 11:11 ` Russell King - ARM Linux
2009-09-15 6:30 ` Guennadi Liakhovetski
2009-09-15 6:50 ` Eric Miao
2009-09-15 7:34 ` Russell King - ARM Linux
2009-09-15 7:55 ` Guennadi Liakhovetski
2009-09-18 6:43 ` Matej Kenda
2009-09-18 6:47 ` Eric Miao
2009-09-18 7:45 ` Russell King - ARM Linux
2009-09-21 19:19 ` Guennadi Liakhovetski
2009-09-21 20:09 ` Russell King - ARM Linux [this message]
2009-09-21 20:32 ` Jamie Lokier
2009-09-30 12:09 ` arm tree in broken state (was Re: What's inside the pxa tree for this merge window) Pavel Machek
2009-09-30 12:16 ` Guennadi Liakhovetski
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=20090921200923.GF30821@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).