public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel•crashing.org>
To: Ishizaki Kou <kou.ishizaki@toshiba•co.jp>
Cc: linuxppc-dev@ozlabs•org, paulus@samba•org, arnd@arndb•de
Subject: Re: [PATCH 10/15] celleb: SPU support routines
Date: Thu, 14 Dec 2006 16:34:05 +1100	[thread overview]
Message-ID: <1166074445.11914.310.camel@localhost.localdomain> (raw)
In-Reply-To: <200612140148.kBE1m8Bp008592@toshiba.co.jp>


> We think the integration of codes is preferable, but this is our first code
> for public and we need time to modify them. So, this time we hope they are
> merged into as it is. We'd like to discuss and modify our codes toward
> integrated codes after this first merge.  

As much as I would have liked to integrate your code in 2.6.20, it seems
that it won't be possible (as I told you privately earlier today). Linus
is getting fairly strict about the 2 weeks window which closed... today.

We'll merge the code in powerpc.git in the meantime, not in it's current
form but after you have addresses some of the remaning comments. That
way, it will be in -mm at least, and in the powerpc tree which means
that from there, you won't have to rebase it every time we change
something and it will get in first thing in 2.6.21 merge window.

That will also give us more time to address some of the remaining issues
that I'm not too happy with, like some of the PCI bits.

In general, code should be ready to merge -before- the merge window open
or at worst during the first week, the second week being mostly to flush
out bits that collided or needed rebasing etc...

In a similar vein, while some of the PS3 code was actually merged, a lot
of it wasn't yet (drivers etc...) are they are not ready, so it looks
like 2.6.20 won't be the "big cell relase" but 2.6.21 will be instead.

Cheers,
Ben.

  reply	other threads:[~2006-12-14  5:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-12  3:49 [PATCH 10/15] celleb: SPU support routines Ishizaki Kou
2006-12-12 12:59 ` Arnd Bergmann
2006-12-14  1:48   ` Ishizaki Kou
2006-12-14  5:34     ` Benjamin Herrenschmidt [this message]
2006-12-15  6:03       ` Akira Iguchi

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=1166074445.11914.310.camel@localhost.localdomain \
    --to=benh@kernel$(echo .)crashing.org \
    --cc=arnd@arndb$(echo .)de \
    --cc=kou.ishizaki@toshiba$(echo .)co.jp \
    --cc=linuxppc-dev@ozlabs$(echo .)org \
    --cc=paulus@samba$(echo .)org \
    /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