Merge commit 'v2.6.26-rc8' into x86/xen

Conflicts: arch/x86/xen/enlighten.c arch/x86/xen/mmu.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-09-24 18:16:04 +00:00 · 2008-06-25 12:16:51 +02:00 · 2008-06-25 12:16:51 +02:00 · d02859ecb3
commit d02859ecb3
parent a987b16cc6 543cf4cb3f
319 changed files with 10497 additions and 5844 deletions
--- a/include/asm-alpha/core_mcpcia.h
+++ b/include/asm-alpha/core_mcpcia.h
--- a/include/asm-alpha/core_t2.h
+++ b/include/asm-alpha/core_t2.h
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
--- a/include/asm-alpha/mmu_context.h
+++ b/include/asm-alpha/mmu_context.h
--- a/include/asm-alpha/percpu.h
+++ b/include/asm-alpha/percpu.h
--- a/include/asm-alpha/system.h
+++ b/include/asm-alpha/system.h
--- a/include/asm-alpha/vga.h
+++ b/include/asm-alpha/vga.h
--- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
--- a/include/asm-ia64/sn/simulator.h
+++ b/include/asm-ia64/sn/simulator.h
--- a/include/asm-mips/cpu-info.h
+++ b/include/asm-mips/cpu-info.h
--- a/include/asm-mips/gic.h
+++ b/include/asm-mips/gic.h
--- a/include/asm-mips/lasat/serial.h
+++ b/include/asm-mips/lasat/serial.h
--- a/include/asm-mips/mach-au1x00/au1000.h
+++ b/include/asm-mips/mach-au1x00/au1000.h
--- a/include/asm-mips/pgtable-bits.h
+++ b/include/asm-mips/pgtable-bits.h
--- a/include/asm-powerpc/mediabay.h
+++ b/include/asm-powerpc/mediabay.h
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
--- a/include/asm-powerpc/spu_csa.h
+++ b/include/asm-powerpc/spu_csa.h
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
--- a/include/asm-x86/geode.h
+++ b/include/asm-x86/geode.h
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
--- a/include/asm-x86/kvm_para.h
+++ b/include/asm-x86/kvm_para.h
--- a/include/asm-x86/page_32.h
+++ b/include/asm-x86/page_32.h
--- a/include/asm-x86/pvclock-abi.h
+++ b/include/asm-x86/pvclock-abi.h
--- a/include/asm-x86/pvclock.h
+++ b/include/asm-x86/pvclock.h
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/a.out.h
+++ b/include/linux/a.out.h
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
--- a/include/linux/agpgart.h
+++ b/include/linux/agpgart.h
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h