merge b_devel into HEAD, which will become 0.7.3

[fs/lustre-release.git] / lustre / kernel_patches / pc / uml-patch-2.4.20-6.pc

diff --git a/lustre/kernel_patches/pc/uml-patch-2.4.20-4.pc b/lustre/kernel_patches/pc/uml-patch-2.4.20-6.pc
similarity index 99%
rename from lustre/kernel_patches/pc/uml-patch-2.4.20-4.pc
rename to lustre/kernel_patches/pc/uml-patch-2.4.20-6.pc
index 887e3fa..cad8767 100644 (file)
--- a/lustre/kernel_patches/pc/uml-patch-2.4.20-4.pc
+++ b/lustre/kernel_patches/pc/uml-patch-2.4.20-6.pc
@@ -1,25 +1,16 @@
-CREDITS
-Documentation/Configure.help
-MAINTAINERS
-Makefile
-arch/um/Makefile
-arch/um/Makefile-i386
-arch/um/Makefile-ia64
-arch/um/Makefile-os-Linux
-arch/um/Makefile-ppc
-arch/um/Makefile-skas
-arch/um/Makefile-tt
 arch/um/common.ld.in
-arch/um/config.in
-arch/um/config.release
 arch/um/config_block.in
 arch/um/config_char.in
+arch/um/config.in
 arch/um/config_net.in
+arch/um/config.release
 arch/um/config_scsi.in
 arch/um/defconfig
-arch/um/drivers/Makefile
 arch/um/drivers/chan_kern.c
 arch/um/drivers/chan_user.c
+arch/um/drivers/cow.h
+arch/um/drivers/cow_sys.h
+arch/um/drivers/cow_user.c
 arch/um/drivers/daemon.h
 arch/um/drivers/daemon_kern.c
 arch/um/drivers/daemon_user.c
@@ -29,6 +20,7 @@ arch/um/drivers/harddog_user.c
 arch/um/drivers/hostaudio_kern.c
 arch/um/drivers/hostaudio_user.c
 arch/um/drivers/line.c
+arch/um/drivers/Makefile
 arch/um/drivers/mcast.h
 arch/um/drivers/mcast_kern.c
 arch/um/drivers/mcast_user.c
@@ -63,15 +55,14 @@ arch/um/drivers/xterm.c
 arch/um/drivers/xterm.h
 arch/um/drivers/xterm_kern.c
 arch/um/dyn_link.ld.in
-arch/um/fs/Makefile
-arch/um/fs/hostfs/Makefile
 arch/um/fs/hostfs/hostfs.h
 arch/um/fs/hostfs/hostfs_kern.c
 arch/um/fs/hostfs/hostfs_user.c
-arch/um/fs/hppfs/Makefile
+arch/um/fs/hostfs/Makefile
 arch/um/fs/hppfs/hppfs_kern.c
+arch/um/fs/hppfs/Makefile
+arch/um/fs/Makefile
 arch/um/include/2_5compat.h
-arch/um/include/Makefile
 arch/um/include/chan_kern.h
 arch/um/include/chan_user.h
 arch/um/include/choose-mode.h
@@ -82,10 +73,12 @@ arch/um/include/helper.h
 arch/um/include/hostaudio.h
 arch/um/include/init.h
 arch/um/include/initrd.h
+arch/um/include/irq_kern.h
 arch/um/include/irq_user.h
 arch/um/include/kern.h
 arch/um/include/kern_util.h
 arch/um/include/line.h
+arch/um/include/Makefile
 arch/um/include/mconsole.h
 arch/um/include/mconsole_kern.h
 arch/um/include/mem.h
@@ -122,14 +115,13 @@ arch/um/include/tempfile.h
 arch/um/include/time_user.h
 arch/um/include/tlb.h
 arch/um/include/ubd_user.h
-arch/um/include/um_mmu.h
-arch/um/include/um_uaccess.h
 arch/um/include/umid.h
 arch/um/include/uml_uaccess.h
+arch/um/include/um_mmu.h
 arch/um/include/umn.h
+arch/um/include/um_uaccess.h
 arch/um/include/user.h
 arch/um/include/user_util.h
-arch/um/kernel/Makefile
 arch/um/kernel/checksum.c
 arch/um/kernel/config.c.in
 arch/um/kernel/exec_kern.c
@@ -139,12 +131,13 @@ arch/um/kernel/frame_kern.c
 arch/um/kernel/gmon_syms.c
 arch/um/kernel/gprof_syms.c
 arch/um/kernel/helper.c
-arch/um/kernel/init_task.c
 arch/um/kernel/initrd_kern.c
 arch/um/kernel/initrd_user.c
+arch/um/kernel/init_task.c
 arch/um/kernel/irq.c
 arch/um/kernel/irq_user.c
 arch/um/kernel/ksyms.c
+arch/um/kernel/Makefile
 arch/um/kernel/mem.c
 arch/um/kernel/mem_user.c
 arch/um/kernel/mprot.h
@@ -157,7 +150,6 @@ arch/um/kernel/sigio_kern.c
 arch/um/kernel/sigio_user.c
 arch/um/kernel/signal_kern.c
 arch/um/kernel/signal_user.c
-arch/um/kernel/skas/Makefile
 arch/um/kernel/skas/exec_kern.c
 arch/um/kernel/skas/exec_user.c
 arch/um/kernel/skas/include/mmu.h
@@ -167,23 +159,24 @@ arch/um/kernel/skas/include/proc_mm.h
 arch/um/kernel/skas/include/ptrace-skas.h
 arch/um/kernel/skas/include/skas.h
 arch/um/kernel/skas/include/uaccess.h
+arch/um/kernel/skas/Makefile
 arch/um/kernel/skas/mem.c
 arch/um/kernel/skas/mem_user.c
 arch/um/kernel/skas/mmu.c
 arch/um/kernel/skas/process.c
 arch/um/kernel/skas/process_kern.c
-arch/um/kernel/skas/sys-i386/Makefile
-arch/um/kernel/skas/sys-i386/sigcontext.c
 arch/um/kernel/skas/syscall_kern.c
 arch/um/kernel/skas/syscall_user.c
+arch/um/kernel/skas/sys-i386/Makefile
+arch/um/kernel/skas/sys-i386/sigcontext.c
 arch/um/kernel/skas/time.c
 arch/um/kernel/skas/tlb.c
 arch/um/kernel/skas/trap_user.c
 arch/um/kernel/skas/util/Makefile
 arch/um/kernel/skas/util/mk_ptregs.c
 arch/um/kernel/smp.c
-arch/um/kernel/sys_call_table.c
 arch/um/kernel/syscall_kern.c
+arch/um/kernel/sys_call_table.c
 arch/um/kernel/syscall_user.c
 arch/um/kernel/sysrq.c
 arch/um/kernel/tempfile.c
@@ -192,7 +185,6 @@ arch/um/kernel/time_kern.c
 arch/um/kernel/tlb.c
 arch/um/kernel/trap_kern.c
 arch/um/kernel/trap_user.c
-arch/um/kernel/tt/Makefile
 arch/um/kernel/tt/exec_kern.c
 arch/um/kernel/tt/exec_user.c
 arch/um/kernel/tt/gdb.c
@@ -205,6 +197,7 @@ arch/um/kernel/tt/include/ptrace-tt.h
 arch/um/kernel/tt/include/tt.h
 arch/um/kernel/tt/include/uaccess.h
 arch/um/kernel/tt/ksyms.c
+arch/um/kernel/tt/Makefile
 arch/um/kernel/tt/mem.c
 arch/um/kernel/tt/mem_user.c
 arch/um/kernel/tt/process_kern.c
@@ -216,10 +209,10 @@ arch/um/kernel/tt/ptproxy/sysdep.c
 arch/um/kernel/tt/ptproxy/sysdep.h
 arch/um/kernel/tt/ptproxy/wait.c
 arch/um/kernel/tt/ptproxy/wait.h
-arch/um/kernel/tt/sys-i386/Makefile
-arch/um/kernel/tt/sys-i386/sigcontext.c
 arch/um/kernel/tt/syscall_kern.c
 arch/um/kernel/tt/syscall_user.c
+arch/um/kernel/tt/sys-i386/Makefile
+arch/um/kernel/tt/sys-i386/sigcontext.c
 arch/um/kernel/tt/time.c
 arch/um/kernel/tt/tlb.c
 arch/um/kernel/tt/tracer.c
@@ -234,24 +227,31 @@ arch/um/kernel/user_syms.c
 arch/um/kernel/user_util.c
 arch/um/link.ld.in
 arch/um/main.c
-arch/um/os-Linux/Makefile
-arch/um/os-Linux/drivers/Makefile
+arch/um/Makefile
+arch/um/Makefile-i386
+arch/um/Makefile-ia64
+arch/um/Makefile-os-Linux
+arch/um/Makefile-ppc
+arch/um/Makefile-skas
+arch/um/Makefile-tt
 arch/um/os-Linux/drivers/etap.h
 arch/um/os-Linux/drivers/ethertap_kern.c
 arch/um/os-Linux/drivers/ethertap_user.c
+arch/um/os-Linux/drivers/Makefile
 arch/um/os-Linux/drivers/tuntap.h
 arch/um/os-Linux/drivers/tuntap_kern.c
 arch/um/os-Linux/drivers/tuntap_user.c
 arch/um/os-Linux/file.c
 arch/um/os-Linux/include/file.h
+arch/um/os-Linux/Makefile
 arch/um/os-Linux/process.c
 arch/um/os-Linux/tty.c
-arch/um/sys-i386/Makefile
 arch/um/sys-i386/bugs.c
 arch/um/sys-i386/checksum.S
 arch/um/sys-i386/fault.c
 arch/um/sys-i386/ksyms.c
 arch/um/sys-i386/ldt.c
+arch/um/sys-i386/Makefile
 arch/um/sys-i386/ptrace.c
 arch/um/sys-i386/ptrace_user.c
 arch/um/sys-i386/sigcontext.c
@@ -274,14 +274,16 @@ arch/um/util/mk_constants_kern.c
 arch/um/util/mk_constants_user.c
 arch/um/util/mk_task_kern.c
 arch/um/util/mk_task_user.c
+CREDITS
+Documentation/Configure.help
 drivers/char/Makefile
 drivers/char/tty_io.c
 drivers/net/setup.c
 include/asm-i386/hardirq.h
 include/asm-um/a.out.h
-include/asm-um/arch-signal-i386.h
 include/asm-um/archparam-i386.h
 include/asm-um/archparam-ppc.h
+include/asm-um/arch-signal-i386.h
 include/asm-um/atomic.h
 include/asm-um/bitops.h
 include/asm-um/boot.h
@@ -306,11 +308,11 @@ include/asm-um/highmem.h
 include/asm-um/hw_irq.h
 include/asm-um/ide.h
 include/asm-um/init.h
-include/asm-um/io.h
 include/asm-um/ioctl.h
 include/asm-um/ioctls.h
-include/asm-um/ipc.h
+include/asm-um/io.h
 include/asm-um/ipcbuf.h
+include/asm-um/ipc.h
 include/asm-um/irq.h
 include/asm-um/keyboard.h
 include/asm-um/kmap_types.h
@@ -318,8 +320,8 @@ include/asm-um/linux_logo.h
 include/asm-um/locks.h
 include/asm-um/mca_dma.h
 include/asm-um/mman.h
-include/asm-um/mmu.h
 include/asm-um/mmu_context.h
+include/asm-um/mmu.h
 include/asm-um/module.h
 include/asm-um/msgbuf.h
 include/asm-um/mtrr.h
@@ -358,8 +360,8 @@ include/asm-um/socket.h
 include/asm-um/sockios.h
 include/asm-um/softirq.h
 include/asm-um/spinlock.h
-include/asm-um/stat.h
 include/asm-um/statfs.h
+include/asm-um/stat.h
 include/asm-um/string.h
 include/asm-um/system-generic.h
 include/asm-um/system-i386.h
@@ -387,6 +389,8 @@ include/linux/proc_mm.h
 include/linux/tty.h
 init/do_mounts.c
 kernel/panic.c
+MAINTAINERS
+Makefile
 mm/Makefile
 mm/mmap.c
 mm/mprotect.c