linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: linuxppc-dev list <linuxppc-dev@ozlabs.org>
Subject: powerpc.git merge status
Date: Tue, 15 Jul 2008 16:02:09 +1000	[thread overview]
Message-ID: <1216101729.7740.84.camel@pasglop> (raw)

I've pulled from Kumar, Josh and Grant, along with applying some
patches hand picked from patchworks and build fixes. I've merged in
Linus as of today (minus David Woodhouse firmware patches that have a
build breakage) in order to fix a (fairly trivial) merge conflict.

I've now pushed that to my powerpc.git "master" branch for overnight
build-testing with kisskb at which point

If all goes well, I'll put all of that in "merge" and "next" and ask
Linus to pull it tomorrow.

Now, regarding the remaining bits, still on my todo for the next batch,
probably later this week, in this merge window:

	- The CMO stuff, I need to have a closer look but it should
          probably go in
	- Milton's serie. Mostly fixes, haven't had time to look too
          closely yet.
	- Kumar PTE bits... that's a bit "hot" for this merge window
          but I suppose it can still make it.
	- Some Cell stuff for which I'm waiting a new serie from Arnd

If you believe I've missed something, now is time to be vocal about
it :-)

Cheers,
Ben.

             reply	other threads:[~2008-07-15  6:02 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-15  6:02 Benjamin Herrenschmidt [this message]
2008-07-15  6:16 ` powerpc.git merge status Grant Likely
2008-07-15  8:01   ` Benjamin Herrenschmidt
2008-07-15 11:39 ` Anton Vorontsov
2008-07-17  6:30   ` Benjamin Herrenschmidt
2008-07-15 11:55 ` Josh Boyer
2008-07-15 12:52 ` Kumar Gala

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=1216101729.7740.84.camel@pasglop \
    --to=benh@kernel.crashing.org \
    --cc=linuxppc-dev@ozlabs.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).