public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Ingo Molnar <mingo@elte.hu>,
	the arch/x86 maintainers <x86@kernel.org>,
	Xen-devel <xen-devel@lists.xensource.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Dave Airlie <airlied@linux.ie>
Subject: 2.6.30 Xen merge plan (what's in xen.git)
Date: Tue, 24 Mar 2009 10:17:23 -0700	[thread overview]
Message-ID: <49C915A3.3020809@goop.org> (raw)

Hi Ingo, Linus,

I have several topic branches which I'd like to merge in this merge 
window.  They fall into two classes: those which make significant 
changes to arch/x86 files, and those which just touch Xen-specific files.

The x86-touching ones should definitely go via tip.git, just to keep 
things sane and orderly.

How should we handle the rest?  Should I send them directly to Linus, or 
put them via x86.git too?  Either way, they'll generally need to go 
after the non-Xen changes.

(I'll post full pull-requests with diffstats as followups to this mail.)

All branches in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git


Branches which mostly or entirely Xen (only trivial non-Xen changes):

push2/xen/core

    Updates to existing Xen support, features, optimisations, etc.

push2/xen/control

    A set of usermode interfaces for Xen (/sys/hypervisor, /dev/evtchn,
    updates to xenbus and xenfs)

push2/xen/dom0/core

    Core set of changes to add Xen dom0 functionality.  (Mostly
    Xen-only, but adds a new Xen mtrr driver.)


Branches with non-trivial non-Xen changes:

push2/x86/paravirt

    Allow preemption while doing a lazy mmu update.

push2/xen/dom0/apic

    Changes to hook the Xen dom0 apic model into the standard platform
    apic code.  HPA reviewed and OKed this.

push2/xen/dom0/pci

    Add a Xen pci driver and dma_ops implementations.  Small changes to
    x86 pci+swiotlb code to add some function calls.

push2/xen/dom0/agp

    Change the AGP driver to allocate its memory using the
    pci_alloc_coherent to get guaranteed physically contiguous memory,
    and use proper phys<->bus functions so that Xen's pseudo-phys <->
    machine mappings are handled properly.



Thanks,
    J

             reply	other threads:[~2009-03-24 17:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-24 17:17 Jeremy Fitzhardinge [this message]
2009-03-24 17:36 ` [GIT PULL] xen.git 2.6.30: push2/x86/paravirt: preemption in lazy mmu updates Jeremy Fitzhardinge
2009-03-24 17:37 ` [GIT PULL] xen.git 2.6.30: core Xen updates Jeremy Fitzhardinge
2009-03-24 17:39 ` [GIT PULL] xen.git 2.6.30: usermode control interfaces Jeremy Fitzhardinge
2009-03-24 17:40 ` [GIT PULL] xen.git 2.6.30: xen dom0 core support Jeremy Fitzhardinge
2009-03-24 17:42 ` [GIT PULL] xen.git 2.6.30: xen dom0 apic changes Jeremy Fitzhardinge
2009-03-24 17:43 ` [GIT PULL] xen.git 2.6.30: xen dom0 PCI device support Jeremy Fitzhardinge
2009-03-24 17:48 ` 2.6.30 Xen merge plan (what's in xen.git) Ingo Molnar
2009-03-24 18:08   ` Jeremy Fitzhardinge
2009-03-24 23:05     ` H. Peter Anvin
2009-03-24 23:28       ` H. Peter Anvin
2009-03-25  5:49       ` Jeremy Fitzhardinge
2009-03-29 15:58   ` Jeremy Fitzhardinge

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=49C915A3.3020809@goop.org \
    --to=jeremy@goop.org \
    --cc=airlied@linux.ie \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xensource.com \
    /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