Hi Linus,
Please pull:
ssh://master.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git xen-upstream
This contains updates for arch/x86 paravirt_ops and Xen.
A quick overview of the patchset:
paravirt_ops:
Remove the monolithic paravirt_ops structure, and replace it with
smaller structures of related functions. Also, clean up the handling
of lazy mode to make it easier to implement.x86/mm/init.c: remove a chunk of dead code
Xen:
- remove duplicate includes
- yield if the target vcpu of an IPI is not currently running
- add post-batch callbacks for multicalls [*]
- deal with unpinning pagetables when another vcpu still
has a cr3 reference [*]
- deal with split ptelocks by pinning each pte page
separately under lock
- determine the kernel/hypervisor address split dynamically
- use the right arg structure for register_vcpu_info [*]
- add extra debugging output for failed multicallsXFS:
- eagerly unmap vmapped areas to avoid confict with Xen [*][*] bugfix needed for 2.6.23. I've also cc:d them to stable@kernel.org
Diffstat:
arch/x86/kernel/alternative.c | 4
arch/x86/kernel/asm-offsets_32.c | 14
arch/x86/kernel/entry_32.S | 2
arch/x86/kernel/paravirt_32.c | 234 ++++++++-----
arch/x86/kernel/vmi_32.c | 211 ++++++------
arch/x86/mm/init_32.c | 22 -
arch/x86/xen/enlighten.c | 295 +++++++++-------
arch/x86/xen/mmu.c | 149 ++++++--
arch/x86/xen/multicalls.c | 52 ++
arch/x86/xen/multicalls.h | 5
arch/x86/xen/smp.c | 14
arch/x86/xen/time.c | 6
arch/x86/xen/xen-ops.h | 10
drivers/char/hvc_lguest.c | 2
drivers/lguest/core.c | 6
drivers/lguest/lguest.c | 154 ++++----
drivers/lguest/lguest_bus.c | 2
fs/xfs/linux-2.6/xfs_buf.c | 13
include/asm-x86/pa...
-
hm, could we do the arch/x86 changes via the arch/x86 tree instead?
We've got about a 100 patches pending there now, under QA, preparing
them for pushout. Will check your paravirt patches too, ok?Ingo
-
Yep, that's fine.
J
-
I just pulled your tree on top of my tip and there are no conflicts. I
checked the diffs and there is nothing, which is conflicting with our
backlogs.Linus, please go ahead and pull it yourself.
Thanks,
tglx
-
Heh. I had already done so.
Sometimes I'm tardy and miss things for weeks and need prodding, and
sometimes I pull almost before you've sent the "please pull" message.I'm unpredictable. Or keeping you on your toes. Or incompetent. Pick
whatever suits your mood ;)Linus
-
Yeah, I'm fixing merge conflicts the third time today :)
tglx
-
| Linus Torvalds | Linux 2.6.27-rc5 |
| Greg KH | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Greg Kroah-Hartman | [PATCH 004/196] Chinese: add translation of SubmittingPatches |
| Trent Piepho | Re: [PATCH] [POWERPC] Improve (in|out)_beXX() asm code |
git: | |
| Christoph Hellwig | Re: [PATCH 06/32] IGET: Mark iget() and read_inode() as being obsolete [try #2] |
| Gerrit Renker | [PATCH 0/37] dccp: Feature negotiation - last call for comments |
| David Miller | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| David Miller | [GIT]: Networking |
