- rel 1

Changed files:
    kernel-grsec_full.patch -> 1.79
    kernel-vserver-2.3.patch -> 1.81
    kernel.spec -> 1.968

diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index 2d725f5820596c04e09562f37bf63944850524cc..4b7ae359eefe39c6ff0f88ef76539880660ae0a3 100644 (file)
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -9898,17 +9898,6 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess.h linux-3.0.4/arch/x86/inclu
  } while (0)
  
  #ifdef CONFIG_X86_WP_WORKS_OK
-diff -urNp linux-3.0.4/arch/x86/include/asm/vgtod.h linux-3.0.4/arch/x86/include/asm/vgtod.h
---- linux-3.0.4/arch/x86/include/asm/vgtod.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/vgtod.h   2011-08-23 21:47:55.000000000 -0400
-@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
-       int             sysctl_enabled;
-       struct timezone sys_tz;
-       struct { /* extract of a clocksource struct */
-+              char    name[8];
-               cycle_t (*vread)(void);
-               cycle_t cycle_last;
-               cycle_t mask;
 diff -urNp linux-3.0.4/arch/x86/include/asm/x86_init.h linux-3.0.4/arch/x86/include/asm/x86_init.h
 --- linux-3.0.4/arch/x86/include/asm/x86_init.h        2011-07-21 22:17:23.000000000 -0400
 +++ linux-3.0.4/arch/x86/include/asm/x86_init.h        2011-08-23 21:47:55.000000000 -0400
@@ -11239,7 +11228,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/early_printk.c linux-3.0.4/arch/x86/kerne
        early_console->write(early_console, buf, n);
 diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/entry_32.S
 --- linux-3.0.4/arch/x86/kernel/entry_32.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/entry_32.S     2011-08-23 21:48:14.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/entry_32.S     2011-08-30 18:23:52.000000000 -0400
 @@ -185,13 +185,146 @@
        /*CFI_REL_OFFSET gs, PT_GS*/
  .endm
@@ -11476,13 +11465,14 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
        .align 4
-@@ -433,12 +594,23 @@ sysenter_do_call:
+@@ -433,12 +594,24 @@ sysenter_do_call:
        testl $_TIF_ALLWORK_MASK, %ecx
        jne sysexit_audit
  sysenter_exit:
 +
 +#ifdef CONFIG_PAX_RANDKSTACK
 +      pushl_cfi %eax
++      movl %esp, %eax
 +      call pax_randomize_kstack
 +      popl_cfi %eax
 +#endif
@@ -11500,7 +11490,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        PTGS_TO_GS
        ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -455,6 +627,9 @@ sysenter_audit:
+@@ -455,6 +628,9 @@ sysenter_audit:
        movl %eax,%edx                  /* 2nd arg: syscall number */
        movl $AUDIT_ARCH_I386,%eax      /* 1st arg: audit arch */
        call audit_syscall_entry
@@ -11510,7 +11500,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        pushl_cfi %ebx
        movl PT_EAX(%esp),%eax          /* reload syscall number */
        jmp sysenter_do_call
-@@ -481,11 +656,17 @@ sysexit_audit:
+@@ -481,11 +657,17 @@ sysexit_audit:
  
        CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -11530,13 +11520,14 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  .popsection
        PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -518,6 +699,14 @@ syscall_exit:
+@@ -518,6 +700,15 @@ syscall_exit:
        testl $_TIF_ALLWORK_MASK, %ecx  # current->work
        jne syscall_exit_work
  
 +restore_all_pax:
 +
 +#ifdef CONFIG_PAX_RANDKSTACK
++      movl %esp, %eax
 +      call pax_randomize_kstack
 +#endif
 +
@@ -11545,7 +11536,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  restore_all:
        TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -577,14 +766,34 @@ ldt_ss:
+@@ -577,14 +768,34 @@ ldt_ss:
   * compensating for the offset by changing to the ESPFIX segment with
   * a base address that matches for the difference.
   */
@@ -11583,7 +11574,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        pushl_cfi $__ESPFIX_SS
        pushl_cfi %eax                  /* new kernel esp */
        /* Disable interrupts, but do not irqtrace this section: we
-@@ -613,29 +822,23 @@ work_resched:
+@@ -613,29 +824,23 @@ work_resched:
        movl TI_flags(%ebp), %ecx
        andl $_TIF_WORK_MASK, %ecx      # is there any work to be done other
                                        # than syscall tracing?
@@ -11617,7 +11608,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  #endif
        xorl %edx, %edx
        call do_notify_resume
-@@ -648,6 +851,9 @@ syscall_trace_entry:
+@@ -648,6 +853,9 @@ syscall_trace_entry:
        movl $-ENOSYS,PT_EAX(%esp)
        movl %esp, %eax
        call syscall_trace_enter
@@ -11627,7 +11618,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        /* What it returned is what we'll actually use.  */
        cmpl $(nr_syscalls), %eax
        jnae syscall_call
-@@ -670,6 +876,10 @@ END(syscall_exit_work)
+@@ -670,6 +878,10 @@ END(syscall_exit_work)
  
        RING0_INT_FRAME                 # can't unwind into user space anyway
  syscall_fault:
@@ -11638,7 +11629,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        GET_THREAD_INFO(%ebp)
        movl $-EFAULT,PT_EAX(%esp)
        jmp resume_userspace
-@@ -752,6 +962,36 @@ ptregs_clone:
+@@ -752,6 +964,36 @@ ptregs_clone:
        CFI_ENDPROC
  ENDPROC(ptregs_clone)
  
@@ -11675,7 +11666,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  .macro FIXUP_ESPFIX_STACK
  /*
   * Switch back for ESPFIX stack to the normal zerobased stack
-@@ -761,8 +1001,15 @@ ENDPROC(ptregs_clone)
+@@ -761,8 +1003,15 @@ ENDPROC(ptregs_clone)
   * normal stack and adjusts ESP with the matching offset.
   */
        /* fixup the stack */
@@ -11693,7 +11684,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        shl $16, %eax
        addl %esp, %eax                 /* the adjusted stack pointer */
        pushl_cfi $__KERNEL_DS
-@@ -1213,7 +1460,6 @@ return_to_handler:
+@@ -1213,7 +1462,6 @@ return_to_handler:
        jmp *%ecx
  #endif
  
@@ -11701,7 +11692,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1259,9 +1505,12 @@ error_code:
+@@ -1259,9 +1507,12 @@ error_code:
        movl $-1, PT_ORIG_EAX(%esp)     # no syscall to restart
        REG_TO_PTGS %ecx
        SET_KERNEL_GS %ecx
@@ -11715,7 +11706,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        TRACE_IRQS_OFF
        movl %esp,%eax                  # pt_regs pointer
        call *%edi
-@@ -1346,6 +1595,9 @@ nmi_stack_correct:
+@@ -1346,6 +1597,9 @@ nmi_stack_correct:
        xorl %edx,%edx          # zero error code
        movl %esp,%eax          # pt_regs pointer
        call do_nmi
@@ -11725,7 +11716,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        jmp restore_all_notrace
        CFI_ENDPROC
  
-@@ -1382,6 +1634,9 @@ nmi_espfix_stack:
+@@ -1382,6 +1636,9 @@ nmi_espfix_stack:
        FIXUP_ESPFIX_STACK              # %eax == %esp
        xorl %edx,%edx                  # zero error code
        call do_nmi
@@ -14175,7 +14166,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/
                if (!in_sched_functions(ip))
 diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/process.c
 --- linux-3.0.4/arch/x86/kernel/process.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/process.c      2011-08-23 21:47:55.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/process.c      2011-08-30 18:23:52.000000000 -0400
 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
  
  void free_thread_info(struct thread_info *ti)
@@ -14265,13 +14256,13 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/pro
  {
        local_irq_disable();
        /*
-@@ -668,16 +688,34 @@ static int __init idle_setup(char *str)
+@@ -668,16 +688,37 @@ static int __init idle_setup(char *str)
  }
  early_param("idle", idle_setup);
  
 -unsigned long arch_align_stack(unsigned long sp)
 +#ifdef CONFIG_PAX_RANDKSTACK
-+asmlinkage void pax_randomize_kstack(void)
++void pax_randomize_kstack(struct pt_regs *regs)
  {
 -      if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
 -              sp -= get_random_int() % 8192;
@@ -14288,6 +14279,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/pro
 +      if (!randomize_va_space)
 +              return;
 +
++      if (v8086_mode(regs))
++              return;
+ 
 +      rdtscl(time);
 +
 +      /* P4 seems to return a 0 LSB, ignore it */
@@ -14304,7 +14298,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/pro
 +
 +      thread->sp0 ^= time;
 +      load_sp0(init_tss + smp_processor_id(), thread);
- 
++
 +#ifdef CONFIG_X86_64
 +      percpu_write(kernel_stack, thread->sp0);
 +#endif
@@ -21082,18 +21076,6 @@ diff -urNp linux-3.0.4/arch/x86/platform/mrst/mrst.c linux-3.0.4/arch/x86/platfo
  }
  
  /*
-diff -urNp linux-3.0.4/arch/x86/platform/olpc/olpc_dt.c linux-3.0.4/arch/x86/platform/olpc/olpc_dt.c
---- linux-3.0.4/arch/x86/platform/olpc/olpc_dt.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/olpc/olpc_dt.c       2011-08-29 22:31:19.000000000 -0400
-@@ -163,7 +163,7 @@ static struct of_pdt_ops prom_olpc_ops _
-       .getchild = olpc_dt_getchild,
-       .getsibling = olpc_dt_getsibling,
-       .pkg2path = olpc_dt_pkg2path,
--};
-+} __no_const;
- 
- void __init olpc_dt_build_devicetree(void)
- {
 diff -urNp linux-3.0.4/arch/x86/platform/uv/tlb_uv.c linux-3.0.4/arch/x86/platform/uv/tlb_uv.c
 --- linux-3.0.4/arch/x86/platform/uv/tlb_uv.c  2011-07-21 22:17:23.000000000 -0400
 +++ linux-3.0.4/arch/x86/platform/uv/tlb_uv.c  2011-08-23 21:48:14.000000000 -0400
@@ -56485,6 +56467,18 @@ diff -urNp linux-3.0.4/include/linux/netfilter/xt_gradm.h linux-3.0.4/include/li
 +};
 +
 +#endif
+diff -urNp linux-3.0.4/include/linux/of_pdt.h linux-3.0.4/include/linux/of_pdt.h
+--- linux-3.0.4/include/linux/of_pdt.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/of_pdt.h 2011-08-30 06:20:11.000000000 -0400
+@@ -32,7 +32,7 @@ struct of_pdt_ops {
+ 
+       /* return 0 on success; fill in 'len' with number of bytes in path */
+       int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
+-};
++} __no_const;
+ 
+ extern void *prom_early_alloc(unsigned long size);
+ 
 diff -urNp linux-3.0.4/include/linux/oprofile.h linux-3.0.4/include/linux/oprofile.h
 --- linux-3.0.4/include/linux/oprofile.h       2011-07-21 22:17:23.000000000 -0400
 +++ linux-3.0.4/include/linux/oprofile.h       2011-08-23 21:47:56.000000000 -0400
@@ -57809,16 +57803,8 @@ diff -urNp linux-3.0.4/include/net/lapb.h linux-3.0.4/include/net/lapb.h
        struct lapb_frame       frmr_data;
 diff -urNp linux-3.0.4/include/net/neighbour.h linux-3.0.4/include/net/neighbour.h
 --- linux-3.0.4/include/net/neighbour.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/neighbour.h        2011-08-26 19:49:56.000000000 -0400
-@@ -117,14 +117,14 @@ struct neighbour {
- };
- 
- struct neigh_ops {
--      int                     family;
-+      const int               family;
-       void                    (*solicit)(struct neighbour *, struct sk_buff*);
-       void                    (*error_report)(struct neighbour *, struct sk_buff*);
-       int                     (*output)(struct sk_buff*);
++++ linux-3.0.4/include/net/neighbour.h        2011-08-31 18:39:25.000000000 -0400
+@@ -124,7 +124,7 @@ struct neigh_ops {
        int                     (*connected_output)(struct sk_buff*);
        int                     (*hh_output)(struct sk_buff*);
        int                     (*queue_xmit)(struct sk_buff*);
@@ -63158,7 +63144,7 @@ diff -urNp linux-3.0.4/localversion-grsec linux-3.0.4/localversion-grsec
 +-grsec
 diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
 --- linux-3.0.4/Makefile       2011-08-29 23:26:13.000000000 -0400
-+++ linux-3.0.4/Makefile       2011-08-29 23:26:21.000000000 -0400
++++ linux-3.0.4/Makefile       2011-09-01 17:26:49.000000000 -0400
 @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -63184,7 +63170,15 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
  KBUILD_AFLAGS_KERNEL :=
  KBUILD_CFLAGS_KERNEL :=
  KBUILD_AFLAGS   := -D__ASSEMBLY__
-@@ -564,6 +567,25 @@ else
+@@ -408,6 +411,7 @@ export RCS_TAR_IGNORE := --exclude SCCS 
+ 
+ # Basic helpers built in scripts/
+ PHONY += scripts_basic
++scripts_basic: KBUILD_CFLAGS := $(filter-out $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN),$(KBUILD_CFLAGS))
+ scripts_basic:
+       $(Q)$(MAKE) $(build)=scripts/basic
+       $(Q)rm -f .tmp_quiet_recordmcount
+@@ -564,6 +568,24 @@ else
  KBUILD_CFLAGS += -O2
  endif
  
@@ -63194,9 +63188,8 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
 +STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
 +endif
 +export CONSTIFY_PLUGIN STACKLEAK_PLUGIN
-+gcc-plugins0:
++gcc-plugins:
 +      $(Q)$(MAKE) $(build)=tools/gcc
-+gcc-plugins: scripts_basic gcc-plugins0
 +else
 +gcc-plugins:
 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
@@ -63219,32 +63212,52 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
  
  vmlinux-dirs  := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
                     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -907,6 +929,7 @@ define rule_vmlinux-modpost
+@@ -907,6 +929,8 @@ define rule_vmlinux-modpost
  endef
  
  # vmlinux image - including updated kernel symbols
-+vmlinux: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++$(vmlinux-all): KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++$(vmlinux-all): gcc-plugins
  vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE
  ifdef CONFIG_HEADERS_CHECK
        $(Q)$(MAKE) -f $(srctree)/Makefile headers_check
-@@ -973,7 +996,7 @@ ifneq ($(KBUILD_SRC),)
- endif
- 
- # prepare2 creates a makefile if using a separate output directory
--prepare2: prepare3 outputmakefile asm-generic
-+prepare2: prepare3 outputmakefile asm-generic gcc-plugins
- 
- prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
-                    include/config/auto.conf
-@@ -1087,6 +1110,7 @@ all: modules
- #     using awk while concatenating to the final file.
- 
- PHONY += modules
-+modules: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
- modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
-       $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
-       @$(kecho) '  Building modules, stage 2.';
-@@ -1359,6 +1383,7 @@ PHONY += $(module-dirs) modules
+@@ -941,7 +965,8 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
+ # Error messages still appears in the original language
+ 
+ PHONY += $(vmlinux-dirs)
+-$(vmlinux-dirs): prepare scripts
++$(vmlinux-dirs): KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++$(vmlinux-dirs): gcc-plugins prepare scripts
+       $(Q)$(MAKE) $(build)=$@
+ 
+ # Store (new) KERNELRELASE string in include/config/kernel.release
+@@ -986,6 +1011,7 @@ prepare0: archprepare FORCE
+       $(Q)$(MAKE) $(build)=. missing-syscalls
+ 
+ # All the preparing..
++prepare: KBUILD_CFLAGS := $(filter-out $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN),$(KBUILD_CFLAGS))
+ prepare: prepare0
+ 
+ # Generate some files
+@@ -1102,7 +1128,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
+ 
+ # Target to prepare building external modules
+ PHONY += modules_prepare
+-modules_prepare: prepare scripts
++modules_prepare: gcc-plugins prepare scripts
+ 
+ # Target to install modules
+ PHONY += modules_install
+@@ -1198,7 +1224,7 @@ distclean: mrproper
+       @find $(srctree) $(RCS_FIND_IGNORE) \
+               \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
+               -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
+-              -o -name '.*.rej' -o -size 0 \
++              -o -name '.*.rej' -o -name '*.so' -o -size 0 \
+               -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
+               -type f -print | xargs rm -f
+ 
+@@ -1359,6 +1385,7 @@ PHONY += $(module-dirs) modules
  $(module-dirs): crmodverdir $(objtree)/Module.symvers
        $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
  
@@ -63252,15 +63265,46 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
  modules: $(module-dirs)
        @$(kecho) '  Building modules, stage 2.';
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1404,7 +1429,7 @@ clean: $(clean-dirs)
-       $(call cmd,rmdirs)
-       $(call cmd,rmfiles)
-       @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
--              \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-+              \( -name '*.[oas]' -o -name '*.[ks]o' -o -name '.*.cmd' \
-               -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
-               -o -name '*.symtypes' -o -name 'modules.order' \
-               -o -name modules.builtin -o -name '.tmp_*.o.*' \
+@@ -1485,17 +1512,19 @@ else
+         target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
+ endif
+ 
+-%.s: %.c prepare scripts FORCE
++%.s: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++%.s: %.c gcc-plugins prepare scripts FORCE
+       $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.i: %.c prepare scripts FORCE
+       $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.c prepare scripts FORCE
++%.o: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++%.o: %.c gcc-plugins prepare scripts FORCE
+       $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.lst: %.c prepare scripts FORCE
+       $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.s: %.S prepare scripts FORCE
++%.s: %.S gcc-plugins prepare scripts FORCE
+       $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.S prepare scripts FORCE
++%.o: %.S gcc-plugins prepare scripts FORCE
+       $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.symtypes: %.c prepare scripts FORCE
+       $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+@@ -1505,11 +1534,13 @@ endif
+       $(cmd_crmodverdir)
+       $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+       $(build)=$(build-dir)
+-%/: prepare scripts FORCE
++%/: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++%/: gcc-plugins prepare scripts FORCE
+       $(cmd_crmodverdir)
+       $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+       $(build)=$(build-dir)
+-%.ko: prepare scripts FORCE
++%.ko: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++%.ko: gcc-plugins prepare scripts FORCE
+       $(cmd_crmodverdir)
+       $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
+       $(build)=$(build-dir) $(@:.ko=.o)
 diff -urNp linux-3.0.4/mm/filemap.c linux-3.0.4/mm/filemap.c
 --- linux-3.0.4/mm/filemap.c   2011-07-21 22:17:23.000000000 -0400
 +++ linux-3.0.4/mm/filemap.c   2011-08-23 21:48:14.000000000 -0400
@@ -70853,10 +70897,10 @@ diff -urNp linux-3.0.4/scripts/basic/fixdep.c linux-3.0.4/scripts/basic/fixdep.c
                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
 diff -urNp linux-3.0.4/scripts/gcc-plugin.sh linux-3.0.4/scripts/gcc-plugin.sh
 --- linux-3.0.4/scripts/gcc-plugin.sh  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/scripts/gcc-plugin.sh  2011-08-23 21:47:56.000000000 -0400
++++ linux-3.0.4/scripts/gcc-plugin.sh  2011-08-31 18:39:25.000000000 -0400
 @@ -0,0 +1,2 @@
 +#!/bin/sh
-+echo "#include \"gcc-plugin.h\"" | $* -x c -shared - -o /dev/null -I`$* -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
++echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $* -x c -shared - -o /dev/null -I`$* -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
 diff -urNp linux-3.0.4/scripts/Makefile.build linux-3.0.4/scripts/Makefile.build
 --- linux-3.0.4/scripts/Makefile.build 2011-07-21 22:17:23.000000000 -0400
 +++ linux-3.0.4/scripts/Makefile.build 2011-08-23 21:47:56.000000000 -0400
@@ -72351,17 +72395,21 @@ diff -urNp linux-3.0.4/sound/usb/card.h linux-3.0.4/sound/usb/card.h
  struct snd_usb_stream {
 diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constify_plugin.c
 --- linux-3.0.4/tools/gcc/constify_plugin.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/constify_plugin.c    2011-08-29 22:01:36.000000000 -0400
-@@ -0,0 +1,289 @@
++++ linux-3.0.4/tools/gcc/constify_plugin.c    2011-08-30 18:23:52.000000000 -0400
+@@ -0,0 +1,293 @@
 +/*
 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
++ * Copyright 2011 by PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2, or (at your option) v3
 + *
-+ * This gcc plugin constifies all structures which contain only function pointers and const fields.
++ * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
++ *
++ * Homepage:
++ * http://www.grsecurity.net/~ephox/const_plugin/
 + *
 + * Usage:
 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
-+ * $ gcc -fplugin=constify_plugin.so test.c  -O2
++ * $ gcc -fplugin=constify_plugin.so test.c -O2
 + */
 +
 +#include "gcc-plugin.h"

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index a657330d74459a56a857a0a9c16b627144df7241..c2e5af04f23daa2f66207ad41cd414ae6bc56682 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.0.3/.config.inet linux-3.0.3-vs2.3.1-pre10/.config.inet
---- linux-3.0.3/.config.inet   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/.config.inet     2011-06-13 14:55:18.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/.config.inet linux-3.0.4-vs2.3.1-pre10.1/.config.inet
+--- linux-3.0.4/.config.inet   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/.config.inet   2011-06-13 14:55:18.000000000 +0200
 @@ -0,0 +1,1620 @@
 +#
 +# Automatically generated make config: don't edit
@@ -1622,9 +1622,9 @@ diff -NurpP --minimal linux-3.0.3/.config.inet linux-3.0.3-vs2.3.1-pre10/.config
 +CONFIG_CPU_RMAP=y
 +CONFIG_NLATTR=y
 +# CONFIG_AVERAGE is not set
-diff -NurpP --minimal linux-3.0.3/Documentation/vserver/debug.txt linux-3.0.3-vs2.3.1-pre10/Documentation/vserver/debug.txt
---- linux-3.0.3/Documentation/vserver/debug.txt        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/Documentation/vserver/debug.txt  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/Documentation/vserver/debug.txt linux-3.0.4-vs2.3.1-pre10.1/Documentation/vserver/debug.txt
+--- linux-3.0.4/Documentation/vserver/debug.txt        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/Documentation/vserver/debug.txt        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,154 @@
 +
 +debug_cvirt:
@@ -1780,9 +1780,9 @@ diff -NurpP --minimal linux-3.0.3/Documentation/vserver/debug.txt linux-3.0.3-vs
 + m 2^m        "vx_acc_page[%5d,%s,%2d]: %5d%s"
 +      "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
 +      "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-3.0.3/arch/alpha/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/alpha/Kconfig
---- linux-3.0.3/arch/alpha/Kconfig     2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/Kconfig       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/alpha/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/Kconfig
+--- linux-3.0.4/arch/alpha/Kconfig     2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/Kconfig     2011-06-10 22:11:24.000000000 +0200
 @@ -668,6 +668,8 @@ config DUMMY_CONSOLE
        depends on VGA_HOSE
        default y
@@ -1792,9 +1792,9 @@ diff -NurpP --minimal linux-3.0.3/arch/alpha/Kconfig linux-3.0.3-vs2.3.1-pre10/a
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/entry.S linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/entry.S
---- linux-3.0.3/arch/alpha/kernel/entry.S      2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/entry.S        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/entry.S linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/entry.S
+--- linux-3.0.4/arch/alpha/kernel/entry.S      2010-10-21 13:06:45.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/entry.S      2011-06-10 22:11:24.000000000 +0200
 @@ -860,24 +860,15 @@ sys_getxgid:
        .globl  sys_getxpid
        .ent    sys_getxpid
@@ -1827,9 +1827,9 @@ diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/entry.S linux-3.0.3-vs2.3.1-
        ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/ptrace.c
---- linux-3.0.3/arch/alpha/kernel/ptrace.c     2011-01-05 21:48:40.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/ptrace.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/ptrace.c linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/ptrace.c
+--- linux-3.0.4/arch/alpha/kernel/ptrace.c     2011-01-05 21:48:40.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/ptrace.c     2011-06-10 22:11:24.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <linux/user.h>
  #include <linux/security.h>
@@ -1838,9 +1838,9 @@ diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/ptrace.c linux-3.0.3-vs2.3.1
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/systbls.S linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/systbls.S
---- linux-3.0.3/arch/alpha/kernel/systbls.S    2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/systbls.S      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/systbls.S linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/systbls.S
+--- linux-3.0.4/arch/alpha/kernel/systbls.S    2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/systbls.S    2011-06-10 22:11:24.000000000 +0200
 @@ -446,7 +446,7 @@ sys_call_table:
        .quad sys_stat64                        /* 425 */
        .quad sys_lstat64
@@ -1850,9 +1850,9 @@ diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/systbls.S linux-3.0.3-vs2.3.
        .quad sys_ni_syscall                    /* sys_mbind */
        .quad sys_ni_syscall                    /* sys_get_mempolicy */
        .quad sys_ni_syscall                    /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/traps.c
---- linux-3.0.3/arch/alpha/kernel/traps.c      2010-10-21 13:06:46.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/traps.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/traps.c
+--- linux-3.0.4/arch/alpha/kernel/traps.c      2010-10-21 13:06:46.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/traps.c      2011-06-10 22:11:24.000000000 +0200
 @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
        printk("CPU %d ", hard_smp_processor_id());
@@ -1863,9 +1863,9 @@ diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/traps.c linux-3.0.3-vs2.3.1-
        dik_show_regs(regs, r9_15);
        add_taint(TAINT_DIE);
        dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.0.3/arch/arm/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/arm/Kconfig
---- linux-3.0.3/arch/arm/Kconfig       2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/arm/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/arm/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/arm/Kconfig
+--- linux-3.0.4/arch/arm/Kconfig       2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/arm/Kconfig       2011-06-10 22:11:24.000000000 +0200
 @@ -2035,6 +2035,8 @@ source "fs/Kconfig"
  
  source "arch/arm/Kconfig.debug"
@@ -1875,9 +1875,9 @@ diff -NurpP --minimal linux-3.0.3/arch/arm/Kconfig linux-3.0.3-vs2.3.1-pre10/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/arm/kernel/calls.S linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/calls.S
---- linux-3.0.3/arch/arm/kernel/calls.S        2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/calls.S  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/arm/kernel/calls.S linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/calls.S
+--- linux-3.0.4/arch/arm/kernel/calls.S        2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/calls.S        2011-06-10 22:11:24.000000000 +0200
 @@ -322,7 +322,7 @@
  /* 310 */     CALL(sys_request_key)
                CALL(sys_keyctl)
@@ -1887,9 +1887,9 @@ diff -NurpP --minimal linux-3.0.3/arch/arm/kernel/calls.S linux-3.0.3-vs2.3.1-pr
                CALL(sys_ioprio_set)
  /* 315 */     CALL(sys_ioprio_get)
                CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.0.3/arch/arm/kernel/process.c linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/process.c
---- linux-3.0.3/arch/arm/kernel/process.c      2011-05-22 16:16:47.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/process.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/arm/kernel/process.c linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/process.c
+--- linux-3.0.4/arch/arm/kernel/process.c      2011-05-22 16:16:47.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/process.c      2011-06-10 22:11:24.000000000 +0200
 @@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
@@ -1900,9 +1900,9 @@ diff -NurpP --minimal linux-3.0.3/arch/arm/kernel/process.c linux-3.0.3-vs2.3.1-
        __show_regs(regs);
        __backtrace();
  }
-diff -NurpP --minimal linux-3.0.3/arch/arm/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/traps.c
---- linux-3.0.3/arch/arm/kernel/traps.c        2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/traps.c  2011-06-22 12:39:12.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/arm/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/traps.c
+--- linux-3.0.4/arch/arm/kernel/traps.c        2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/traps.c        2011-06-22 12:39:12.000000000 +0200
 @@ -242,8 +242,8 @@ static int __die(const char *str, int er
  
        print_modules();
@@ -1914,9 +1914,9 @@ diff -NurpP --minimal linux-3.0.3/arch/arm/kernel/traps.c linux-3.0.3-vs2.3.1-pr
  
        if (!user_mode(regs) || in_interrupt()) {
                dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.0.3/arch/cris/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/cris/Kconfig
---- linux-3.0.3/arch/cris/Kconfig      2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/cris/Kconfig        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/cris/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/cris/Kconfig
+--- linux-3.0.4/arch/cris/Kconfig      2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/cris/Kconfig      2011-06-10 22:11:24.000000000 +0200
 @@ -678,6 +678,8 @@ source "drivers/staging/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -1926,9 +1926,9 @@ diff -NurpP --minimal linux-3.0.3/arch/cris/Kconfig linux-3.0.3-vs2.3.1-pre10/ar
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/frv/kernel/kernel_thread.S linux-3.0.3-vs2.3.1-pre10/arch/frv/kernel/kernel_thread.S
---- linux-3.0.3/arch/frv/kernel/kernel_thread.S        2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/arch/frv/kernel/kernel_thread.S  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/frv/kernel/kernel_thread.S linux-3.0.4-vs2.3.1-pre10.1/arch/frv/kernel/kernel_thread.S
+--- linux-3.0.4/arch/frv/kernel/kernel_thread.S        2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/frv/kernel/kernel_thread.S        2011-06-10 22:11:24.000000000 +0200
 @@ -37,7 +37,7 @@ kernel_thread:
  
        # start by forking the current process, but with shared VM
@@ -1938,9 +1938,9 @@ diff -NurpP --minimal linux-3.0.3/arch/frv/kernel/kernel_thread.S linux-3.0.3-vs
        sethi.p         #0xe4e4,gr9             ; second syscall arg    [newsp]
        setlo           #0xe4e4,gr9
        setlos.p        #0,gr10                 ; third syscall arg     [parent_tidptr]
-diff -NurpP --minimal linux-3.0.3/arch/h8300/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/h8300/Kconfig
---- linux-3.0.3/arch/h8300/Kconfig     2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/h8300/Kconfig       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/h8300/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/h8300/Kconfig
+--- linux-3.0.4/arch/h8300/Kconfig     2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/h8300/Kconfig     2011-06-10 22:11:24.000000000 +0200
 @@ -213,6 +213,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -1950,9 +1950,9 @@ diff -NurpP --minimal linux-3.0.3/arch/h8300/Kconfig linux-3.0.3-vs2.3.1-pre10/a
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/ia64/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/ia64/Kconfig
---- linux-3.0.3/arch/ia64/Kconfig      2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/Kconfig        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/ia64/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/Kconfig
+--- linux-3.0.4/arch/ia64/Kconfig      2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/Kconfig      2011-06-10 22:11:24.000000000 +0200
 @@ -671,6 +671,8 @@ source "fs/Kconfig"
  
  source "arch/ia64/Kconfig.debug"
@@ -1962,9 +1962,9 @@ diff -NurpP --minimal linux-3.0.3/arch/ia64/Kconfig linux-3.0.3-vs2.3.1-pre10/ar
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/ia64/include/asm/tlb.h linux-3.0.3-vs2.3.1-pre10/arch/ia64/include/asm/tlb.h
---- linux-3.0.3/arch/ia64/include/asm/tlb.h    2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/include/asm/tlb.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/ia64/include/asm/tlb.h linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/include/asm/tlb.h
+--- linux-3.0.4/arch/ia64/include/asm/tlb.h    2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/include/asm/tlb.h    2011-06-10 22:11:24.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
@@ -1973,9 +1973,9 @@ diff -NurpP --minimal linux-3.0.3/arch/ia64/include/asm/tlb.h linux-3.0.3-vs2.3.
  
  #include <asm/pgalloc.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/entry.S linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/entry.S
---- linux-3.0.3/arch/ia64/kernel/entry.S       2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/entry.S linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/entry.S
+--- linux-3.0.4/arch/ia64/kernel/entry.S       2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/entry.S       2011-06-10 22:11:24.000000000 +0200
 @@ -1714,7 +1714,7 @@ sys_call_table:
        data8 sys_mq_notify
        data8 sys_mq_getsetattr
@@ -1985,9 +1985,9 @@ diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/entry.S linux-3.0.3-vs2.3.1-p
        data8 sys_waitid                        // 1270
        data8 sys_add_key
        data8 sys_request_key
-diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/perfmon.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/perfmon.c
---- linux-3.0.3/arch/ia64/kernel/perfmon.c     2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/perfmon.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/perfmon.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/perfmon.c
+--- linux-3.0.4/arch/ia64/kernel/perfmon.c     2011-03-15 18:06:39.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/perfmon.c     2011-06-10 22:11:24.000000000 +0200
 @@ -42,6 +42,7 @@
  #include <linux/completion.h>
  #include <linux/tracehook.h>
@@ -1996,9 +1996,9 @@ diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/perfmon.c linux-3.0.3-vs2.3.1
  
  #include <asm/errno.h>
  #include <asm/intrinsics.h>
-diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/process.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/process.c
---- linux-3.0.3/arch/ia64/kernel/process.c     2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/process.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/process.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/process.c
+--- linux-3.0.4/arch/ia64/kernel/process.c     2011-03-15 18:06:39.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/process.c     2011-06-10 22:11:24.000000000 +0200
 @@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs)
        unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
  
@@ -2010,9 +2010,9 @@ diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/process.c linux-3.0.3-vs2.3.1
        printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
               regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
               init_utsname()->release);
-diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/ptrace.c
---- linux-3.0.3/arch/ia64/kernel/ptrace.c      2011-01-05 21:48:59.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/ptrace.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/ptrace.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/ptrace.c
+--- linux-3.0.4/arch/ia64/kernel/ptrace.c      2011-01-05 21:48:59.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/ptrace.c      2011-06-10 22:11:24.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/regset.h>
  #include <linux/elf.h>
@@ -2021,9 +2021,9 @@ diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/ptrace.c linux-3.0.3-vs2.3.1-
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/traps.c
---- linux-3.0.3/arch/ia64/kernel/traps.c       2010-07-07 18:31:01.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/traps.c
+--- linux-3.0.4/arch/ia64/kernel/traps.c       2010-07-07 18:31:01.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/traps.c       2011-06-10 22:11:24.000000000 +0200
 @@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
        put_cpu();
  
@@ -2048,9 +2048,9 @@ diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/traps.c linux-3.0.3-vs2.3.1-p
                        }
                }
        }
-diff -NurpP --minimal linux-3.0.3/arch/ia64/mm/fault.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/mm/fault.c
---- linux-3.0.3/arch/ia64/mm/fault.c   2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/mm/fault.c     2011-06-10 22:28:23.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/ia64/mm/fault.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/mm/fault.c
+--- linux-3.0.4/arch/ia64/mm/fault.c   2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/mm/fault.c   2011-06-10 22:28:23.000000000 +0200
 @@ -11,6 +11,7 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -2059,9 +2059,9 @@ diff -NurpP --minimal linux-3.0.3/arch/ia64/mm/fault.c linux-3.0.3-vs2.3.1-pre10
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.3/arch/m32r/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/m32r/kernel/traps.c
---- linux-3.0.3/arch/m32r/kernel/traps.c       2009-12-03 20:01:57.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/m32r/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/m32r/kernel/traps.c
+--- linux-3.0.4/arch/m32r/kernel/traps.c       2009-12-03 20:01:57.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/m32r/kernel/traps.c       2011-06-10 22:11:24.000000000 +0200
 @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
        } else {
                printk("SPI: %08lx\n", sp);
@@ -2074,9 +2074,9 @@ diff -NurpP --minimal linux-3.0.3/arch/m32r/kernel/traps.c linux-3.0.3-vs2.3.1-p
  
        /*
         * When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.0.3/arch/m68k/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/m68k/Kconfig
---- linux-3.0.3/arch/m68k/Kconfig      2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/m68k/Kconfig        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/m68k/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/m68k/Kconfig
+--- linux-3.0.4/arch/m68k/Kconfig      2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/m68k/Kconfig      2011-06-10 22:11:24.000000000 +0200
 @@ -241,6 +241,8 @@ source "fs/Kconfig"
  
  source "arch/m68k/Kconfig.debug"
@@ -2086,9 +2086,9 @@ diff -NurpP --minimal linux-3.0.3/arch/m68k/Kconfig linux-3.0.3-vs2.3.1-pre10/ar
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/mips/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/mips/Kconfig
---- linux-3.0.3/arch/mips/Kconfig      2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/mips/Kconfig        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/mips/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/mips/Kconfig
+--- linux-3.0.4/arch/mips/Kconfig      2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/Kconfig      2011-06-10 22:11:24.000000000 +0200
 @@ -2485,6 +2485,8 @@ source "fs/Kconfig"
  
  source "arch/mips/Kconfig.debug"
@@ -2098,9 +2098,9 @@ diff -NurpP --minimal linux-3.0.3/arch/mips/Kconfig linux-3.0.3-vs2.3.1-pre10/ar
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/ptrace.c
---- linux-3.0.3/arch/mips/kernel/ptrace.c      2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/ptrace.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/ptrace.c linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/ptrace.c
+--- linux-3.0.4/arch/mips/kernel/ptrace.c      2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/ptrace.c      2011-06-10 22:11:24.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/security.h>
  #include <linux/audit.h>
@@ -2119,9 +2119,9 @@ diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/ptrace.c linux-3.0.3-vs2.3.1-
        switch (request) {
        /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall32-o32.S linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall32-o32.S
---- linux-3.0.3/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall32-o32.S   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall32-o32.S linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall32-o32.S
+--- linux-3.0.4/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200
 @@ -523,7 +523,7 @@ einval:    li      v0, -ENOSYS
        sys     sys_mq_timedreceive     5
        sys     sys_mq_notify           2       /* 4275 */
@@ -2131,9 +2131,9 @@ diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall32-o32.S linux-3.0.3-vs2
        sys     sys_waitid              5
        sys     sys_ni_syscall          0       /* available, was setaltroot */
        sys     sys_add_key             5       /* 4280 */
-diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall64-64.S linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-64.S
---- linux-3.0.3/arch/mips/kernel/scall64-64.S  2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-64.S    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall64-64.S linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-64.S
+--- linux-3.0.4/arch/mips/kernel/scall64-64.S  2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-64.S  2011-06-10 22:11:24.000000000 +0200
 @@ -362,7 +362,7 @@ sys_call_table:
        PTR     sys_mq_timedreceive
        PTR     sys_mq_notify
@@ -2143,9 +2143,9 @@ diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall64-64.S linux-3.0.3-vs2.
        PTR     sys_waitid
        PTR     sys_ni_syscall                  /* available, was setaltroot */
        PTR     sys_add_key
-diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall64-n32.S linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-n32.S
---- linux-3.0.3/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-n32.S   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall64-n32.S linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-n32.S
+--- linux-3.0.4/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200
 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
        PTR     compat_sys_mq_timedreceive
        PTR     compat_sys_mq_notify
@@ -2155,9 +2155,9 @@ diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall64-n32.S linux-3.0.3-vs2
        PTR     compat_sys_waitid
        PTR     sys_ni_syscall                  /* available, was setaltroot */
        PTR     sys_add_key
-diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall64-o32.S linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-o32.S
---- linux-3.0.3/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-o32.S   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall64-o32.S linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-o32.S
+--- linux-3.0.4/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200
 @@ -480,7 +480,7 @@ sys_call_table:
        PTR     compat_sys_mq_timedreceive
        PTR     compat_sys_mq_notify            /* 4275 */
@@ -2167,9 +2167,9 @@ diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall64-o32.S linux-3.0.3-vs2
        PTR     sys_32_waitid
        PTR     sys_ni_syscall                  /* available, was setaltroot */
        PTR     sys_add_key                     /* 4280 */
-diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/traps.c
---- linux-3.0.3/arch/mips/kernel/traps.c       2011-05-22 16:17:00.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/traps.c
+--- linux-3.0.4/arch/mips/kernel/traps.c       2011-05-22 16:17:00.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/traps.c       2011-06-10 22:11:24.000000000 +0200
 @@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
  
        __show_regs(regs);
@@ -2184,9 +2184,9 @@ diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/traps.c linux-3.0.3-vs2.3.1-p
        if (cpu_has_userlocal) {
                unsigned long tls;
  
-diff -NurpP --minimal linux-3.0.3/arch/parisc/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/parisc/Kconfig
---- linux-3.0.3/arch/parisc/Kconfig    2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/parisc/Kconfig      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/parisc/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/Kconfig
+--- linux-3.0.4/arch/parisc/Kconfig    2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/Kconfig    2011-06-10 22:11:24.000000000 +0200
 @@ -279,6 +279,8 @@ source "fs/Kconfig"
  
  source "arch/parisc/Kconfig.debug"
@@ -2196,9 +2196,9 @@ diff -NurpP --minimal linux-3.0.3/arch/parisc/Kconfig linux-3.0.3-vs2.3.1-pre10/
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/parisc/kernel/syscall_table.S linux-3.0.3-vs2.3.1-pre10/arch/parisc/kernel/syscall_table.S
---- linux-3.0.3/arch/parisc/kernel/syscall_table.S     2011-08-29 03:10:18.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/parisc/kernel/syscall_table.S       2011-08-29 03:45:07.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/parisc/kernel/syscall_table.S linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/kernel/syscall_table.S
+--- linux-3.0.4/arch/parisc/kernel/syscall_table.S     2011-08-31 18:56:40.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/kernel/syscall_table.S     2011-08-29 03:45:07.000000000 +0200
 @@ -361,7 +361,7 @@
        ENTRY_COMP(mbind)               /* 260 */
        ENTRY_COMP(get_mempolicy)
@@ -2208,9 +2208,9 @@ diff -NurpP --minimal linux-3.0.3/arch/parisc/kernel/syscall_table.S linux-3.0.3
        ENTRY_SAME(add_key)
        ENTRY_SAME(request_key)         /* 265 */
        ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.0.3/arch/parisc/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/parisc/kernel/traps.c
---- linux-3.0.3/arch/parisc/kernel/traps.c     2009-09-10 15:25:40.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/parisc/kernel/traps.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/parisc/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/kernel/traps.c
+--- linux-3.0.4/arch/parisc/kernel/traps.c     2009-09-10 15:25:40.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/kernel/traps.c     2011-06-10 22:11:24.000000000 +0200
 @@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
                if (err == 0)
                        return; /* STFU */
@@ -2234,9 +2234,9 @@ diff -NurpP --minimal linux-3.0.3/arch/parisc/kernel/traps.c linux-3.0.3-vs2.3.1
  
        /* Wot's wrong wif bein' racy? */
        if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.0.3/arch/parisc/mm/fault.c linux-3.0.3-vs2.3.1-pre10/arch/parisc/mm/fault.c
---- linux-3.0.3/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/parisc/mm/fault.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/parisc/mm/fault.c linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/mm/fault.c
+--- linux-3.0.4/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/mm/fault.c 2011-06-10 22:11:24.000000000 +0200
 @@ -237,8 +237,9 @@ bad_area:
  
  #ifdef PRINT_USER_FAULTS
@@ -2249,9 +2249,9 @@ diff -NurpP --minimal linux-3.0.3/arch/parisc/mm/fault.c linux-3.0.3-vs2.3.1-pre
                if (vma) {
                        printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
                                        vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-3.0.3/arch/powerpc/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/powerpc/Kconfig
---- linux-3.0.3/arch/powerpc/Kconfig   2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/Kconfig     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/powerpc/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/Kconfig
+--- linux-3.0.4/arch/powerpc/Kconfig   2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/Kconfig   2011-06-10 22:11:24.000000000 +0200
 @@ -978,6 +978,8 @@ source "lib/Kconfig"
  
  source "arch/powerpc/Kconfig.debug"
@@ -2261,9 +2261,9 @@ diff -NurpP --minimal linux-3.0.3/arch/powerpc/Kconfig linux-3.0.3-vs2.3.1-pre10
  source "security/Kconfig"
  
  config KEYS_COMPAT
-diff -NurpP --minimal linux-3.0.3/arch/powerpc/include/asm/unistd.h linux-3.0.3-vs2.3.1-pre10/arch/powerpc/include/asm/unistd.h
---- linux-3.0.3/arch/powerpc/include/asm/unistd.h      2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/include/asm/unistd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/powerpc/include/asm/unistd.h linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/include/asm/unistd.h
+--- linux-3.0.4/arch/powerpc/include/asm/unistd.h      2011-07-22 11:17:40.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/include/asm/unistd.h      2011-06-10 22:11:24.000000000 +0200
 @@ -275,7 +275,7 @@
  #endif
  #define __NR_rtas             255
@@ -2273,9 +2273,9 @@ diff -NurpP --minimal linux-3.0.3/arch/powerpc/include/asm/unistd.h linux-3.0.3-
  #define __NR_migrate_pages    258
  #define __NR_mbind            259
  #define __NR_get_mempolicy    260
-diff -NurpP --minimal linux-3.0.3/arch/powerpc/kernel/process.c linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/process.c
---- linux-3.0.3/arch/powerpc/kernel/process.c  2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/process.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/kernel/process.c
+--- linux-3.0.4/arch/powerpc/kernel/process.c  2011-07-22 11:17:40.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/kernel/process.c  2011-06-10 22:11:24.000000000 +0200
 @@ -656,8 +656,9 @@ void show_regs(struct pt_regs * regs)
  #else
                printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
@@ -2288,9 +2288,9 @@ diff -NurpP --minimal linux-3.0.3/arch/powerpc/kernel/process.c linux-3.0.3-vs2.
  
  #ifdef CONFIG_SMP
        printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.0.3/arch/powerpc/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/traps.c
---- linux-3.0.3/arch/powerpc/kernel/traps.c    2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/traps.c      2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/powerpc/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/kernel/traps.c
+--- linux-3.0.4/arch/powerpc/kernel/traps.c    2011-07-22 11:17:40.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/kernel/traps.c    2011-07-19 00:44:39.000000000 +0200
 @@ -1075,8 +1075,9 @@ void nonrecoverable_exception(struct pt_
  
  void trace_syscall(struct pt_regs *regs)
@@ -2303,9 +2303,9 @@ diff -NurpP --minimal linux-3.0.3/arch/powerpc/kernel/traps.c linux-3.0.3-vs2.3.
               regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
  }
  
-diff -NurpP --minimal linux-3.0.3/arch/powerpc/kernel/vdso.c linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/vdso.c
---- linux-3.0.3/arch/powerpc/kernel/vdso.c     2011-05-22 16:17:02.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/vdso.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/powerpc/kernel/vdso.c linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/kernel/vdso.c
+--- linux-3.0.4/arch/powerpc/kernel/vdso.c     2011-05-22 16:17:02.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/powerpc/kernel/vdso.c     2011-06-10 22:11:24.000000000 +0200
 @@ -23,6 +23,7 @@
  #include <linux/security.h>
  #include <linux/bootmem.h>
@@ -2314,9 +2314,9 @@ diff -NurpP --minimal linux-3.0.3/arch/powerpc/kernel/vdso.c linux-3.0.3-vs2.3.1
  
  #include <asm/pgtable.h>
  #include <asm/system.h>
-diff -NurpP --minimal linux-3.0.3/arch/s390/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/s390/Kconfig
---- linux-3.0.3/arch/s390/Kconfig      2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/s390/Kconfig        2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/s390/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/s390/Kconfig
+--- linux-3.0.4/arch/s390/Kconfig      2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/s390/Kconfig      2011-07-01 11:35:34.000000000 +0200
 @@ -628,6 +628,8 @@ source "fs/Kconfig"
  
  source "arch/s390/Kconfig.debug"
@@ -2326,9 +2326,9 @@ diff -NurpP --minimal linux-3.0.3/arch/s390/Kconfig linux-3.0.3-vs2.3.1-pre10/ar
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/s390/include/asm/tlb.h linux-3.0.3-vs2.3.1-pre10/arch/s390/include/asm/tlb.h
---- linux-3.0.3/arch/s390/include/asm/tlb.h    2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/s390/include/asm/tlb.h      2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/s390/include/asm/tlb.h linux-3.0.4-vs2.3.1-pre10.1/arch/s390/include/asm/tlb.h
+--- linux-3.0.4/arch/s390/include/asm/tlb.h    2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/s390/include/asm/tlb.h    2011-06-15 02:40:14.000000000 +0200
 @@ -24,6 +24,8 @@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
@@ -2338,9 +2338,9 @@ diff -NurpP --minimal linux-3.0.3/arch/s390/include/asm/tlb.h linux-3.0.3-vs2.3.
  #include <asm/processor.h>
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.3/arch/s390/include/asm/unistd.h linux-3.0.3-vs2.3.1-pre10/arch/s390/include/asm/unistd.h
---- linux-3.0.3/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/s390/include/asm/unistd.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/s390/include/asm/unistd.h linux-3.0.4-vs2.3.1-pre10.1/arch/s390/include/asm/unistd.h
+--- linux-3.0.4/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/s390/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
 @@ -202,7 +202,7 @@
  #define __NR_clock_gettime    (__NR_timer_create+6)
  #define __NR_clock_getres     (__NR_timer_create+7)
@@ -2350,9 +2350,9 @@ diff -NurpP --minimal linux-3.0.3/arch/s390/include/asm/unistd.h linux-3.0.3-vs2
  #define __NR_statfs64         265
  #define __NR_fstatfs64                266
  #define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.0.3/arch/s390/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/arch/s390/kernel/ptrace.c
---- linux-3.0.3/arch/s390/kernel/ptrace.c      2011-03-15 18:06:45.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/arch/s390/kernel/ptrace.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/s390/kernel/ptrace.c linux-3.0.4-vs2.3.1-pre10.1/arch/s390/kernel/ptrace.c
+--- linux-3.0.4/arch/s390/kernel/ptrace.c      2011-03-15 18:06:45.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/s390/kernel/ptrace.c      2011-06-10 22:11:24.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/regset.h>
  #include <linux/tracehook.h>
@@ -2361,9 +2361,9 @@ diff -NurpP --minimal linux-3.0.3/arch/s390/kernel/ptrace.c linux-3.0.3-vs2.3.1-
  #include <trace/syscall.h>
  #include <asm/compat.h>
  #include <asm/segment.h>
-diff -NurpP --minimal linux-3.0.3/arch/s390/kernel/syscalls.S linux-3.0.3-vs2.3.1-pre10/arch/s390/kernel/syscalls.S
---- linux-3.0.3/arch/s390/kernel/syscalls.S    2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/s390/kernel/syscalls.S      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/s390/kernel/syscalls.S linux-3.0.4-vs2.3.1-pre10.1/arch/s390/kernel/syscalls.S
+--- linux-3.0.4/arch/s390/kernel/syscalls.S    2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/s390/kernel/syscalls.S    2011-06-10 22:11:24.000000000 +0200
 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
  SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper)      /* 260 */
  SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
@@ -2373,9 +2373,9 @@ diff -NurpP --minimal linux-3.0.3/arch/s390/kernel/syscalls.S linux-3.0.3-vs2.3.
  SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
  SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
  SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-3.0.3/arch/sh/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/sh/Kconfig
---- linux-3.0.3/arch/sh/Kconfig        2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/sh/Kconfig  2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/sh/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/sh/Kconfig
+--- linux-3.0.4/arch/sh/Kconfig        2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/sh/Kconfig        2011-07-19 00:44:39.000000000 +0200
 @@ -893,6 +893,8 @@ source "fs/Kconfig"
  
  source "arch/sh/Kconfig.debug"
@@ -2385,9 +2385,9 @@ diff -NurpP --minimal linux-3.0.3/arch/sh/Kconfig linux-3.0.3-vs2.3.1-pre10/arch
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/sh/kernel/irq.c linux-3.0.3-vs2.3.1-pre10/arch/sh/kernel/irq.c
---- linux-3.0.3/arch/sh/kernel/irq.c   2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/sh/kernel/irq.c     2011-07-19 00:45:06.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/sh/kernel/irq.c linux-3.0.4-vs2.3.1-pre10.1/arch/sh/kernel/irq.c
+--- linux-3.0.4/arch/sh/kernel/irq.c   2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/sh/kernel/irq.c   2011-07-19 00:45:06.000000000 +0200
 @@ -14,6 +14,7 @@
  #include <linux/ftrace.h>
  #include <linux/delay.h>
@@ -2396,9 +2396,9 @@ diff -NurpP --minimal linux-3.0.3/arch/sh/kernel/irq.c linux-3.0.3-vs2.3.1-pre10
  #include <asm/processor.h>
  #include <asm/machvec.h>
  #include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.3/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.3-vs2.3.1-pre10/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-3.0.3/arch/sh/kernel/vsyscall/vsyscall.c     2011-05-22 16:17:07.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/sh/kernel/vsyscall/vsyscall.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.4-vs2.3.1-pre10.1/arch/sh/kernel/vsyscall/vsyscall.c
+--- linux-3.0.4/arch/sh/kernel/vsyscall/vsyscall.c     2011-05-22 16:17:07.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/sh/kernel/vsyscall/vsyscall.c     2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/elf.h>
  #include <linux/sched.h>
@@ -2407,9 +2407,9 @@ diff -NurpP --minimal linux-3.0.3/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.3
  
  /*
   * Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-3.0.3/arch/sparc/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/sparc/Kconfig
---- linux-3.0.3/arch/sparc/Kconfig     2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/Kconfig       2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/sparc/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/Kconfig
+--- linux-3.0.4/arch/sparc/Kconfig     2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/Kconfig     2011-06-15 02:40:14.000000000 +0200
 @@ -601,6 +601,8 @@ source "fs/Kconfig"
  
  source "arch/sparc/Kconfig.debug"
@@ -2419,9 +2419,9 @@ diff -NurpP --minimal linux-3.0.3/arch/sparc/Kconfig linux-3.0.3-vs2.3.1-pre10/a
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/sparc/include/asm/tlb_64.h linux-3.0.3-vs2.3.1-pre10/arch/sparc/include/asm/tlb_64.h
---- linux-3.0.3/arch/sparc/include/asm/tlb_64.h        2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/include/asm/tlb_64.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/sparc/include/asm/tlb_64.h linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/include/asm/tlb_64.h
+--- linux-3.0.4/arch/sparc/include/asm/tlb_64.h        2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/include/asm/tlb_64.h        2011-06-10 22:11:24.000000000 +0200
 @@ -3,6 +3,7 @@
  
  #include <linux/swap.h>
@@ -2430,9 +2430,9 @@ diff -NurpP --minimal linux-3.0.3/arch/sparc/include/asm/tlb_64.h linux-3.0.3-vs
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
  #include <asm/mmu_context.h>
-diff -NurpP --minimal linux-3.0.3/arch/sparc/include/asm/unistd.h linux-3.0.3-vs2.3.1-pre10/arch/sparc/include/asm/unistd.h
---- linux-3.0.3/arch/sparc/include/asm/unistd.h        2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/include/asm/unistd.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/sparc/include/asm/unistd.h linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/include/asm/unistd.h
+--- linux-3.0.4/arch/sparc/include/asm/unistd.h        2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/include/asm/unistd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -335,7 +335,7 @@
  #define __NR_timer_getoverrun 264
  #define __NR_timer_delete     265
@@ -2442,9 +2442,9 @@ diff -NurpP --minimal linux-3.0.3/arch/sparc/include/asm/unistd.h linux-3.0.3-vs
  #define __NR_io_setup         268
  #define __NR_io_destroy               269
  #define __NR_io_submit                270
-diff -NurpP --minimal linux-3.0.3/arch/sparc/kernel/systbls_32.S linux-3.0.3-vs2.3.1-pre10/arch/sparc/kernel/systbls_32.S
---- linux-3.0.3/arch/sparc/kernel/systbls_32.S 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/kernel/systbls_32.S   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/sparc/kernel/systbls_32.S linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/kernel/systbls_32.S
+--- linux-3.0.4/arch/sparc/kernel/systbls_32.S 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/kernel/systbls_32.S 2011-06-10 22:11:24.000000000 +0200
 @@ -70,7 +70,7 @@ sys_call_table:
  /*250*/       .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
  /*255*/       .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -2454,9 +2454,9 @@ diff -NurpP --minimal linux-3.0.3/arch/sparc/kernel/systbls_32.S linux-3.0.3-vs2
  /*270*/       .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
  /*275*/       .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
  /*280*/       .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.0.3/arch/sparc/kernel/systbls_64.S linux-3.0.3-vs2.3.1-pre10/arch/sparc/kernel/systbls_64.S
---- linux-3.0.3/arch/sparc/kernel/systbls_64.S 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/kernel/systbls_64.S   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/sparc/kernel/systbls_64.S linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/kernel/systbls_64.S
+--- linux-3.0.4/arch/sparc/kernel/systbls_64.S 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/sparc/kernel/systbls_64.S 2011-06-10 22:11:24.000000000 +0200
 @@ -71,7 +71,7 @@ sys_call_table32:
  /*250*/       .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
        .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -2475,9 +2475,9 @@ diff -NurpP --minimal linux-3.0.3/arch/sparc/kernel/systbls_64.S linux-3.0.3-vs2
  /*270*/       .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
        .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
  /*280*/       .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.0.3/arch/um/Kconfig.rest linux-3.0.3-vs2.3.1-pre10/arch/um/Kconfig.rest
---- linux-3.0.3/arch/um/Kconfig.rest   2009-06-11 17:12:19.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/um/Kconfig.rest     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/um/Kconfig.rest linux-3.0.4-vs2.3.1-pre10.1/arch/um/Kconfig.rest
+--- linux-3.0.4/arch/um/Kconfig.rest   2009-06-11 17:12:19.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/um/Kconfig.rest   2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
  
  source "fs/Kconfig"
@@ -2487,9 +2487,9 @@ diff -NurpP --minimal linux-3.0.3/arch/um/Kconfig.rest linux-3.0.3-vs2.3.1-pre10
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/um/include/asm/tlb.h linux-3.0.3-vs2.3.1-pre10/arch/um/include/asm/tlb.h
---- linux-3.0.3/arch/um/include/asm/tlb.h      2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/um/include/asm/tlb.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/um/include/asm/tlb.h linux-3.0.4-vs2.3.1-pre10.1/arch/um/include/asm/tlb.h
+--- linux-3.0.4/arch/um/include/asm/tlb.h      2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/um/include/asm/tlb.h      2011-06-10 22:11:24.000000000 +0200
 @@ -3,6 +3,7 @@
  
  #include <linux/pagemap.h>
@@ -2498,14 +2498,14 @@ diff -NurpP --minimal linux-3.0.3/arch/um/include/asm/tlb.h linux-3.0.3-vs2.3.1-
  #include <asm/percpu.h>
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.3/arch/um/include/shared/kern_constants.h linux-3.0.3-vs2.3.1-pre10/arch/um/include/shared/kern_constants.h
---- linux-3.0.3/arch/um/include/shared/kern_constants.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/arch/um/include/shared/kern_constants.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/um/include/shared/kern_constants.h linux-3.0.4-vs2.3.1-pre10.1/arch/um/include/shared/kern_constants.h
+--- linux-3.0.4/arch/um/include/shared/kern_constants.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/um/include/shared/kern_constants.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1 @@
 +#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.0.3/arch/um/include/shared/user_constants.h linux-3.0.3-vs2.3.1-pre10/arch/um/include/shared/user_constants.h
---- linux-3.0.3/arch/um/include/shared/user_constants.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/arch/um/include/shared/user_constants.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/um/include/shared/user_constants.h linux-3.0.4-vs2.3.1-pre10.1/arch/um/include/shared/user_constants.h
+--- linux-3.0.4/arch/um/include/shared/user_constants.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/um/include/shared/user_constants.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,40 @@
 +/*
 + * DO NOT MODIFY.
@@ -2547,9 +2547,9 @@ diff -NurpP --minimal linux-3.0.3/arch/um/include/shared/user_constants.h linux-
 +#define UM_PROT_WRITE 2 /* PROT_WRITE # */
 +#define UM_PROT_EXEC 4 /* PROT_EXEC   # */
 +
-diff -NurpP --minimal linux-3.0.3/arch/x86/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/x86/Kconfig
---- linux-3.0.3/arch/x86/Kconfig       2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/x86/Kconfig 2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/x86/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/x86/Kconfig
+--- linux-3.0.4/arch/x86/Kconfig       2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/x86/Kconfig       2011-07-22 11:20:39.000000000 +0200
 @@ -2159,6 +2159,8 @@ source "fs/Kconfig"
  
  source "arch/x86/Kconfig.debug"
@@ -2559,9 +2559,9 @@ diff -NurpP --minimal linux-3.0.3/arch/x86/Kconfig linux-3.0.3-vs2.3.1-pre10/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3-vs2.3.1-pre10/arch/x86/ia32/ia32entry.S
---- linux-3.0.3/arch/x86/ia32/ia32entry.S      2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/x86/ia32/ia32entry.S        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4-vs2.3.1-pre10.1/arch/x86/ia32/ia32entry.S
+--- linux-3.0.4/arch/x86/ia32/ia32entry.S      2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/x86/ia32/ia32entry.S      2011-06-10 22:11:24.000000000 +0200
 @@ -776,7 +776,7 @@ ia32_sys_call_table:
        .quad sys_tgkill                /* 270 */
        .quad compat_sys_utimes
@@ -2571,9 +2571,9 @@ diff -NurpP --minimal linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3-vs2.3.1-
        .quad sys_mbind
        .quad compat_sys_get_mempolicy  /* 275 */
        .quad sys_set_mempolicy
-diff -NurpP --minimal linux-3.0.3/arch/x86/include/asm/unistd_64.h linux-3.0.3-vs2.3.1-pre10/arch/x86/include/asm/unistd_64.h
---- linux-3.0.3/arch/x86/include/asm/unistd_64.h       2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/x86/include/asm/unistd_64.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/x86/include/asm/unistd_64.h linux-3.0.4-vs2.3.1-pre10.1/arch/x86/include/asm/unistd_64.h
+--- linux-3.0.4/arch/x86/include/asm/unistd_64.h       2011-07-22 11:17:43.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/x86/include/asm/unistd_64.h       2011-06-10 22:11:24.000000000 +0200
 @@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
  #define __NR_utimes                           235
  __SYSCALL(__NR_utimes, sys_utimes)
@@ -2583,9 +2583,9 @@ diff -NurpP --minimal linux-3.0.3/arch/x86/include/asm/unistd_64.h linux-3.0.3-v
  #define __NR_mbind                            237
  __SYSCALL(__NR_mbind, sys_mbind)
  #define __NR_set_mempolicy                    238
-diff -NurpP --minimal linux-3.0.3/arch/x86/kernel/syscall_table_32.S linux-3.0.3-vs2.3.1-pre10/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.3/arch/x86/kernel/syscall_table_32.S     2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/arch/x86/kernel/syscall_table_32.S       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/arch/x86/kernel/syscall_table_32.S linux-3.0.4-vs2.3.1-pre10.1/arch/x86/kernel/syscall_table_32.S
+--- linux-3.0.4/arch/x86/kernel/syscall_table_32.S     2011-07-22 11:17:43.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/arch/x86/kernel/syscall_table_32.S     2011-06-10 22:11:24.000000000 +0200
 @@ -272,7 +272,7 @@ ENTRY(sys_call_table)
        .long sys_tgkill        /* 270 */
        .long sys_utimes
@@ -2595,9 +2595,9 @@ diff -NurpP --minimal linux-3.0.3/arch/x86/kernel/syscall_table_32.S linux-3.0.3
        .long sys_mbind
        .long sys_get_mempolicy
        .long sys_set_mempolicy
-diff -NurpP --minimal linux-3.0.3/block/genhd.c linux-3.0.3-vs2.3.1-pre10/block/genhd.c
---- linux-3.0.3/block/genhd.c  2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/block/genhd.c    2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/block/genhd.c linux-3.0.4-vs2.3.1-pre10.1/block/genhd.c
+--- linux-3.0.4/block/genhd.c  2011-07-22 11:17:43.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/block/genhd.c  2011-07-01 11:35:34.000000000 +0200
 @@ -1154,17 +1154,17 @@ static int diskstats_show(struct seq_fil
                cpu = part_stat_lock();
                part_round_stats(cpu, hd);
@@ -2620,9 +2620,9 @@ diff -NurpP --minimal linux-3.0.3/block/genhd.c linux-3.0.3-vs2.3.1-pre10/block/
                           jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),
                           part_in_flight(hd),
                           jiffies_to_msecs(part_stat_read(hd, io_ticks)),
-diff -NurpP --minimal linux-3.0.3/drivers/block/Kconfig linux-3.0.3-vs2.3.1-pre10/drivers/block/Kconfig
---- linux-3.0.3/drivers/block/Kconfig  2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/block/Kconfig    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/block/Kconfig linux-3.0.4-vs2.3.1-pre10.1/drivers/block/Kconfig
+--- linux-3.0.4/drivers/block/Kconfig  2011-07-22 11:17:44.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/block/Kconfig  2011-06-10 22:11:24.000000000 +0200
 @@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
  
  source "drivers/block/drbd/Kconfig"
@@ -2637,9 +2637,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/block/Kconfig linux-3.0.3-vs2.3.1-pre1
  config BLK_DEV_NBD
        tristate "Network block device support"
        depends on NET
-diff -NurpP --minimal linux-3.0.3/drivers/block/Makefile linux-3.0.3-vs2.3.1-pre10/drivers/block/Makefile
---- linux-3.0.3/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/block/Makefile   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/block/Makefile linux-3.0.4-vs2.3.1-pre10.1/drivers/block/Makefile
+--- linux-3.0.4/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/block/Makefile 2011-06-10 22:11:24.000000000 +0200
 @@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD)                += viodasd.o
  obj-$(CONFIG_BLK_DEV_SX8)     += sx8.o
  obj-$(CONFIG_BLK_DEV_UB)      += ub.o
@@ -2648,9 +2648,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/block/Makefile linux-3.0.3-vs2.3.1-pre
  
  obj-$(CONFIG_XEN_BLKDEV_FRONTEND)     += xen-blkfront.o
  obj-$(CONFIG_XEN_BLKDEV_BACKEND)      += xen-blkback/
-diff -NurpP --minimal linux-3.0.3/drivers/block/loop.c linux-3.0.3-vs2.3.1-pre10/drivers/block/loop.c
---- linux-3.0.3/drivers/block/loop.c   2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/block/loop.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/block/loop.c linux-3.0.4-vs2.3.1-pre10.1/drivers/block/loop.c
+--- linux-3.0.4/drivers/block/loop.c   2011-08-31 18:56:40.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/block/loop.c   2011-08-31 19:37:44.000000000 +0200
 @@ -75,6 +75,7 @@
  #include <linux/kthread.h>
  #include <linux/splice.h>
@@ -2667,7 +2667,7 @@ diff -NurpP --minimal linux-3.0.3/drivers/block/loop.c linux-3.0.3-vs2.3.1-pre10
        lo->lo_backing_file = file;
        lo->transfer = transfer_none;
        lo->ioctl = NULL;
-@@ -1019,6 +1021,7 @@ static int loop_clr_fd(struct loop_devic
+@@ -1021,6 +1023,7 @@ static int loop_clr_fd(struct loop_devic
        lo->lo_encrypt_key_size = 0;
        lo->lo_flags = 0;
        lo->lo_thread = NULL;
@@ -2675,7 +2675,7 @@ diff -NurpP --minimal linux-3.0.3/drivers/block/loop.c linux-3.0.3-vs2.3.1-pre10
        memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
        memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
        memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-@@ -1057,7 +1060,7 @@ loop_set_status(struct loop_device *lo, 
+@@ -1059,7 +1062,7 @@ loop_set_status(struct loop_device *lo, 
  
        if (lo->lo_encrypt_key_size &&
            lo->lo_key_owner != uid &&
@@ -2684,7 +2684,7 @@ diff -NurpP --minimal linux-3.0.3/drivers/block/loop.c linux-3.0.3-vs2.3.1-pre10
                return -EPERM;
        if (lo->lo_state != Lo_bound)
                return -ENXIO;
-@@ -1141,7 +1144,8 @@ loop_get_status(struct loop_device *lo, 
+@@ -1143,7 +1146,8 @@ loop_get_status(struct loop_device *lo, 
        memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
        info->lo_encrypt_type =
                lo->lo_encryption ? lo->lo_encryption->number : 0;
@@ -2694,7 +2694,7 @@ diff -NurpP --minimal linux-3.0.3/drivers/block/loop.c linux-3.0.3-vs2.3.1-pre10
                info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
                memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
                       lo->lo_encrypt_key_size);
-@@ -1487,6 +1491,9 @@ static int lo_open(struct block_device *
+@@ -1489,6 +1493,9 @@ static int lo_open(struct block_device *
  {
        struct loop_device *lo = bdev->bd_disk->private_data;
  
@@ -2704,9 +2704,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/block/loop.c linux-3.0.3-vs2.3.1-pre10
        mutex_lock(&lo->lo_ctl_mutex);
        lo->lo_refcnt++;
        mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.0.3/drivers/block/vroot.c linux-3.0.3-vs2.3.1-pre10/drivers/block/vroot.c
---- linux-3.0.3/drivers/block/vroot.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/block/vroot.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/block/vroot.c linux-3.0.4-vs2.3.1-pre10.1/drivers/block/vroot.c
+--- linux-3.0.4/drivers/block/vroot.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/block/vroot.c  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,292 @@
 +/*
 + *  linux/drivers/block/vroot.c
@@ -3000,9 +3000,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/block/vroot.c linux-3.0.3-vs2.3.1-pre1
 +
 +#endif
 +
-diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r100_reg_safe.h
---- linux-3.0.3/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r100_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/r100_reg_safe.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/r100_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,28 @@
 +static const unsigned r100_reg_safe_bm[102] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3032,9 +3032,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFFFF, 0xFFFFFFEF,
 +};
-diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r200_reg_safe.h
---- linux-3.0.3/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r200_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/r200_reg_safe.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/r200_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,28 @@
 +static const unsigned r200_reg_safe_bm[102] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3064,9 +3064,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFE3F, 0xFFFFFFEF,
 +};
-diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r300_reg_safe.h
---- linux-3.0.3/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r300_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/r300_reg_safe.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/r300_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,42 @@
 +static const unsigned r300_reg_safe_bm[159] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3110,9 +3110,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3
 +      0x00000000, 0x00000000, 0x00000000, 0x00000000,
 +      0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
 +};
-diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r420_reg_safe.h
---- linux-3.0.3/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r420_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/r420_reg_safe.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/r420_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,42 @@
 +static const unsigned r420_reg_safe_bm[159] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3156,9 +3156,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3
 +      0x00000000, 0x00000000, 0x00000000, 0x00000000,
 +      0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
 +};
-diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rn50_reg_safe.h
---- linux-3.0.3/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rn50_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/rn50_reg_safe.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/rn50_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,28 @@
 +static const unsigned rn50_reg_safe_bm[102] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3188,9 +3188,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFFFF, 0xFFFFFFFF,
 +};
-diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rs600_reg_safe.h
---- linux-3.0.3/drivers/gpu/drm/radeon/rs600_reg_safe.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rs600_reg_safe.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/rs600_reg_safe.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/rs600_reg_safe.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/rs600_reg_safe.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,57 @@
 +static const unsigned rs600_reg_safe_bm[219] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3249,9 +3249,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +};
-diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rv515_reg_safe.h
---- linux-3.0.3/drivers/gpu/drm/radeon/rv515_reg_safe.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rv515_reg_safe.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/rv515_reg_safe.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/rv515_reg_safe.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/gpu/drm/radeon/rv515_reg_safe.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,57 @@
 +static const unsigned rv515_reg_safe_bm[219] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3310,9 +3310,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +};
-diff -NurpP --minimal linux-3.0.3/drivers/infiniband/core/addr.c linux-3.0.3-vs2.3.1-pre10/drivers/infiniband/core/addr.c
---- linux-3.0.3/drivers/infiniband/core/addr.c 2011-07-22 11:17:45.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/infiniband/core/addr.c   2011-06-16 14:16:51.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/infiniband/core/addr.c linux-3.0.4-vs2.3.1-pre10.1/drivers/infiniband/core/addr.c
+--- linux-3.0.4/drivers/infiniband/core/addr.c 2011-07-22 11:17:45.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/infiniband/core/addr.c 2011-06-16 14:16:51.000000000 +0200
 @@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr
  
        if (ipv6_addr_any(&fl6.saddr)) {
@@ -3322,9 +3322,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/infiniband/core/addr.c linux-3.0.3-vs2
                if (ret)
                        goto put;
  
-diff -NurpP --minimal linux-3.0.3/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.3-vs2.3.1-pre10/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/infiniband/hw/ipath/ipath_user_pages.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.4-vs2.3.1-pre10.1/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 22:11:24.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <linux/device.h>
  #include <linux/slab.h>
@@ -3333,9 +3333,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/infiniband/hw/ipath/ipath_user_pages.c
  
  #include "ipath_kernel.h"
  
-diff -NurpP --minimal linux-3.0.3/drivers/md/dm-ioctl.c linux-3.0.3-vs2.3.1-pre10/drivers/md/dm-ioctl.c
---- linux-3.0.3/drivers/md/dm-ioctl.c  2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/md/dm-ioctl.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/md/dm-ioctl.c linux-3.0.4-vs2.3.1-pre10.1/drivers/md/dm-ioctl.c
+--- linux-3.0.4/drivers/md/dm-ioctl.c  2011-05-22 16:17:18.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/md/dm-ioctl.c  2011-06-10 22:11:24.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/dm-ioctl.h>
  #include <linux/hdreg.h>
@@ -3417,9 +3417,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/md/dm-ioctl.c linux-3.0.3-vs2.3.1-pre1
                return -EACCES;
  
        if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.0.3/drivers/md/dm.c linux-3.0.3-vs2.3.1-pre10/drivers/md/dm.c
---- linux-3.0.3/drivers/md/dm.c        2011-08-29 03:10:21.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/md/dm.c  2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/md/dm.c linux-3.0.4-vs2.3.1-pre10.1/drivers/md/dm.c
+--- linux-3.0.4/drivers/md/dm.c        2011-08-31 18:56:41.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/md/dm.c        2011-08-08 23:04:47.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/idr.h>
  #include <linux/hdreg.h>
@@ -3493,9 +3493,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/md/dm.c linux-3.0.3-vs2.3.1-pre10/driv
        md->queue = blk_alloc_queue(GFP_KERNEL);
        if (!md->queue)
                goto bad_queue;
-diff -NurpP --minimal linux-3.0.3/drivers/md/dm.h linux-3.0.3-vs2.3.1-pre10/drivers/md/dm.h
---- linux-3.0.3/drivers/md/dm.h        2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/md/dm.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/md/dm.h linux-3.0.4-vs2.3.1-pre10.1/drivers/md/dm.h
+--- linux-3.0.4/drivers/md/dm.h        2011-05-22 16:17:18.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/md/dm.h        2011-06-10 22:11:24.000000000 +0200
 @@ -41,6 +41,8 @@ struct dm_dev_internal {
  struct dm_table;
  struct dm_md_mempools;
@@ -3505,9 +3505,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/md/dm.h linux-3.0.3-vs2.3.1-pre10/driv
  /*-----------------------------------------------------------------
   * Internal table functions.
   *---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.0.3/drivers/net/tun.c linux-3.0.3-vs2.3.1-pre10/drivers/net/tun.c
---- linux-3.0.3/drivers/net/tun.c      2011-08-29 03:10:21.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/net/tun.c        2011-08-29 03:45:08.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/net/tun.c linux-3.0.4-vs2.3.1-pre10.1/drivers/net/tun.c
+--- linux-3.0.4/drivers/net/tun.c      2011-08-31 18:56:41.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/net/tun.c      2011-08-29 03:45:08.000000000 +0200
 @@ -64,6 +64,7 @@
  #include <linux/nsproxy.h>
  #include <linux/virtio_net.h>
@@ -3577,9 +3577,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/net/tun.c linux-3.0.3-vs2.3.1-pre10/dr
        case TUNSETLINK:
                /* Only allow setting the type when the interface is down */
                if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.0.3/drivers/tty/sysrq.c linux-3.0.3-vs2.3.1-pre10/drivers/tty/sysrq.c
---- linux-3.0.3/drivers/tty/sysrq.c    2011-05-22 16:17:44.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/tty/sysrq.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/tty/sysrq.c linux-3.0.4-vs2.3.1-pre10.1/drivers/tty/sysrq.c
+--- linux-3.0.4/drivers/tty/sysrq.c    2011-05-22 16:17:44.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/tty/sysrq.c    2011-06-10 22:11:24.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/oom.h>
  #include <linux/slab.h>
@@ -3631,9 +3631,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/tty/sysrq.c linux-3.0.3-vs2.3.1-pre10/
        else
                retval = -1;
        return retval;
-diff -NurpP --minimal linux-3.0.3/drivers/tty/tty_io.c linux-3.0.3-vs2.3.1-pre10/drivers/tty/tty_io.c
---- linux-3.0.3/drivers/tty/tty_io.c   2011-07-22 11:18:03.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/drivers/tty/tty_io.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/drivers/tty/tty_io.c linux-3.0.4-vs2.3.1-pre10.1/drivers/tty/tty_io.c
+--- linux-3.0.4/drivers/tty/tty_io.c   2011-07-22 11:18:03.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/drivers/tty/tty_io.c   2011-06-10 22:11:24.000000000 +0200
 @@ -104,6 +104,7 @@
  
  #include <linux/kmod.h>
@@ -3660,9 +3660,9 @@ diff -NurpP --minimal linux-3.0.3/drivers/tty/tty_io.c linux-3.0.3-vs2.3.1-pre10
        if (pgrp_nr < 0)
                return -EINVAL;
        rcu_read_lock();
-diff -NurpP --minimal linux-3.0.3/fs/attr.c linux-3.0.3-vs2.3.1-pre10/fs/attr.c
---- linux-3.0.3/fs/attr.c      2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/attr.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/attr.c linux-3.0.4-vs2.3.1-pre10.1/fs/attr.c
+--- linux-3.0.4/fs/attr.c      2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/attr.c      2011-06-10 22:11:24.000000000 +0200
 @@ -13,6 +13,9 @@
  #include <linux/fsnotify.h>
  #include <linux/fcntl.h>
@@ -3703,9 +3703,9 @@ diff -NurpP --minimal linux-3.0.3/fs/attr.c linux-3.0.3-vs2.3.1-pre10/fs/attr.c
                if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
                        return -EPERM;
        }
-diff -NurpP --minimal linux-3.0.3/fs/binfmt_aout.c linux-3.0.3-vs2.3.1-pre10/fs/binfmt_aout.c
---- linux-3.0.3/fs/binfmt_aout.c       2010-10-21 13:07:47.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/binfmt_aout.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/binfmt_aout.c linux-3.0.4-vs2.3.1-pre10.1/fs/binfmt_aout.c
+--- linux-3.0.4/fs/binfmt_aout.c       2010-10-21 13:07:47.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/binfmt_aout.c       2011-06-10 22:11:24.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/init.h>
  #include <linux/coredump.h>
@@ -3714,9 +3714,9 @@ diff -NurpP --minimal linux-3.0.3/fs/binfmt_aout.c linux-3.0.3-vs2.3.1-pre10/fs/
  
  #include <asm/system.h>
  #include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.3/fs/binfmt_elf.c linux-3.0.3-vs2.3.1-pre10/fs/binfmt_elf.c
---- linux-3.0.3/fs/binfmt_elf.c        2011-05-22 16:17:48.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/binfmt_elf.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/binfmt_elf.c linux-3.0.4-vs2.3.1-pre10.1/fs/binfmt_elf.c
+--- linux-3.0.4/fs/binfmt_elf.c        2011-05-22 16:17:48.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/binfmt_elf.c        2011-06-10 22:11:24.000000000 +0200
 @@ -32,6 +32,7 @@
  #include <linux/elf.h>
  #include <linux/utsname.h>
@@ -3725,9 +3725,9 @@ diff -NurpP --minimal linux-3.0.3/fs/binfmt_elf.c linux-3.0.3-vs2.3.1-pre10/fs/b
  #include <asm/uaccess.h>
  #include <asm/param.h>
  #include <asm/page.h>
-diff -NurpP --minimal linux-3.0.3/fs/binfmt_flat.c linux-3.0.3-vs2.3.1-pre10/fs/binfmt_flat.c
---- linux-3.0.3/fs/binfmt_flat.c       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/binfmt_flat.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/binfmt_flat.c linux-3.0.4-vs2.3.1-pre10.1/fs/binfmt_flat.c
+--- linux-3.0.4/fs/binfmt_flat.c       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/binfmt_flat.c       2011-06-10 22:11:24.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <linux/init.h>
  #include <linux/flat.h>
@@ -3736,9 +3736,9 @@ diff -NurpP --minimal linux-3.0.3/fs/binfmt_flat.c linux-3.0.3-vs2.3.1-pre10/fs/
  
  #include <asm/byteorder.h>
  #include <asm/system.h>
-diff -NurpP --minimal linux-3.0.3/fs/binfmt_som.c linux-3.0.3-vs2.3.1-pre10/fs/binfmt_som.c
---- linux-3.0.3/fs/binfmt_som.c        2010-02-25 11:52:04.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/binfmt_som.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/binfmt_som.c linux-3.0.4-vs2.3.1-pre10.1/fs/binfmt_som.c
+--- linux-3.0.4/fs/binfmt_som.c        2010-02-25 11:52:04.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/binfmt_som.c        2011-06-10 22:11:24.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <linux/shm.h>
  #include <linux/personality.h>
@@ -3747,9 +3747,9 @@ diff -NurpP --minimal linux-3.0.3/fs/binfmt_som.c linux-3.0.3-vs2.3.1-pre10/fs/b
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.3/fs/block_dev.c linux-3.0.3-vs2.3.1-pre10/fs/block_dev.c
---- linux-3.0.3/fs/block_dev.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/block_dev.c   2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/block_dev.c linux-3.0.4-vs2.3.1-pre10.1/fs/block_dev.c
+--- linux-3.0.4/fs/block_dev.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/block_dev.c 2011-07-01 11:35:34.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/namei.h>
  #include <linux/log2.h>
@@ -3787,9 +3787,9 @@ diff -NurpP --minimal linux-3.0.3/fs/block_dev.c linux-3.0.3-vs2.3.1-pre10/fs/bl
        if (bdev) {
                spin_lock(&bdev_lock);
                if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.0.3/fs/btrfs/ctree.h linux-3.0.3-vs2.3.1-pre10/fs/btrfs/ctree.h
---- linux-3.0.3/fs/btrfs/ctree.h       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/ctree.h 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/btrfs/ctree.h linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/ctree.h
+--- linux-3.0.4/fs/btrfs/ctree.h       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/ctree.h       2011-07-19 00:44:39.000000000 +0200
 @@ -600,11 +600,14 @@ struct btrfs_inode_item {
        /* modification sequence number for NFS */
        __le64 sequence;
@@ -3842,9 +3842,9 @@ diff -NurpP --minimal linux-3.0.3/fs/btrfs/ctree.h linux-3.0.3-vs2.3.1-pre10/fs/
  int btrfs_defrag_file(struct inode *inode, struct file *file,
                      struct btrfs_ioctl_defrag_range_args *range,
                      u64 newer_than, unsigned long max_pages);
-diff -NurpP --minimal linux-3.0.3/fs/btrfs/disk-io.c linux-3.0.3-vs2.3.1-pre10/fs/btrfs/disk-io.c
---- linux-3.0.3/fs/btrfs/disk-io.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/disk-io.c       2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/btrfs/disk-io.c linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/disk-io.c
+--- linux-3.0.4/fs/btrfs/disk-io.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/disk-io.c     2011-06-22 12:39:15.000000000 +0200
 @@ -1765,6 +1765,9 @@ struct btrfs_root *open_ctree(struct sup
                goto fail_alloc;
        }
@@ -3855,9 +3855,9 @@ diff -NurpP --minimal linux-3.0.3/fs/btrfs/disk-io.c linux-3.0.3-vs2.3.1-pre10/f
        features = btrfs_super_incompat_flags(disk_super) &
                ~BTRFS_FEATURE_INCOMPAT_SUPP;
        if (features) {
-diff -NurpP --minimal linux-3.0.3/fs/btrfs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/btrfs/inode.c
---- linux-3.0.3/fs/btrfs/inode.c       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/inode.c 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/btrfs/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/inode.c
+--- linux-3.0.4/fs/btrfs/inode.c       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/inode.c       2011-07-19 00:44:39.000000000 +0200
 @@ -38,6 +38,7 @@
  #include <linux/falloc.h>
  #include <linux/slab.h>
@@ -3931,9 +3931,9 @@ diff -NurpP --minimal linux-3.0.3/fs/btrfs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/
  };
  static const struct inode_operations btrfs_special_inode_operations = {
        .getattr        = btrfs_getattr,
-diff -NurpP --minimal linux-3.0.3/fs/btrfs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/btrfs/ioctl.c
---- linux-3.0.3/fs/btrfs/ioctl.c       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/ioctl.c 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/btrfs/ioctl.c linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/ioctl.c
+--- linux-3.0.4/fs/btrfs/ioctl.c       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/ioctl.c       2011-06-22 12:39:15.000000000 +0200
 @@ -70,10 +70,13 @@ static unsigned int btrfs_flags_to_ioctl
  {
        unsigned int iflags = 0;
@@ -4107,9 +4107,9 @@ diff -NurpP --minimal linux-3.0.3/fs/btrfs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/
        if (flags & FS_APPEND_FL)
                ip->flags |= BTRFS_INODE_APPEND;
        else
-diff -NurpP --minimal linux-3.0.3/fs/btrfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/btrfs/super.c
---- linux-3.0.3/fs/btrfs/super.c       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/super.c 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/btrfs/super.c linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/super.c
+--- linux-3.0.4/fs/btrfs/super.c       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/btrfs/super.c       2011-07-19 00:44:39.000000000 +0200
 @@ -162,7 +162,7 @@ enum {
        Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,
        Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,
@@ -4165,9 +4165,9 @@ diff -NurpP --minimal linux-3.0.3/fs/btrfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/
        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
                return 0;
  
-diff -NurpP --minimal linux-3.0.3/fs/char_dev.c linux-3.0.3-vs2.3.1-pre10/fs/char_dev.c
---- linux-3.0.3/fs/char_dev.c  2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/char_dev.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/char_dev.c linux-3.0.4-vs2.3.1-pre10.1/fs/char_dev.c
+--- linux-3.0.4/fs/char_dev.c  2011-03-15 18:07:31.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/char_dev.c  2011-06-10 22:11:24.000000000 +0200
 @@ -21,6 +21,8 @@
  #include <linux/mutex.h>
  #include <linux/backing-dev.h>
@@ -4200,9 +4200,9 @@ diff -NurpP --minimal linux-3.0.3/fs/char_dev.c linux-3.0.3-vs2.3.1-pre10/fs/cha
                if (!kobj)
                        return -ENXIO;
                new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.0.3/fs/dcache.c linux-3.0.3-vs2.3.1-pre10/fs/dcache.c
---- linux-3.0.3/fs/dcache.c    2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/dcache.c      2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/dcache.c linux-3.0.4-vs2.3.1-pre10.1/fs/dcache.c
+--- linux-3.0.4/fs/dcache.c    2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/dcache.c    2011-07-22 11:20:39.000000000 +0200
 @@ -36,6 +36,7 @@
  #include <linux/bit_spinlock.h>
  #include <linux/rculist_bl.h>
@@ -4254,9 +4254,9 @@ diff -NurpP --minimal linux-3.0.3/fs/dcache.c linux-3.0.3-vs2.3.1-pre10/fs/dcach
                found = dentry;
                spin_unlock(&dentry->d_lock);
                break;
-diff -NurpP --minimal linux-3.0.3/fs/devpts/inode.c linux-3.0.3-vs2.3.1-pre10/fs/devpts/inode.c
---- linux-3.0.3/fs/devpts/inode.c      2011-05-22 16:17:50.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/devpts/inode.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/devpts/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/devpts/inode.c
+--- linux-3.0.4/fs/devpts/inode.c      2011-05-22 16:17:50.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/devpts/inode.c      2011-06-10 22:11:24.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/parser.h>
  #include <linux/fsnotify.h>
@@ -4348,9 +4348,9 @@ diff -NurpP --minimal linux-3.0.3/fs/devpts/inode.c linux-3.0.3-vs2.3.1-pre10/fs
        inode->i_private = tty;
        tty->driver_data = inode;
  
-diff -NurpP --minimal linux-3.0.3/fs/ext2/balloc.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/balloc.c
---- linux-3.0.3/fs/ext2/balloc.c       2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/balloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext2/balloc.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/balloc.c
+--- linux-3.0.4/fs/ext2/balloc.c       2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/balloc.c       2011-06-10 22:11:24.000000000 +0200
 @@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block 
                        start = 0;
                end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -4359,9 +4359,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext2/balloc.c linux-3.0.3-vs2.3.1-pre10/fs/
        BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
  
  repeat:
-diff -NurpP --minimal linux-3.0.3/fs/ext2/ext2.h linux-3.0.3-vs2.3.1-pre10/fs/ext2/ext2.h
---- linux-3.0.3/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/ext2.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext2/ext2.h linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/ext2.h
+--- linux-3.0.4/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/ext2.h 2011-06-10 22:11:24.000000000 +0200
 @@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct 
  extern void ext2_get_inode_flags(struct ext2_inode_info *);
  extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
@@ -4370,18 +4370,18 @@ diff -NurpP --minimal linux-3.0.3/fs/ext2/ext2.h linux-3.0.3-vs2.3.1-pre10/fs/ex
  
  /* ioctl.c */
  extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.3/fs/ext2/file.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/file.c
---- linux-3.0.3/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/file.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext2/file.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/file.c
+--- linux-3.0.4/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/file.c 2011-06-10 22:11:24.000000000 +0200
 @@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
        .setattr        = ext2_setattr,
        .check_acl      = ext2_check_acl,
        .fiemap         = ext2_fiemap,
 +      .sync_flags     = ext2_sync_flags,
  };
-diff -NurpP --minimal linux-3.0.3/fs/ext2/ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/ialloc.c
---- linux-3.0.3/fs/ext2/ialloc.c       2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/ialloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext2/ialloc.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/ialloc.c
+--- linux-3.0.4/fs/ext2/ialloc.c       2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/ialloc.c       2011-06-10 22:11:24.000000000 +0200
 @@ -17,6 +17,7 @@
  #include <linux/backing-dev.h>
  #include <linux/buffer_head.h>
@@ -4398,9 +4398,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext2/ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/
        } else
                inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.0.3/fs/ext2/inode.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/inode.c
---- linux-3.0.3/fs/ext2/inode.c        2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/inode.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext2/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/inode.c
+--- linux-3.0.4/fs/ext2/inode.c        2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/inode.c        2011-06-10 22:11:24.000000000 +0200
 @@ -32,6 +32,7 @@
  #include <linux/mpage.h>
  #include <linux/fiemap.h>
@@ -4549,9 +4549,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext2/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
                error = dquot_transfer(inode, iattr);
                if (error)
                        return error;
-diff -NurpP --minimal linux-3.0.3/fs/ext2/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/ioctl.c
---- linux-3.0.3/fs/ext2/ioctl.c        2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/ioctl.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext2/ioctl.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/ioctl.c
+--- linux-3.0.4/fs/ext2/ioctl.c        2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/ioctl.c        2011-06-10 22:11:24.000000000 +0200
 @@ -17,6 +17,16 @@
  #include <asm/uaccess.h>
  
@@ -4601,9 +4601,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext2/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/e
                flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
                ei->i_flags = flags;
                mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-3.0.3/fs/ext2/namei.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/namei.c
---- linux-3.0.3/fs/ext2/namei.c        2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/namei.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext2/namei.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/namei.c
+--- linux-3.0.4/fs/ext2/namei.c        2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/namei.c        2011-06-10 22:11:24.000000000 +0200
 @@ -32,6 +32,7 @@
  
  #include <linux/pagemap.h>
@@ -4628,9 +4628,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext2/namei.c linux-3.0.3-vs2.3.1-pre10/fs/e
  };
  
  const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.3/fs/ext2/super.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/super.c
---- linux-3.0.3/fs/ext2/super.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/super.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext2/super.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/super.c
+--- linux-3.0.4/fs/ext2/super.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext2/super.c        2011-06-10 22:11:24.000000000 +0200
 @@ -394,7 +394,8 @@ enum {
        Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
        Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -4696,9 +4696,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext2/super.c linux-3.0.3-vs2.3.1-pre10/fs/e
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.0.3/fs/ext3/file.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/file.c
---- linux-3.0.3/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/file.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext3/file.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/file.c
+--- linux-3.0.4/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/file.c 2011-06-10 22:11:24.000000000 +0200
 @@ -81,5 +81,6 @@ const struct inode_operations ext3_file_
  #endif
        .check_acl      = ext3_check_acl,
@@ -4706,9 +4706,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext3/file.c linux-3.0.3-vs2.3.1-pre10/fs/ex
 +      .sync_flags     = ext3_sync_flags,
  };
  
-diff -NurpP --minimal linux-3.0.3/fs/ext3/ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/ialloc.c
---- linux-3.0.3/fs/ext3/ialloc.c       2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/ialloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext3/ialloc.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/ialloc.c
+--- linux-3.0.4/fs/ext3/ialloc.c       2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/ialloc.c       2011-06-10 22:11:24.000000000 +0200
 @@ -23,6 +23,7 @@
  #include <linux/buffer_head.h>
  #include <linux/random.h>
@@ -4725,9 +4725,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext3/ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/
        } else
                inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.0.3/fs/ext3/inode.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/inode.c
---- linux-3.0.3/fs/ext3/inode.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/inode.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext3/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/inode.c
+--- linux-3.0.4/fs/ext3/inode.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/inode.c        2011-06-10 22:11:24.000000000 +0200
 @@ -38,6 +38,7 @@
  #include <linux/bio.h>
  #include <linux/fiemap.h>
@@ -4911,9 +4911,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext3/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
                error = ext3_mark_inode_dirty(handle, inode);
                ext3_journal_stop(handle);
        }
-diff -NurpP --minimal linux-3.0.3/fs/ext3/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/ioctl.c
---- linux-3.0.3/fs/ext3/ioctl.c        2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/ioctl.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext3/ioctl.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/ioctl.c
+--- linux-3.0.4/fs/ext3/ioctl.c        2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/ioctl.c        2011-06-10 22:11:24.000000000 +0200
 @@ -8,6 +8,7 @@
   */
  
@@ -4989,9 +4989,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext3/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/e
                flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
                ei->i_flags = flags;
  
-diff -NurpP --minimal linux-3.0.3/fs/ext3/namei.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/namei.c
---- linux-3.0.3/fs/ext3/namei.c        2011-08-29 03:10:24.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/namei.c  2011-08-29 03:45:09.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext3/namei.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/namei.c
+--- linux-3.0.4/fs/ext3/namei.c        2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/namei.c        2011-08-29 03:45:09.000000000 +0200
 @@ -36,6 +36,7 @@
  #include <linux/quotaops.h>
  #include <linux/buffer_head.h>
@@ -5016,9 +5016,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext3/namei.c linux-3.0.3-vs2.3.1-pre10/fs/e
  };
  
  const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.3/fs/ext3/super.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/super.c
---- linux-3.0.3/fs/ext3/super.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/super.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext3/super.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/super.c
+--- linux-3.0.4/fs/ext3/super.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext3/super.c        2011-06-10 22:11:24.000000000 +0200
 @@ -821,7 +821,8 @@ enum {
        Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
        Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -5085,9 +5085,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext3/super.c linux-3.0.3-vs2.3.1-pre10/fs/e
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.0.3/fs/ext4/ext4.h linux-3.0.3-vs2.3.1-pre10/fs/ext4/ext4.h
---- linux-3.0.3/fs/ext4/ext4.h 2011-08-29 03:10:24.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/ext4.h   2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext4/ext4.h linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/ext4.h
+--- linux-3.0.4/fs/ext4/ext4.h 2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/ext4.h 2011-08-08 23:04:47.000000000 +0200
 @@ -350,8 +350,12 @@ struct flex_groups {
  #define EXT4_EXTENTS_FL                       0x00080000 /* Inode uses extents */
  #define EXT4_EA_INODE_FL              0x00200000 /* Inode used for large EA */
@@ -5135,9 +5135,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/ext4.h linux-3.0.3-vs2.3.1-pre10/fs/ex
  /* move_extent.c */
  extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
                             __u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-3.0.3/fs/ext4/file.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/file.c
---- linux-3.0.3/fs/ext4/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/file.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext4/file.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/file.c
+--- linux-3.0.4/fs/ext4/file.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/file.c 2011-06-10 22:11:24.000000000 +0200
 @@ -282,5 +282,6 @@ const struct inode_operations ext4_file_
  #endif
        .check_acl      = ext4_check_acl,
@@ -5145,9 +5145,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/file.c linux-3.0.3-vs2.3.1-pre10/fs/ex
 +      .sync_flags     = ext4_sync_flags,
  };
  
-diff -NurpP --minimal linux-3.0.3/fs/ext4/ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/ialloc.c
---- linux-3.0.3/fs/ext4/ialloc.c       2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/ialloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext4/ialloc.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/ialloc.c
+--- linux-3.0.4/fs/ext4/ialloc.c       2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/ialloc.c       2011-06-10 22:11:24.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/random.h>
  #include <linux/bitops.h>
@@ -5164,9 +5164,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/
        } else
                inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/inode.c
---- linux-3.0.3/fs/ext4/inode.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/inode.c  2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext4/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/inode.c
+--- linux-3.0.4/fs/ext4/inode.c        2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/inode.c        2011-08-31 19:37:44.000000000 +0200
 @@ -42,6 +42,7 @@
  #include <linux/printk.h>
  #include <linux/slab.h>
@@ -5175,7 +5175,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
  
  #include "ext4_jbd2.h"
  #include "xattr.h"
-@@ -4797,41 +4798,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -4819,41 +4820,64 @@ void ext4_set_inode_flags(struct inode *
  {
        unsigned int flags = EXT4_I(inode)->i_flags;
  
@@ -5247,7 +5247,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
        } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
  }
  
-@@ -4867,6 +4891,8 @@ struct inode *ext4_iget(struct super_blo
+@@ -4889,6 +4913,8 @@ struct inode *ext4_iget(struct super_blo
        journal_t *journal = EXT4_SB(sb)->s_journal;
        long ret;
        int block;
@@ -5256,7 +5256,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
  
        inode = iget_locked(sb, ino);
        if (!inode)
-@@ -4882,12 +4908,16 @@ struct inode *ext4_iget(struct super_blo
+@@ -4904,12 +4930,16 @@ struct inode *ext4_iget(struct super_blo
                goto bad_inode;
        raw_inode = ext4_raw_inode(&iloc);
        inode->i_mode = le16_to_cpu(raw_inode->i_mode);
@@ -5277,7 +5277,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
        inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
  
        ext4_clear_state_flags(ei);     /* Only relevant on 32-bit archs */
-@@ -5106,6 +5136,8 @@ static int ext4_do_update_inode(handle_t
+@@ -5128,6 +5158,8 @@ static int ext4_do_update_inode(handle_t
        struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
        struct ext4_inode_info *ei = EXT4_I(inode);
        struct buffer_head *bh = iloc->bh;
@@ -5286,7 +5286,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
        int err = 0, rc, block;
  
        /* For fields not not tracking in the in-memory inode,
-@@ -5116,29 +5148,32 @@ static int ext4_do_update_inode(handle_t
+@@ -5138,29 +5170,32 @@ static int ext4_do_update_inode(handle_t
        ext4_get_inode_flags(ei);
        raw_inode->i_mode = cpu_to_le16(inode->i_mode);
        if (!(test_opt(inode->i_sb, NO_UID32))) {
@@ -5325,7 +5325,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
        raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
  
        EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -5324,7 +5359,8 @@ int ext4_setattr(struct dentry *dentry, 
+@@ -5346,7 +5381,8 @@ int ext4_setattr(struct dentry *dentry, 
        if (is_quota_modification(inode, attr))
                dquot_initialize(inode);
        if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -5335,7 +5335,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
                handle_t *handle;
  
                /* (user+group)*(old+new) structure, inode write (sb,
-@@ -5346,6 +5382,8 @@ int ext4_setattr(struct dentry *dentry, 
+@@ -5368,6 +5404,8 @@ int ext4_setattr(struct dentry *dentry, 
                        inode->i_uid = attr->ia_uid;
                if (attr->ia_valid & ATTR_GID)
                        inode->i_gid = attr->ia_gid;
@@ -5344,9 +5344,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/e
                error = ext4_mark_inode_dirty(handle, inode);
                ext4_journal_stop(handle);
        }
-diff -NurpP --minimal linux-3.0.3/fs/ext4/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/ioctl.c
---- linux-3.0.3/fs/ext4/ioctl.c        2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/ioctl.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext4/ioctl.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/ioctl.c
+--- linux-3.0.4/fs/ext4/ioctl.c        2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/ioctl.c        2011-06-10 22:11:24.000000000 +0200
 @@ -14,10 +14,39 @@
  #include <linux/compat.h>
  #include <linux/mount.h>
@@ -5410,9 +5410,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/e
                        if (!capable(CAP_LINUX_IMMUTABLE))
                                goto flags_out;
                }
-diff -NurpP --minimal linux-3.0.3/fs/ext4/namei.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/namei.c
---- linux-3.0.3/fs/ext4/namei.c        2011-08-29 03:10:24.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/namei.c  2011-08-29 03:45:09.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ext4/namei.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/namei.c
+--- linux-3.0.4/fs/ext4/namei.c        2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/namei.c        2011-08-29 03:45:09.000000000 +0200
 @@ -34,6 +34,7 @@
  #include <linux/quotaops.h>
  #include <linux/buffer_head.h>
@@ -5437,10 +5437,10 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/namei.c linux-3.0.3-vs2.3.1-pre10/fs/e
  };
  
  const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.3/fs/ext4/super.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/super.c
---- linux-3.0.3/fs/ext4/super.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/super.c  2011-07-01 11:35:34.000000000 +0200
-@@ -1294,6 +1294,7 @@ enum {
+diff -NurpP --minimal linux-3.0.4/fs/ext4/super.c linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/super.c
+--- linux-3.0.4/fs/ext4/super.c        2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ext4/super.c        2011-08-31 19:37:44.000000000 +0200
+@@ -1293,6 +1293,7 @@ enum {
        Opt_dioread_nolock, Opt_dioread_lock,
        Opt_discard, Opt_nodiscard,
        Opt_init_inode_table, Opt_noinit_inode_table,
@@ -5448,7 +5448,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/super.c linux-3.0.3-vs2.3.1-pre10/fs/e
  };
  
  static const match_table_t tokens = {
-@@ -1369,6 +1370,9 @@ static const match_table_t tokens = {
+@@ -1368,6 +1369,9 @@ static const match_table_t tokens = {
        {Opt_init_inode_table, "init_itable=%u"},
        {Opt_init_inode_table, "init_itable"},
        {Opt_noinit_inode_table, "noinit_itable"},
@@ -5458,7 +5458,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/super.c linux-3.0.3-vs2.3.1-pre10/fs/e
        {Opt_err, NULL},
  };
  
-@@ -1537,6 +1541,20 @@ static int parse_options(char *options, 
+@@ -1536,6 +1540,20 @@ static int parse_options(char *options, 
                case Opt_nouid32:
                        set_opt(sb, NO_UID32);
                        break;
@@ -5479,7 +5479,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/super.c linux-3.0.3-vs2.3.1-pre10/fs/e
                case Opt_debug:
                        set_opt(sb, DEBUG);
                        break;
-@@ -3194,6 +3212,9 @@ static int ext4_fill_super(struct super_
+@@ -3193,6 +3211,9 @@ static int ext4_fill_super(struct super_
                           &journal_ioprio, NULL, 0))
                goto failed_mount;
  
@@ -5489,7 +5489,7 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/super.c linux-3.0.3-vs2.3.1-pre10/fs/e
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-@@ -4324,6 +4345,14 @@ static int ext4_remount(struct super_blo
+@@ -4323,6 +4344,14 @@ static int ext4_remount(struct super_blo
        if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
                ext4_abort(sb, "Abort forced by user");
  
@@ -5504,9 +5504,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ext4/super.c linux-3.0.3-vs2.3.1-pre10/fs/e
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.0.3/fs/fcntl.c linux-3.0.3-vs2.3.1-pre10/fs/fcntl.c
---- linux-3.0.3/fs/fcntl.c     2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/fcntl.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/fcntl.c linux-3.0.4-vs2.3.1-pre10.1/fs/fcntl.c
+--- linux-3.0.4/fs/fcntl.c     2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/fcntl.c     2011-06-10 22:11:24.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/signal.h>
  #include <linux/rcupdate.h>
@@ -5533,9 +5533,9 @@ diff -NurpP --minimal linux-3.0.3/fs/fcntl.c linux-3.0.3-vs2.3.1-pre10/fs/fcntl.
  
        if (unlikely(filp->f_mode & FMODE_PATH)) {
                if (!check_fcntl_cmd(cmd)) {
-diff -NurpP --minimal linux-3.0.3/fs/file.c linux-3.0.3-vs2.3.1-pre10/fs/file.c
---- linux-3.0.3/fs/file.c      2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/file.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/file.c linux-3.0.4-vs2.3.1-pre10.1/fs/file.c
+--- linux-3.0.4/fs/file.c      2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/file.c      2011-06-10 22:11:24.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/spinlock.h>
  #include <linux/rcupdate.h>
@@ -5561,9 +5561,9 @@ diff -NurpP --minimal linux-3.0.3/fs/file.c linux-3.0.3-vs2.3.1-pre10/fs/file.c
  #if 1
        /* Sanity check */
        if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.0.3/fs/file_table.c linux-3.0.3-vs2.3.1-pre10/fs/file_table.c
---- linux-3.0.3/fs/file_table.c        2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/file_table.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/file_table.c linux-3.0.4-vs2.3.1-pre10.1/fs/file_table.c
+--- linux-3.0.4/fs/file_table.c        2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/file_table.c        2011-06-10 22:11:24.000000000 +0200
 @@ -24,6 +24,8 @@
  #include <linux/percpu_counter.h>
  #include <linux/percpu.h>
@@ -5600,9 +5600,9 @@ diff -NurpP --minimal linux-3.0.3/fs/file_table.c linux-3.0.3-vs2.3.1-pre10/fs/f
                file_sb_list_del(file);
                file_free(file);
        }
-diff -NurpP --minimal linux-3.0.3/fs/fs_struct.c linux-3.0.3-vs2.3.1-pre10/fs/fs_struct.c
---- linux-3.0.3/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/fs_struct.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/fs_struct.c linux-3.0.4-vs2.3.1-pre10.1/fs/fs_struct.c
+--- linux-3.0.4/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/fs_struct.c 2011-06-10 22:11:24.000000000 +0200
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -5627,9 +5627,9 @@ diff -NurpP --minimal linux-3.0.3/fs/fs_struct.c linux-3.0.3-vs2.3.1-pre10/fs/fs
        }
        return fs;
  }
-diff -NurpP --minimal linux-3.0.3/fs/gfs2/file.c linux-3.0.3-vs2.3.1-pre10/fs/gfs2/file.c
---- linux-3.0.3/fs/gfs2/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/gfs2/file.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/gfs2/file.c linux-3.0.4-vs2.3.1-pre10.1/fs/gfs2/file.c
+--- linux-3.0.4/fs/gfs2/file.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/gfs2/file.c 2011-06-10 22:11:24.000000000 +0200
 @@ -134,6 +134,9 @@ static const u32 fsflags_to_gfs2[32] = {
        [7] = GFS2_DIF_NOATIME,
        [12] = GFS2_DIF_EXHASH,
@@ -5750,9 +5750,9 @@ diff -NurpP --minimal linux-3.0.3/fs/gfs2/file.c linux-3.0.3-vs2.3.1-pre10/fs/gf
  static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
        switch(cmd) {
-diff -NurpP --minimal linux-3.0.3/fs/gfs2/inode.h linux-3.0.3-vs2.3.1-pre10/fs/gfs2/inode.h
---- linux-3.0.3/fs/gfs2/inode.h        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/gfs2/inode.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/gfs2/inode.h linux-3.0.4-vs2.3.1-pre10.1/fs/gfs2/inode.h
+--- linux-3.0.4/fs/gfs2/inode.h        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/gfs2/inode.h        2011-06-10 22:11:24.000000000 +0200
 @@ -120,6 +120,7 @@ extern const struct file_operations gfs2
  extern const struct file_operations gfs2_dir_fops_nolock;
  
@@ -5761,9 +5761,9 @@ diff -NurpP --minimal linux-3.0.3/fs/gfs2/inode.h linux-3.0.3-vs2.3.1-pre10/fs/g
   
  #ifdef CONFIG_GFS2_FS_LOCKING_DLM
  extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.0.3/fs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/inode.c
---- linux-3.0.3/fs/inode.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/inode.c       2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/inode.c
+--- linux-3.0.4/fs/inode.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/inode.c     2011-07-01 11:35:34.000000000 +0200
 @@ -26,6 +26,7 @@
  #include <linux/ima.h>
  #include <linux/cred.h>
@@ -5819,9 +5819,9 @@ diff -NurpP --minimal linux-3.0.3/fs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/inode.
  }
  EXPORT_SYMBOL(inode_init_owner);
  
-diff -NurpP --minimal linux-3.0.3/fs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ioctl.c
---- linux-3.0.3/fs/ioctl.c     2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ioctl.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ioctl.c linux-3.0.4-vs2.3.1-pre10.1/fs/ioctl.c
+--- linux-3.0.4/fs/ioctl.c     2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ioctl.c     2011-06-10 22:11:24.000000000 +0200
 @@ -15,6 +15,9 @@
  #include <linux/writeback.h>
  #include <linux/buffer_head.h>
@@ -5832,9 +5832,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ioctl.
  
  #include <asm/ioctls.h>
  
-diff -NurpP --minimal linux-3.0.3/fs/ioprio.c linux-3.0.3-vs2.3.1-pre10/fs/ioprio.c
---- linux-3.0.3/fs/ioprio.c    2011-01-05 21:50:24.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ioprio.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ioprio.c linux-3.0.4-vs2.3.1-pre10.1/fs/ioprio.c
+--- linux-3.0.4/fs/ioprio.c    2011-01-05 21:50:24.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ioprio.c    2011-06-10 22:11:24.000000000 +0200
 @@ -27,6 +27,7 @@
  #include <linux/syscalls.h>
  #include <linux/security.h>
@@ -5861,9 +5861,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ioprio.c linux-3.0.3-vs2.3.1-pre10/fs/iopri
                                tmpio = get_task_ioprio(p);
                                if (tmpio < 0)
                                        continue;
-diff -NurpP --minimal linux-3.0.3/fs/jfs/file.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/file.c
---- linux-3.0.3/fs/jfs/file.c  2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/file.c    2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/jfs/file.c linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/file.c
+--- linux-3.0.4/fs/jfs/file.c  2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/file.c  2011-07-01 11:35:34.000000000 +0200
 @@ -102,7 +102,8 @@ int jfs_setattr(struct dentry *dentry, s
        if (is_quota_modification(inode, iattr))
                dquot_initialize(inode);
@@ -5882,9 +5882,9 @@ diff -NurpP --minimal linux-3.0.3/fs/jfs/file.c linux-3.0.3-vs2.3.1-pre10/fs/jfs
  };
  
  const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.0.3/fs/jfs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/ioctl.c
---- linux-3.0.3/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/ioctl.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/jfs/ioctl.c linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/ioctl.c
+--- linux-3.0.4/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
 @@ -11,6 +11,7 @@
  #include <linux/mount.h>
  #include <linux/time.h>
@@ -5942,9 +5942,9 @@ diff -NurpP --minimal linux-3.0.3/fs/jfs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/jf
                flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
                jfs_inode->mode2 = flags;
  
-diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_dinode.h linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_dinode.h
---- linux-3.0.3/fs/jfs/jfs_dinode.h    2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_dinode.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/jfs/jfs_dinode.h linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_dinode.h
+--- linux-3.0.4/fs/jfs/jfs_dinode.h    2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_dinode.h    2011-06-10 22:11:24.000000000 +0200
 @@ -161,9 +161,13 @@ struct dinode {
  
  #define JFS_APPEND_FL         0x01000000 /* writes to file may only append */
@@ -5961,9 +5961,9 @@ diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_dinode.h linux-3.0.3-vs2.3.1-pre10/
  #define JFS_FL_INHERIT                0x03C80000
  
  /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_filsys.h linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_filsys.h
---- linux-3.0.3/fs/jfs/jfs_filsys.h    2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_filsys.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/jfs/jfs_filsys.h linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_filsys.h
+--- linux-3.0.4/fs/jfs/jfs_filsys.h    2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_filsys.h    2011-06-10 22:11:24.000000000 +0200
 @@ -263,6 +263,7 @@
  #define JFS_NAME_MAX  255
  #define JFS_PATH_MAX  BPSIZE
@@ -5972,9 +5972,9 @@ diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_filsys.h linux-3.0.3-vs2.3.1-pre10/
  
  /*
   *    file system state (superblock state)
-diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_imap.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_imap.c
---- linux-3.0.3/fs/jfs/jfs_imap.c      2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_imap.c        2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/jfs/jfs_imap.c linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_imap.c
+--- linux-3.0.4/fs/jfs/jfs_imap.c      2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_imap.c      2011-07-01 11:35:34.000000000 +0200
 @@ -46,6 +46,7 @@
  #include <linux/pagemap.h>
  #include <linux/quotaops.h>
@@ -6034,9 +6034,9 @@ diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_imap.c linux-3.0.3-vs2.3.1-pre10/fs
        jfs_get_inode_flags(jfs_ip);
        /*
         * mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_inode.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_inode.c
---- linux-3.0.3/fs/jfs/jfs_inode.c     2010-08-02 16:52:49.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_inode.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/jfs/jfs_inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_inode.c
+--- linux-3.0.4/fs/jfs/jfs_inode.c     2010-08-02 16:52:49.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_inode.c     2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  
  #include <linux/fs.h>
@@ -6110,9 +6110,9 @@ diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_inode.c linux-3.0.3-vs2.3.1-pre10/f
  }
  
  /*
-diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_inode.h linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_inode.h
---- linux-3.0.3/fs/jfs/jfs_inode.h     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_inode.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/jfs/jfs_inode.h linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_inode.h
+--- linux-3.0.4/fs/jfs/jfs_inode.h     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/jfs_inode.h     2011-06-10 22:11:24.000000000 +0200
 @@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
  extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
        int fh_len, int fh_type);
@@ -6121,9 +6121,9 @@ diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_inode.h linux-3.0.3-vs2.3.1-pre10/f
  extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
  extern int jfs_setattr(struct dentry *, struct iattr *);
  
-diff -NurpP --minimal linux-3.0.3/fs/jfs/namei.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/namei.c
---- linux-3.0.3/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/namei.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/jfs/namei.c linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/namei.c
+--- linux-3.0.4/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/namei.c 2011-06-10 22:11:24.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/ctype.h>
  #include <linux/quotaops.h>
@@ -6148,9 +6148,9 @@ diff -NurpP --minimal linux-3.0.3/fs/jfs/namei.c linux-3.0.3-vs2.3.1-pre10/fs/jf
  };
  
  const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.0.3/fs/jfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/super.c
---- linux-3.0.3/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/super.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/jfs/super.c linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/super.c
+--- linux-3.0.4/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/jfs/super.c 2011-06-10 22:11:24.000000000 +0200
 @@ -198,7 +198,8 @@ static void jfs_put_super(struct super_b
  enum {
        Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -6216,9 +6216,9 @@ diff -NurpP --minimal linux-3.0.3/fs/jfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/jf
  
        if (newLVSize) {
                printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.0.3/fs/libfs.c linux-3.0.3-vs2.3.1-pre10/fs/libfs.c
---- linux-3.0.3/fs/libfs.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/libfs.c       2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/libfs.c linux-3.0.4-vs2.3.1-pre10.1/fs/libfs.c
+--- linux-3.0.4/fs/libfs.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/libfs.c     2011-07-22 11:20:39.000000000 +0200
 @@ -133,7 +133,8 @@ static inline unsigned char dt_type(stru
   * both impossible due to the lock on directory.
   */
@@ -6264,9 +6264,9 @@ diff -NurpP --minimal linux-3.0.3/fs/libfs.c linux-3.0.3-vs2.3.1-pre10/fs/libfs.
  EXPORT_SYMBOL(generic_read_dir);
  EXPORT_SYMBOL(mount_pseudo);
  EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.0.3/fs/locks.c linux-3.0.3-vs2.3.1-pre10/fs/locks.c
---- linux-3.0.3/fs/locks.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/locks.c       2011-07-19 00:51:58.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/locks.c linux-3.0.4-vs2.3.1-pre10.1/fs/locks.c
+--- linux-3.0.4/fs/locks.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/locks.c     2011-07-19 00:51:58.000000000 +0200
 @@ -126,6 +126,8 @@
  #include <linux/time.h>
  #include <linux/rcupdate.h>
@@ -6456,9 +6456,9 @@ diff -NurpP --minimal linux-3.0.3/fs/locks.c linux-3.0.3-vs2.3.1-pre10/fs/locks.
  
        return 0;
  }
-diff -NurpP --minimal linux-3.0.3/fs/namei.c linux-3.0.3-vs2.3.1-pre10/fs/namei.c
---- linux-3.0.3/fs/namei.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/namei.c       2011-08-01 18:18:05.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/namei.c linux-3.0.4-vs2.3.1-pre10.1/fs/namei.c
+--- linux-3.0.4/fs/namei.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/namei.c     2011-08-01 18:18:05.000000000 +0200
 @@ -32,6 +32,14 @@
  #include <linux/fcntl.h>
  #include <linux/device_cgroup.h>
@@ -6871,9 +6871,9 @@ diff -NurpP --minimal linux-3.0.3/fs/namei.c linux-3.0.3-vs2.3.1-pre10/fs/namei.
  /* get the link contents into pagecache */
  static char *page_getlink(struct dentry * dentry, struct page **ppage)
  {
-diff -NurpP --minimal linux-3.0.3/fs/namespace.c linux-3.0.3-vs2.3.1-pre10/fs/namespace.c
---- linux-3.0.3/fs/namespace.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/namespace.c   2011-07-23 16:43:31.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/namespace.c linux-3.0.4-vs2.3.1-pre10.1/fs/namespace.c
+--- linux-3.0.4/fs/namespace.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/namespace.c 2011-07-23 16:43:31.000000000 +0200
 @@ -31,6 +31,11 @@
  #include <linux/idr.h>
  #include <linux/fs_struct.h>
@@ -7193,9 +7193,9 @@ diff -NurpP --minimal linux-3.0.3/fs/namespace.c linux-3.0.3-vs2.3.1-pre10/fs/na
        kfree(ns);
  }
  EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-3.0.3/fs/nfs/client.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/client.c
---- linux-3.0.3/fs/nfs/client.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/client.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/nfs/client.c linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/client.c
+--- linux-3.0.4/fs/nfs/client.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/client.c        2011-06-10 22:11:24.000000000 +0200
 @@ -780,6 +780,9 @@ static int nfs_init_server_rpcclient(str
        if (server->flags & NFS_MOUNT_SOFT)
                server->client->cl_softrtry = 1;
@@ -7217,9 +7217,9 @@ diff -NurpP --minimal linux-3.0.3/fs/nfs/client.c linux-3.0.3-vs2.3.1-pre10/fs/n
        server->maxfilesize = fsinfo->maxfilesize;
  
        server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.0.3/fs/nfs/dir.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/dir.c
---- linux-3.0.3/fs/nfs/dir.c   2011-08-29 03:10:24.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/dir.c     2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/nfs/dir.c linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/dir.c
+--- linux-3.0.4/fs/nfs/dir.c   2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/dir.c   2011-08-08 23:04:47.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <linux/sched.h>
  #include <linux/kmemleak.h>
@@ -7236,9 +7236,9 @@ diff -NurpP --minimal linux-3.0.3/fs/nfs/dir.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/
  no_entry:
        res = d_materialise_unique(dentry, inode);
        if (res != NULL) {
-diff -NurpP --minimal linux-3.0.3/fs/nfs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/inode.c
---- linux-3.0.3/fs/nfs/inode.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/inode.c   2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/nfs/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/inode.c
+--- linux-3.0.4/fs/nfs/inode.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/inode.c 2011-07-01 11:35:34.000000000 +0200
 @@ -38,6 +38,7 @@
  #include <linux/nfs_xdr.h>
  #include <linux/slab.h>
@@ -7390,9 +7390,9 @@ diff -NurpP --minimal linux-3.0.3/fs/nfs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/nf
        if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
                if (inode->i_nlink != fattr->nlink) {
                        invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.0.3/fs/nfs/nfs3xdr.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/nfs3xdr.c
---- linux-3.0.3/fs/nfs/nfs3xdr.c       2011-03-15 18:07:32.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/nfs/nfs3xdr.c linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/nfs3xdr.c
+--- linux-3.0.4/fs/nfs/nfs3xdr.c       2011-03-15 18:07:32.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/nfs3xdr.c       2011-06-10 22:11:24.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/nfs3.h>
  #include <linux/nfs_fs.h>
@@ -7538,9 +7538,9 @@ diff -NurpP --minimal linux-3.0.3/fs/nfs/nfs3xdr.c linux-3.0.3-vs2.3.1-pre10/fs/
  }
  
  /*
-diff -NurpP --minimal linux-3.0.3/fs/nfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/super.c
---- linux-3.0.3/fs/nfs/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/super.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/nfs/super.c linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/super.c
+--- linux-3.0.4/fs/nfs/super.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/nfs/super.c 2011-06-10 22:11:24.000000000 +0200
 @@ -53,6 +53,7 @@
  #include <linux/nfs_xdr.h>
  #include <linux/magic.h>
@@ -7612,9 +7612,9 @@ diff -NurpP --minimal linux-3.0.3/fs/nfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/nf
  
                /*
                 * options that take text values
-diff -NurpP --minimal linux-3.0.3/fs/nfsd/auth.c linux-3.0.3-vs2.3.1-pre10/fs/nfsd/auth.c
---- linux-3.0.3/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/nfsd/auth.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/nfsd/auth.c linux-3.0.4-vs2.3.1-pre10.1/fs/nfsd/auth.c
+--- linux-3.0.4/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/nfsd/auth.c 2011-06-10 22:11:24.000000000 +0200
 @@ -1,6 +1,7 @@
  /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
  
@@ -7633,9 +7633,9 @@ diff -NurpP --minimal linux-3.0.3/fs/nfsd/auth.c linux-3.0.3-vs2.3.1-pre10/fs/nf
  
        rqgi = rqstp->rq_cred.cr_group_info;
  
-diff -NurpP --minimal linux-3.0.3/fs/nfsd/nfs3xdr.c linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfs3xdr.c
---- linux-3.0.3/fs/nfsd/nfs3xdr.c      2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfs3xdr.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/nfsd/nfs3xdr.c linux-3.0.4-vs2.3.1-pre10.1/fs/nfsd/nfs3xdr.c
+--- linux-3.0.4/fs/nfsd/nfs3xdr.c      2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/nfsd/nfs3xdr.c      2011-06-10 22:11:24.000000000 +0200
 @@ -7,6 +7,7 @@
   */
  
@@ -7686,9 +7686,9 @@ diff -NurpP --minimal linux-3.0.3/fs/nfsd/nfs3xdr.c linux-3.0.3-vs2.3.1-pre10/fs
        if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
                p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
        } else {
-diff -NurpP --minimal linux-3.0.3/fs/nfsd/nfs4xdr.c linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfs4xdr.c
---- linux-3.0.3/fs/nfsd/nfs4xdr.c      2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfs4xdr.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/nfsd/nfs4xdr.c linux-3.0.4-vs2.3.1-pre10.1/fs/nfsd/nfs4xdr.c
+--- linux-3.0.4/fs/nfsd/nfs4xdr.c      2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/nfsd/nfs4xdr.c      2011-06-10 22:11:24.000000000 +0200
 @@ -45,6 +45,7 @@
  #include <linux/statfs.h>
  #include <linux/utsname.h>
@@ -7718,9 +7718,9 @@ diff -NurpP --minimal linux-3.0.3/fs/nfsd/nfs4xdr.c linux-3.0.3-vs2.3.1-pre10/fs
                if (status == nfserr_resource)
                        goto out_resource;
                if (status)
-diff -NurpP --minimal linux-3.0.3/fs/nfsd/nfsxdr.c linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfsxdr.c
---- linux-3.0.3/fs/nfsd/nfsxdr.c       2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfsxdr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/nfsd/nfsxdr.c linux-3.0.4-vs2.3.1-pre10.1/fs/nfsd/nfsxdr.c
+--- linux-3.0.4/fs/nfsd/nfsxdr.c       2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/nfsd/nfsxdr.c       2011-06-10 22:11:24.000000000 +0200
 @@ -6,6 +6,7 @@
  
  #include "xdr.h"
@@ -7769,9 +7769,9 @@ diff -NurpP --minimal linux-3.0.3/fs/nfsd/nfsxdr.c linux-3.0.3-vs2.3.1-pre10/fs/
  
        if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
                *p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/dlmglue.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/dlmglue.c
---- linux-3.0.3/fs/ocfs2/dlmglue.c     2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/dlmglue.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/dlmglue.c linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/dlmglue.c
+--- linux-3.0.4/fs/ocfs2/dlmglue.c     2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/dlmglue.c     2011-06-10 22:11:24.000000000 +0200
 @@ -2041,6 +2041,7 @@ static void __ocfs2_stuff_meta_lvb(struc
        lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
        lvb->lvb_iuid      = cpu_to_be32(inode->i_uid);
@@ -7788,9 +7788,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/dlmglue.c linux-3.0.3-vs2.3.1-pre10/f
        inode->i_mode    = be16_to_cpu(lvb->lvb_imode);
        inode->i_nlink   = be16_to_cpu(lvb->lvb_inlink);
        ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/dlmglue.h linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/dlmglue.h
---- linux-3.0.3/fs/ocfs2/dlmglue.h     2010-10-21 13:07:50.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/dlmglue.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/dlmglue.h linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/dlmglue.h
+--- linux-3.0.4/fs/ocfs2/dlmglue.h     2010-10-21 13:07:50.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/dlmglue.h     2011-06-10 22:11:24.000000000 +0200
 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
        __be16       lvb_inlink;
        __be32       lvb_iattr;
@@ -7801,9 +7801,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/dlmglue.h linux-3.0.3-vs2.3.1-pre10/f
  };
  
  #define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/file.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/file.c
---- linux-3.0.3/fs/ocfs2/file.c        2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/file.c  2011-06-10 22:43:33.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/file.c linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/file.c
+--- linux-3.0.4/fs/ocfs2/file.c        2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/file.c        2011-06-10 22:43:33.000000000 +0200
 @@ -1111,7 +1111,7 @@ int ocfs2_setattr(struct dentry *dentry,
                attr->ia_valid &= ~ATTR_SIZE;
  
@@ -7813,9 +7813,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/file.c linux-3.0.3-vs2.3.1-pre10/fs/o
        if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
                return 0;
  
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/inode.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/inode.c
---- linux-3.0.3/fs/ocfs2/inode.c       2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/inode.c
+--- linux-3.0.4/fs/ocfs2/inode.c       2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/inode.c       2011-06-10 22:11:24.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <linux/highmem.h>
  #include <linux/pagemap.h>
@@ -7912,9 +7912,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/inode.c linux-3.0.3-vs2.3.1-pre10/fs/
  
        /* Fast symlinks will have i_size but no allocated clusters. */
        if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/inode.h linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/inode.h
---- linux-3.0.3/fs/ocfs2/inode.h       2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/inode.h linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/inode.h
+--- linux-3.0.4/fs/ocfs2/inode.h       2011-01-05 21:50:26.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/inode.h       2011-06-10 22:11:24.000000000 +0200
 @@ -151,6 +151,7 @@ struct buffer_head *ocfs2_bread(struct i
  
  void ocfs2_set_inode_flags(struct inode *inode);
@@ -7923,9 +7923,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/inode.h linux-3.0.3-vs2.3.1-pre10/fs/
  
  static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
  {
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ioctl.c
---- linux-3.0.3/fs/ocfs2/ioctl.c       2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/ioctl.c linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/ioctl.c
+--- linux-3.0.4/fs/ocfs2/ioctl.c       2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/ioctl.c       2011-06-10 22:11:24.000000000 +0200
 @@ -78,7 +78,41 @@ static int ocfs2_get_inode_attr(struct i
        return status;
  }
@@ -7989,9 +7989,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/
  long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
        struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/namei.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/namei.c
---- linux-3.0.3/fs/ocfs2/namei.c       2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/namei.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/namei.c linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/namei.c
+--- linux-3.0.4/fs/ocfs2/namei.c       2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/namei.c       2011-06-10 22:11:24.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/slab.h>
  #include <linux/highmem.h>
@@ -8022,9 +8022,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/namei.c linux-3.0.3-vs2.3.1-pre10/fs/
        fe->i_mode = cpu_to_le16(inode->i_mode);
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
                fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/ocfs2.h linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ocfs2.h
---- linux-3.0.3/fs/ocfs2/ocfs2.h       2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ocfs2.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/ocfs2.h linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/ocfs2.h
+--- linux-3.0.4/fs/ocfs2/ocfs2.h       2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/ocfs2.h       2011-06-10 22:11:24.000000000 +0200
 @@ -272,6 +272,7 @@ enum ocfs2_mount_options
                                                     writes */
        OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -8033,9 +8033,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/ocfs2.h linux-3.0.3-vs2.3.1-pre10/fs/
  };
  
  #define OCFS2_OSB_SOFT_RO                     0x0001
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/ocfs2_fs.h linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ocfs2_fs.h
---- linux-3.0.3/fs/ocfs2/ocfs2_fs.h    2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ocfs2_fs.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/ocfs2_fs.h linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/ocfs2_fs.h
+--- linux-3.0.4/fs/ocfs2/ocfs2_fs.h    2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/ocfs2_fs.h    2011-06-10 22:11:24.000000000 +0200
 @@ -266,6 +266,11 @@
  #define OCFS2_TOPDIR_FL                       FS_TOPDIR_FL    /* Top of directory hierarchies*/
  #define OCFS2_RESERVED_FL             FS_RESERVED_FL  /* reserved for ext2 lib */
@@ -8048,9 +8048,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/ocfs2_fs.h linux-3.0.3-vs2.3.1-pre10/
  #define OCFS2_FL_VISIBLE              FS_FL_USER_VISIBLE      /* User visible flags */
  #define OCFS2_FL_MODIFIABLE           FS_FL_USER_MODIFIABLE   /* User modifiable flags */
  
-diff -NurpP --minimal linux-3.0.3/fs/ocfs2/super.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/super.c
---- linux-3.0.3/fs/ocfs2/super.c       2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/super.c 2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/ocfs2/super.c linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/super.c
+--- linux-3.0.4/fs/ocfs2/super.c       2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/ocfs2/super.c       2011-06-15 02:40:14.000000000 +0200
 @@ -184,6 +184,7 @@ enum {
        Opt_coherency_full,
        Opt_resv_level,
@@ -8114,9 +8114,9 @@ diff -NurpP --minimal linux-3.0.3/fs/ocfs2/super.c linux-3.0.3-vs2.3.1-pre10/fs/
                default:
                        mlog(ML_ERROR,
                             "Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.0.3/fs/open.c linux-3.0.3-vs2.3.1-pre10/fs/open.c
---- linux-3.0.3/fs/open.c      2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/open.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/open.c linux-3.0.4-vs2.3.1-pre10.1/fs/open.c
+--- linux-3.0.4/fs/open.c      2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/open.c      2011-06-10 22:11:24.000000000 +0200
 @@ -30,6 +30,11 @@
  #include <linux/fs_struct.h>
  #include <linux/ima.h>
@@ -8197,9 +8197,9 @@ diff -NurpP --minimal linux-3.0.3/fs/open.c linux-3.0.3-vs2.3.1-pre10/fs/open.c
  }
  
  void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.0.3/fs/proc/array.c linux-3.0.3-vs2.3.1-pre10/fs/proc/array.c
---- linux-3.0.3/fs/proc/array.c        2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/proc/array.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/proc/array.c linux-3.0.4-vs2.3.1-pre10.1/fs/proc/array.c
+--- linux-3.0.4/fs/proc/array.c        2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/proc/array.c        2011-06-10 22:11:24.000000000 +0200
 @@ -81,6 +81,8 @@
  #include <linux/pid_namespace.h>
  #include <linux/ptrace.h>
@@ -8313,9 +8313,9 @@ diff -NurpP --minimal linux-3.0.3/fs/proc/array.c linux-3.0.3-vs2.3.1-pre10/fs/p
        seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
  %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
  %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
-diff -NurpP --minimal linux-3.0.3/fs/proc/base.c linux-3.0.3-vs2.3.1-pre10/fs/proc/base.c
---- linux-3.0.3/fs/proc/base.c 2011-08-29 03:10:25.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/proc/base.c   2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/proc/base.c linux-3.0.4-vs2.3.1-pre10.1/fs/proc/base.c
+--- linux-3.0.4/fs/proc/base.c 2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/proc/base.c 2011-08-08 23:04:47.000000000 +0200
 @@ -83,6 +83,8 @@
  #include <linux/pid_namespace.h>
  #include <linux/fs_struct.h>
@@ -8486,9 +8486,9 @@ diff -NurpP --minimal linux-3.0.3/fs/proc/base.c linux-3.0.3-vs2.3.1-pre10/fs/pr
  
        ns = dentry->d_sb->s_fs_info;
        rcu_read_lock();
-diff -NurpP --minimal linux-3.0.3/fs/proc/generic.c linux-3.0.3-vs2.3.1-pre10/fs/proc/generic.c
---- linux-3.0.3/fs/proc/generic.c      2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/proc/generic.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/proc/generic.c linux-3.0.4-vs2.3.1-pre10.1/fs/proc/generic.c
+--- linux-3.0.4/fs/proc/generic.c      2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/proc/generic.c      2011-06-10 22:11:24.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/bitops.h>
  #include <linux/spinlock.h>
@@ -8548,9 +8548,9 @@ diff -NurpP --minimal linux-3.0.3/fs/proc/generic.c linux-3.0.3-vs2.3.1-pre10/fs
                } else {
                        kfree(ent);
                        ent = NULL;
-diff -NurpP --minimal linux-3.0.3/fs/proc/inode.c linux-3.0.3-vs2.3.1-pre10/fs/proc/inode.c
---- linux-3.0.3/fs/proc/inode.c        2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/proc/inode.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/proc/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/proc/inode.c
+--- linux-3.0.4/fs/proc/inode.c        2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/proc/inode.c        2011-06-10 22:11:24.000000000 +0200
 @@ -442,6 +442,8 @@ struct inode *proc_get_inode(struct supe
                        inode->i_uid = de->uid;
                        inode->i_gid = de->gid;
@@ -8560,9 +8560,9 @@ diff -NurpP --minimal linux-3.0.3/fs/proc/inode.c linux-3.0.3-vs2.3.1-pre10/fs/p
                if (de->size)
                        inode->i_size = de->size;
                if (de->nlink)
-diff -NurpP --minimal linux-3.0.3/fs/proc/internal.h linux-3.0.3-vs2.3.1-pre10/fs/proc/internal.h
---- linux-3.0.3/fs/proc/internal.h     2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/proc/internal.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/proc/internal.h linux-3.0.4-vs2.3.1-pre10.1/fs/proc/internal.h
+--- linux-3.0.4/fs/proc/internal.h     2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/proc/internal.h     2011-06-10 22:11:24.000000000 +0200
 @@ -10,6 +10,7 @@
   */
  
@@ -8599,9 +8599,9 @@ diff -NurpP --minimal linux-3.0.3/fs/proc/internal.h linux-3.0.3-vs2.3.1-pre10/f
  static inline int proc_fd(struct inode *inode)
  {
        return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.0.3/fs/proc/loadavg.c linux-3.0.3-vs2.3.1-pre10/fs/proc/loadavg.c
---- linux-3.0.3/fs/proc/loadavg.c      2009-09-10 15:26:23.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/proc/loadavg.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/proc/loadavg.c linux-3.0.4-vs2.3.1-pre10.1/fs/proc/loadavg.c
+--- linux-3.0.4/fs/proc/loadavg.c      2009-09-10 15:26:23.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/proc/loadavg.c      2011-06-10 22:11:24.000000000 +0200
 @@ -12,15 +12,27 @@
  
  static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -8631,9 +8631,9 @@ diff -NurpP --minimal linux-3.0.3/fs/proc/loadavg.c linux-3.0.3-vs2.3.1-pre10/fs
                task_active_pid_ns(current)->last_pid);
        return 0;
  }
-diff -NurpP --minimal linux-3.0.3/fs/proc/meminfo.c linux-3.0.3-vs2.3.1-pre10/fs/proc/meminfo.c
---- linux-3.0.3/fs/proc/meminfo.c      2011-03-15 18:07:33.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/proc/meminfo.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/proc/meminfo.c linux-3.0.4-vs2.3.1-pre10.1/fs/proc/meminfo.c
+--- linux-3.0.4/fs/proc/meminfo.c      2011-03-15 18:07:33.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/proc/meminfo.c      2011-06-10 22:11:24.000000000 +0200
 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
        allowed = ((totalram_pages - hugetlb_total_pages())
                * sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -8644,9 +8644,9 @@ diff -NurpP --minimal linux-3.0.3/fs/proc/meminfo.c linux-3.0.3-vs2.3.1-pre10/fs
                        total_swapcache_pages - i.bufferram;
        if (cached < 0)
                cached = 0;
-diff -NurpP --minimal linux-3.0.3/fs/proc/root.c linux-3.0.3-vs2.3.1-pre10/fs/proc/root.c
---- linux-3.0.3/fs/proc/root.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/proc/root.c   2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/proc/root.c linux-3.0.4-vs2.3.1-pre10.1/fs/proc/root.c
+--- linux-3.0.4/fs/proc/root.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/proc/root.c 2011-06-22 12:39:15.000000000 +0200
 @@ -18,9 +18,14 @@
  #include <linux/bitops.h>
  #include <linux/mount.h>
@@ -8678,9 +8678,9 @@ diff -NurpP --minimal linux-3.0.3/fs/proc/root.c linux-3.0.3-vs2.3.1-pre10/fs/pr
  };
  
  int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-3.0.3/fs/proc/uptime.c linux-3.0.3-vs2.3.1-pre10/fs/proc/uptime.c
---- linux-3.0.3/fs/proc/uptime.c       2009-12-03 20:02:53.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/proc/uptime.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/proc/uptime.c linux-3.0.4-vs2.3.1-pre10.1/fs/proc/uptime.c
+--- linux-3.0.4/fs/proc/uptime.c       2009-12-03 20:02:53.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/proc/uptime.c       2011-06-10 22:11:24.000000000 +0200
 @@ -4,22 +4,22 @@
  #include <linux/sched.h>
  #include <linux/seq_file.h>
@@ -8710,9 +8710,9 @@ diff -NurpP --minimal linux-3.0.3/fs/proc/uptime.c linux-3.0.3-vs2.3.1-pre10/fs/
        seq_printf(m, "%lu.%02lu %lu.%02lu\n",
                        (unsigned long) uptime.tv_sec,
                        (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.0.3/fs/quota/dquot.c linux-3.0.3-vs2.3.1-pre10/fs/quota/dquot.c
---- linux-3.0.3/fs/quota/dquot.c       2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/quota/dquot.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/quota/dquot.c linux-3.0.4-vs2.3.1-pre10.1/fs/quota/dquot.c
+--- linux-3.0.4/fs/quota/dquot.c       2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/quota/dquot.c       2011-06-10 22:11:24.000000000 +0200
 @@ -1548,6 +1548,9 @@ int __dquot_alloc_space(struct inode *in
        int reserve = flags & DQUOT_SPACE_RESERVE;
        int nofail = flags & DQUOT_SPACE_NOFAIL;
@@ -8751,9 +8751,9 @@ diff -NurpP --minimal linux-3.0.3/fs/quota/dquot.c linux-3.0.3-vs2.3.1-pre10/fs/
        /* First test before acquiring mutex - solves deadlocks when we
           * re-enter the quota code and are already holding the mutex */
        if (!dquot_active(inode))
-diff -NurpP --minimal linux-3.0.3/fs/quota/quota.c linux-3.0.3-vs2.3.1-pre10/fs/quota/quota.c
---- linux-3.0.3/fs/quota/quota.c       2011-03-15 18:07:34.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/quota/quota.c 2011-06-13 18:19:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/quota/quota.c linux-3.0.4-vs2.3.1-pre10.1/fs/quota/quota.c
+--- linux-3.0.4/fs/quota/quota.c       2011-03-15 18:07:34.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/quota/quota.c       2011-06-13 18:19:47.000000000 +0200
 @@ -8,6 +8,7 @@
  #include <linux/fs.h>
  #include <linux/namei.h>
@@ -8841,18 +8841,18 @@ diff -NurpP --minimal linux-3.0.3/fs/quota/quota.c linux-3.0.3-vs2.3.1-pre10/fs/
        sb = get_super(bdev);
        bdput(bdev);
        if (!sb)
-diff -NurpP --minimal linux-3.0.3/fs/reiserfs/file.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/file.c
---- linux-3.0.3/fs/reiserfs/file.c     2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/file.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/reiserfs/file.c linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/file.c
+--- linux-3.0.4/fs/reiserfs/file.c     2011-01-05 21:50:26.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/file.c     2011-06-10 22:11:24.000000000 +0200
 @@ -312,4 +312,5 @@ const struct inode_operations reiserfs_f
        .listxattr = reiserfs_listxattr,
        .removexattr = reiserfs_removexattr,
        .permission = reiserfs_permission,
 +      .sync_flags = reiserfs_sync_flags,
  };
-diff -NurpP --minimal linux-3.0.3/fs/reiserfs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/inode.c
---- linux-3.0.3/fs/reiserfs/inode.c    2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/inode.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/reiserfs/inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/inode.c
+--- linux-3.0.4/fs/reiserfs/inode.c    2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/inode.c    2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/writeback.h>
  #include <linux/quotaops.h>
@@ -9018,9 +9018,9 @@ diff -NurpP --minimal linux-3.0.3/fs/reiserfs/inode.c linux-3.0.3-vs2.3.1-pre10/
                mark_inode_dirty(inode);
                error = journal_end(&th, inode->i_sb, jbegin_count);
                if (error)
-diff -NurpP --minimal linux-3.0.3/fs/reiserfs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/ioctl.c
---- linux-3.0.3/fs/reiserfs/ioctl.c    2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/ioctl.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/reiserfs/ioctl.c linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/ioctl.c
+--- linux-3.0.4/fs/reiserfs/ioctl.c    2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/ioctl.c    2011-06-10 22:11:24.000000000 +0200
 @@ -11,6 +11,21 @@
  #include <linux/pagemap.h>
  #include <linux/compat.h>
@@ -9082,9 +9082,9 @@ diff -NurpP --minimal linux-3.0.3/fs/reiserfs/ioctl.c linux-3.0.3-vs2.3.1-pre10/
                        sd_attrs_to_i_attrs(flags, inode);
                        REISERFS_I(inode)->i_attrs = flags;
                        inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.0.3/fs/reiserfs/namei.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/namei.c
---- linux-3.0.3/fs/reiserfs/namei.c    2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/namei.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/reiserfs/namei.c linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/namei.c
+--- linux-3.0.4/fs/reiserfs/namei.c    2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/namei.c    2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/reiserfs_acl.h>
  #include <linux/reiserfs_xattr.h>
@@ -9109,9 +9109,9 @@ diff -NurpP --minimal linux-3.0.3/fs/reiserfs/namei.c linux-3.0.3-vs2.3.1-pre10/
  };
  
  /*
-diff -NurpP --minimal linux-3.0.3/fs/reiserfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/super.c
---- linux-3.0.3/fs/reiserfs/super.c    2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/super.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/reiserfs/super.c linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/super.c
+--- linux-3.0.4/fs/reiserfs/super.c    2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/super.c    2011-06-10 22:11:24.000000000 +0200
 @@ -899,6 +899,14 @@ static int reiserfs_parse_options(struct
                {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
                {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
@@ -9153,9 +9153,9 @@ diff -NurpP --minimal linux-3.0.3/fs/reiserfs/super.c linux-3.0.3-vs2.3.1-pre10/
        rs = SB_DISK_SUPER_BLOCK(s);
        /* Let's do basic sanity check to verify that underlying device is not
           smaller than the filesystem. If the check fails then abort and scream,
-diff -NurpP --minimal linux-3.0.3/fs/reiserfs/xattr.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/xattr.c
---- linux-3.0.3/fs/reiserfs/xattr.c    2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/xattr.c      2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/reiserfs/xattr.c linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/xattr.c
+--- linux-3.0.4/fs/reiserfs/xattr.c    2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/reiserfs/xattr.c    2011-06-22 12:39:15.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <linux/errno.h>
  #include <linux/gfp.h>
@@ -9164,9 +9164,9 @@ diff -NurpP --minimal linux-3.0.3/fs/reiserfs/xattr.c linux-3.0.3-vs2.3.1-pre10/
  #include <linux/file.h>
  #include <linux/pagemap.h>
  #include <linux/xattr.h>
-diff -NurpP --minimal linux-3.0.3/fs/stat.c linux-3.0.3-vs2.3.1-pre10/fs/stat.c
---- linux-3.0.3/fs/stat.c      2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/stat.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/stat.c linux-3.0.4-vs2.3.1-pre10.1/fs/stat.c
+--- linux-3.0.4/fs/stat.c      2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/stat.c      2011-06-10 22:11:24.000000000 +0200
 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
        stat->nlink = inode->i_nlink;
        stat->uid = inode->i_uid;
@@ -9175,9 +9175,9 @@ diff -NurpP --minimal linux-3.0.3/fs/stat.c linux-3.0.3-vs2.3.1-pre10/fs/stat.c
        stat->rdev = inode->i_rdev;
        stat->atime = inode->i_atime;
        stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-3.0.3/fs/statfs.c linux-3.0.3-vs2.3.1-pre10/fs/statfs.c
---- linux-3.0.3/fs/statfs.c    2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/statfs.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/statfs.c linux-3.0.4-vs2.3.1-pre10.1/fs/statfs.c
+--- linux-3.0.4/fs/statfs.c    2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/statfs.c    2011-06-10 22:11:24.000000000 +0200
 @@ -7,6 +7,8 @@
  #include <linux/statfs.h>
  #include <linux/security.h>
@@ -9196,9 +9196,9 @@ diff -NurpP --minimal linux-3.0.3/fs/statfs.c linux-3.0.3-vs2.3.1-pre10/fs/statf
        return retval;
  }
  
-diff -NurpP --minimal linux-3.0.3/fs/super.c linux-3.0.3-vs2.3.1-pre10/fs/super.c
---- linux-3.0.3/fs/super.c     2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/super.c       2011-07-23 16:49:09.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/super.c linux-3.0.4-vs2.3.1-pre10.1/fs/super.c
+--- linux-3.0.4/fs/super.c     2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/super.c     2011-07-23 16:49:09.000000000 +0200
 @@ -32,6 +32,9 @@
  #include <linux/backing-dev.h>
  #include <linux/rculist_bl.h>
@@ -9223,9 +9223,9 @@ diff -NurpP --minimal linux-3.0.3/fs/super.c linux-3.0.3-vs2.3.1-pre10/fs/super.
        error = security_sb_kern_mount(sb, flags, secdata);
        if (error)
                goto out_sb;
-diff -NurpP --minimal linux-3.0.3/fs/sysfs/mount.c linux-3.0.3-vs2.3.1-pre10/fs/sysfs/mount.c
---- linux-3.0.3/fs/sysfs/mount.c       2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/sysfs/mount.c 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/sysfs/mount.c linux-3.0.4-vs2.3.1-pre10.1/fs/sysfs/mount.c
+--- linux-3.0.4/fs/sysfs/mount.c       2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/sysfs/mount.c       2011-06-22 12:39:15.000000000 +0200
 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
  
        sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -9235,9 +9235,9 @@ diff -NurpP --minimal linux-3.0.3/fs/sysfs/mount.c linux-3.0.3-vs2.3.1-pre10/fs/
        sb->s_op = &sysfs_ops;
        sb->s_time_gran = 1;
  
-diff -NurpP --minimal linux-3.0.3/fs/utimes.c linux-3.0.3-vs2.3.1-pre10/fs/utimes.c
---- linux-3.0.3/fs/utimes.c    2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/utimes.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/utimes.c linux-3.0.4-vs2.3.1-pre10.1/fs/utimes.c
+--- linux-3.0.4/fs/utimes.c    2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/utimes.c    2011-06-10 22:11:24.000000000 +0200
 @@ -8,6 +8,8 @@
  #include <linux/stat.h>
  #include <linux/utime.h>
@@ -9267,9 +9267,9 @@ diff -NurpP --minimal linux-3.0.3/fs/utimes.c linux-3.0.3-vs2.3.1-pre10/fs/utime
        if (times && times[0].tv_nsec == UTIME_NOW &&
                     times[1].tv_nsec == UTIME_NOW)
                times = NULL;
-diff -NurpP --minimal linux-3.0.3/fs/xattr.c linux-3.0.3-vs2.3.1-pre10/fs/xattr.c
---- linux-3.0.3/fs/xattr.c     2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xattr.c       2011-06-10 23:10:19.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xattr.c linux-3.0.4-vs2.3.1-pre10.1/fs/xattr.c
+--- linux-3.0.4/fs/xattr.c     2011-07-22 11:18:09.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xattr.c     2011-06-10 23:10:19.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/module.h>
  #include <linux/fsnotify.h>
@@ -9287,9 +9287,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xattr.c linux-3.0.3-vs2.3.1-pre10/fs/xattr.
                        return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
                return 0;
        }
-diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c   2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_ioctl.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c   2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_ioctl.c   2011-06-10 22:11:24.000000000 +0200
 @@ -28,7 +28,7 @@
  #include "xfs_bmap_btree.h"
  #include "xfs_dinode.h"
@@ -9358,9 +9358,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.3-vs2.3
                return xfs_ioc_setxflags(ip, filp, arg);
  
        case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.h   2010-07-07 18:31:54.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_ioctl.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_ioctl.h
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.h   2010-07-07 18:31:54.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_ioctl.h   2011-06-10 22:11:24.000000000 +0200
 @@ -70,6 +70,12 @@ xfs_handle_to_dentry(
        void __user             *uhandle,
        u32                     hlen);
@@ -9374,9 +9374,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.3-vs2.3
  extern long
  xfs_file_ioctl(
        struct file             *filp,
-diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c    2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_iops.c      2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c    2011-07-22 11:18:09.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_iops.c    2011-06-22 12:39:15.000000000 +0200
 @@ -30,6 +30,7 @@
  #include "xfs_bmap_btree.h"
  #include "xfs_dinode.h"
@@ -9452,9 +9452,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.3-vs2.3.
  
        switch (inode->i_mode & S_IFMT) {
        case S_IFBLK:
-diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_linux.h
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_linux.h   2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_linux.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_linux.h   2011-07-22 11:18:09.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_linux.h   2011-06-10 22:11:24.000000000 +0200
 @@ -115,6 +115,7 @@
  
  #define current_cpu()         (raw_smp_processor_id())
@@ -9463,9 +9463,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.3-vs2.3
  #define current_test_flags(f) (current->flags & (f))
  #define current_set_flags_nested(sp, f)               \
                (*(sp) = current->flags, current->flags |= (f))
-diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_super.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_super.c
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_super.c   2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_super.c     2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/linux-2.6/xfs_super.c linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_super.c
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_super.c   2011-07-22 11:18:09.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/linux-2.6/xfs_super.c   2011-06-22 12:39:15.000000000 +0200
 @@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
  #define MNTOPT_NODELAYLOG  "nodelaylog"       /* Delayed logging disabled */
  #define MNTOPT_DISCARD           "discard"    /* Discard unused blocks */
@@ -9538,9 +9538,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_super.c linux-3.0.3-vs2.3
        /*
         * we must configure the block size in the superblock before we run the
         * full mount process as the mount process can lookup and cache inodes.
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_dinode.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_dinode.h
---- linux-3.0.3/fs/xfs/xfs_dinode.h    2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_dinode.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_dinode.h linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_dinode.h
+--- linux-3.0.4/fs/xfs/xfs_dinode.h    2011-01-05 21:50:28.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_dinode.h    2011-06-10 22:11:24.000000000 +0200
 @@ -51,7 +51,9 @@ typedef struct xfs_dinode {
        __be32          di_nlink;       /* number of links to file */
        __be16          di_projid_lo;   /* lower part of owner's project id */
@@ -9581,9 +9581,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_dinode.h linux-3.0.3-vs2.3.1-pre10/
 +#define XFS_DIVFLAG_COW               0x02
  
  #endif        /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_fs.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_fs.h
---- linux-3.0.3/fs/xfs/xfs_fs.h        2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_fs.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_fs.h linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_fs.h
+--- linux-3.0.4/fs/xfs/xfs_fs.h        2011-01-05 21:50:28.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_fs.h        2011-06-10 22:11:24.000000000 +0200
 @@ -67,6 +67,9 @@ struct fsxattr {
  #define XFS_XFLAG_EXTSZINHERIT        0x00001000      /* inherit inode extent size */
  #define XFS_XFLAG_NODEFRAG    0x00002000      /* do not defragment */
@@ -9604,9 +9604,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_fs.h linux-3.0.3-vs2.3.1-pre10/fs/x
        __u32           bs_dmevmask;    /* DMIG event mask              */
        __u16           bs_dmstate;     /* DMIG state info              */
        __u16           bs_aextents;    /* attribute number of extents  */
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_ialloc.c
---- linux-3.0.3/fs/xfs/xfs_ialloc.c    2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_ialloc.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_ialloc.c linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_ialloc.c
+--- linux-3.0.4/fs/xfs/xfs_ialloc.c    2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_ialloc.c    2011-06-10 22:11:24.000000000 +0200
 @@ -37,7 +37,6 @@
  #include "xfs_error.h"
  #include "xfs_bmap.h"
@@ -9615,9 +9615,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_ialloc.c linux-3.0.3-vs2.3.1-pre10/
  /*
   * Allocation group level functions.
   */
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_inode.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_inode.c
---- linux-3.0.3/fs/xfs/xfs_inode.c     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_inode.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_inode.c linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_inode.c
+--- linux-3.0.4/fs/xfs/xfs_inode.c     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_inode.c     2011-06-10 22:11:24.000000000 +0200
 @@ -243,6 +243,7 @@ xfs_inotobp(
        return 0;
  }
@@ -9792,9 +9792,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_inode.c linux-3.0.3-vs2.3.1-pre10/f
  
        /* Wrap, we never let the log put out DI_MAX_FLUSH */
        if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_inode.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_inode.h
---- linux-3.0.3/fs/xfs/xfs_inode.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_inode.h       2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_inode.h linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_inode.h
+--- linux-3.0.4/fs/xfs/xfs_inode.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_inode.h     2011-07-01 11:35:35.000000000 +0200
 @@ -135,7 +135,9 @@ typedef struct xfs_icdinode {
        __uint32_t      di_nlink;       /* number of links to file */
        __uint16_t      di_projid_lo;   /* lower part of owner's project id */
@@ -9815,9 +9815,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_inode.h linux-3.0.3-vs2.3.1-pre10/f
  void          xfs_idestroy_fork(struct xfs_inode *, int);
  void          xfs_idata_realloc(struct xfs_inode *, int, int);
  void          xfs_iroot_realloc(struct xfs_inode *, int, int);
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_itable.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_itable.c
---- linux-3.0.3/fs/xfs/xfs_itable.c    2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_itable.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_itable.c linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_itable.c
+--- linux-3.0.4/fs/xfs/xfs_itable.c    2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_itable.c    2011-06-10 22:11:24.000000000 +0200
 @@ -98,6 +98,7 @@ xfs_bulkstat_one_int(
        buf->bs_mode = dic->di_mode;
        buf->bs_uid = dic->di_uid;
@@ -9826,9 +9826,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_itable.c linux-3.0.3-vs2.3.1-pre10/
        buf->bs_size = dic->di_size;
  
        /*
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_log_recover.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_log_recover.c
---- linux-3.0.3/fs/xfs/xfs_log_recover.c       2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_log_recover.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_log_recover.c linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_log_recover.c
+--- linux-3.0.4/fs/xfs/xfs_log_recover.c       2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_log_recover.c       2011-06-10 22:11:24.000000000 +0200
 @@ -2343,7 +2343,8 @@ xlog_recover_inode_pass2(
        }
  
@@ -9839,9 +9839,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_log_recover.c linux-3.0.3-vs2.3.1-p
  
        /* the rest is in on-disk format */
        if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_mount.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_mount.h
---- linux-3.0.3/fs/xfs/xfs_mount.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_mount.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_mount.h linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_mount.h
+--- linux-3.0.4/fs/xfs/xfs_mount.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_mount.h     2011-06-10 22:11:24.000000000 +0200
 @@ -249,6 +249,7 @@ typedef struct xfs_mount {
                                                   allocator */
  #define XFS_MOUNT_NOATTR2     (1ULL << 25)    /* disable use of attr2 format */
@@ -9850,9 +9850,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_mount.h linux-3.0.3-vs2.3.1-pre10/f
  
  /*
   * Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_vnodeops.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_vnodeops.c
---- linux-3.0.3/fs/xfs/xfs_vnodeops.c  2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_vnodeops.c    2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_vnodeops.c linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_vnodeops.c
+--- linux-3.0.4/fs/xfs/xfs_vnodeops.c  2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_vnodeops.c  2011-07-01 11:35:35.000000000 +0200
 @@ -50,6 +50,78 @@
  #include "xfs_vnodeops.h"
  #include "xfs_trace.h"
@@ -9990,9 +9990,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_vnodeops.c linux-3.0.3-vs2.3.1-pre1
                if (iuid != uid) {
                        if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
                                ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_vnodeops.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_vnodeops.h
---- linux-3.0.3/fs/xfs/xfs_vnodeops.h  2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_vnodeops.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/fs/xfs/xfs_vnodeops.h linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_vnodeops.h
+--- linux-3.0.4/fs/xfs/xfs_vnodeops.h  2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/fs/xfs/xfs_vnodeops.h  2011-06-10 22:11:24.000000000 +0200
 @@ -13,6 +13,7 @@ struct xfs_inode;
  struct xfs_iomap;
  
@@ -10001,9 +10001,9 @@ diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_vnodeops.h linux-3.0.3-vs2.3.1-pre1
  int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
  #define       XFS_ATTR_DMI            0x01    /* invocation from a DMI function */
  #define       XFS_ATTR_NONBLOCK       0x02    /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-3.0.3/include/asm-generic/tlb.h linux-3.0.3-vs2.3.1-pre10/include/asm-generic/tlb.h
---- linux-3.0.3/include/asm-generic/tlb.h      2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/asm-generic/tlb.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/asm-generic/tlb.h linux-3.0.4-vs2.3.1-pre10.1/include/asm-generic/tlb.h
+--- linux-3.0.4/include/asm-generic/tlb.h      2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/asm-generic/tlb.h      2011-06-10 22:11:24.000000000 +0200
 @@ -16,6 +16,7 @@
  #define _ASM_GENERIC__TLB_H
  
@@ -10012,9 +10012,9 @@ diff -NurpP --minimal linux-3.0.3/include/asm-generic/tlb.h linux-3.0.3-vs2.3.1-
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
  
-diff -NurpP --minimal linux-3.0.3/include/linux/Kbuild linux-3.0.3-vs2.3.1-pre10/include/linux/Kbuild
---- linux-3.0.3/include/linux/Kbuild   2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/Kbuild     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/Kbuild linux-3.0.4-vs2.3.1-pre10.1/include/linux/Kbuild
+--- linux-3.0.4/include/linux/Kbuild   2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/Kbuild   2011-06-10 22:11:24.000000000 +0200
 @@ -17,6 +17,7 @@ header-y += netfilter_bridge/
  header-y += netfilter_ipv4/
  header-y += netfilter_ipv6/
@@ -10023,9 +10023,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/Kbuild linux-3.0.3-vs2.3.1-pre10
  header-y += wimax/
  
  objhdr-y += version.h
-diff -NurpP --minimal linux-3.0.3/include/linux/capability.h linux-3.0.3-vs2.3.1-pre10/include/linux/capability.h
---- linux-3.0.3/include/linux/capability.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/capability.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/capability.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/capability.h
+--- linux-3.0.4/include/linux/capability.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/capability.h     2011-06-10 22:11:24.000000000 +0200
 @@ -279,6 +279,7 @@ struct cpu_vfs_cap_data {
     arbitrary SCSI commands */
  /* Allow setting encryption key on loopback filesystem */
@@ -10048,9 +10048,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/capability.h linux-3.0.3-vs2.3.1
  
  /*
   * Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.0.3/include/linux/cred.h linux-3.0.3-vs2.3.1-pre10/include/linux/cred.h
---- linux-3.0.3/include/linux/cred.h   2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/cred.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/cred.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/cred.h
+--- linux-3.0.4/include/linux/cred.h   2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/cred.h   2011-06-10 22:11:24.000000000 +0200
 @@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
  extern int copy_creds(struct task_struct *, unsigned long);
  extern const struct cred *get_task_cred(struct task_struct *);
@@ -10091,18 +10091,18 @@ diff -NurpP --minimal linux-3.0.3/include/linux/cred.h linux-3.0.3-vs2.3.1-pre10
  /**
   * get_new_cred - Get a reference on a new set of credentials
   * @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.0.3/include/linux/devpts_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/devpts_fs.h
---- linux-3.0.3/include/linux/devpts_fs.h      2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/devpts_fs.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/devpts_fs.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/devpts_fs.h
+--- linux-3.0.4/include/linux/devpts_fs.h      2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/devpts_fs.h      2011-06-10 22:11:24.000000000 +0200
 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
  
  #endif
  
 -
  #endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/ext2_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/ext2_fs.h
---- linux-3.0.3/include/linux/ext2_fs.h        2010-02-25 11:52:07.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/ext2_fs.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/ext2_fs.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/ext2_fs.h
+--- linux-3.0.4/include/linux/ext2_fs.h        2010-02-25 11:52:07.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/ext2_fs.h        2011-06-10 22:11:24.000000000 +0200
 @@ -189,8 +189,12 @@ struct ext2_group_desc
  #define EXT2_NOTAIL_FL                        FS_NOTAIL_FL    /* file tail should not be merged */
  #define EXT2_DIRSYNC_FL                       FS_DIRSYNC_FL   /* dirsync behaviour (directories only) */
@@ -10142,9 +10142,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/ext2_fs.h linux-3.0.3-vs2.3.1-pr
  
  
  #define clear_opt(o, opt)             o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-3.0.3/include/linux/ext3_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/ext3_fs.h
---- linux-3.0.3/include/linux/ext3_fs.h        2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/ext3_fs.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/ext3_fs.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/ext3_fs.h
+--- linux-3.0.4/include/linux/ext3_fs.h        2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/ext3_fs.h        2011-06-10 22:11:24.000000000 +0200
 @@ -173,10 +173,14 @@ struct ext3_group_desc
  #define EXT3_NOTAIL_FL                        0x00008000 /* file tail should not be merged */
  #define EXT3_DIRSYNC_FL                       0x00010000 /* dirsync behaviour (directories only) */
@@ -10196,9 +10196,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/ext3_fs.h linux-3.0.3-vs2.3.1-pr
  
  /* ioctl.c */
  extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.3/include/linux/fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/fs.h
---- linux-3.0.3/include/linux/fs.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/fs.h       2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/fs.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/fs.h
+--- linux-3.0.4/include/linux/fs.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/fs.h     2011-07-01 11:35:35.000000000 +0200
 @@ -208,6 +208,9 @@ struct inodes_stat_t {
  #define MS_KERNMOUNT  (1<<22) /* this is a kern_mount call */
  #define MS_I_VERSION  (1<<23) /* Update inode I_version field */
@@ -10381,9 +10381,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/fs.h linux-3.0.3-vs2.3.1-pre10/i
  extern int simple_setattr(struct dentry *, struct iattr *);
  extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
  extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-3.0.3/include/linux/gfs2_ondisk.h linux-3.0.3-vs2.3.1-pre10/include/linux/gfs2_ondisk.h
---- linux-3.0.3/include/linux/gfs2_ondisk.h    2010-07-07 18:31:55.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/gfs2_ondisk.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/gfs2_ondisk.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/gfs2_ondisk.h
+--- linux-3.0.4/include/linux/gfs2_ondisk.h    2010-07-07 18:31:55.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/gfs2_ondisk.h    2011-06-10 22:11:24.000000000 +0200
 @@ -211,6 +211,9 @@ enum {
        gfs2fl_NoAtime          = 7,
        gfs2fl_Sync             = 8,
@@ -10404,9 +10404,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/gfs2_ondisk.h linux-3.0.3-vs2.3.
  #define GFS2_DIF_TRUNC_IN_PROG                0x20000000 /* New in gfs2 */
  #define GFS2_DIF_INHERIT_DIRECTIO     0x40000000
  #define GFS2_DIF_INHERIT_JDATA                0x80000000
-diff -NurpP --minimal linux-3.0.3/include/linux/if_tun.h linux-3.0.3-vs2.3.1-pre10/include/linux/if_tun.h
---- linux-3.0.3/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/if_tun.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/if_tun.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/if_tun.h
+--- linux-3.0.4/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/if_tun.h 2011-06-10 22:11:24.000000000 +0200
 @@ -53,6 +53,7 @@
  #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
  #define TUNGETVNETHDRSZ _IOR('T', 215, int)
@@ -10415,9 +10415,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/if_tun.h linux-3.0.3-vs2.3.1-pre
  
  /* TUNSETIFF ifr flags */
  #define IFF_TUN               0x0001
-diff -NurpP --minimal linux-3.0.3/include/linux/init_task.h linux-3.0.3-vs2.3.1-pre10/include/linux/init_task.h
---- linux-3.0.3/include/linux/init_task.h      2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/init_task.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/init_task.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/init_task.h
+--- linux-3.0.4/include/linux/init_task.h      2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/init_task.h      2011-06-10 22:11:24.000000000 +0200
 @@ -193,6 +193,10 @@ extern struct cred init_cred;
        INIT_FTRACE_GRAPH                                               \
        INIT_TRACE_RECURSION                                            \
@@ -10429,9 +10429,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/init_task.h linux-3.0.3-vs2.3.1-
  }
  
  
-diff -NurpP --minimal linux-3.0.3/include/linux/ipc.h linux-3.0.3-vs2.3.1-pre10/include/linux/ipc.h
---- linux-3.0.3/include/linux/ipc.h    2009-12-03 20:02:55.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/ipc.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/ipc.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/ipc.h
+--- linux-3.0.4/include/linux/ipc.h    2009-12-03 20:02:55.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/ipc.h    2011-06-10 22:11:24.000000000 +0200
 @@ -91,6 +91,7 @@ struct kern_ipc_perm
        key_t           key;
        uid_t           uid;
@@ -10440,9 +10440,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/ipc.h linux-3.0.3-vs2.3.1-pre10/
        uid_t           cuid;
        gid_t           cgid;
        mode_t          mode; 
-diff -NurpP --minimal linux-3.0.3/include/linux/ipc_namespace.h linux-3.0.3-vs2.3.1-pre10/include/linux/ipc_namespace.h
---- linux-3.0.3/include/linux/ipc_namespace.h  2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/ipc_namespace.h    2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/ipc_namespace.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/ipc_namespace.h
+--- linux-3.0.4/include/linux/ipc_namespace.h  2011-05-22 16:17:55.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/ipc_namespace.h  2011-06-13 14:09:44.000000000 +0200
 @@ -94,7 +94,8 @@ static inline int mq_init_ns(struct ipc_
  
  #if defined(CONFIG_IPC_NS)
@@ -10469,9 +10469,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/ipc_namespace.h linux-3.0.3-vs2.
  }
  
  static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.0.3/include/linux/loop.h linux-3.0.3-vs2.3.1-pre10/include/linux/loop.h
---- linux-3.0.3/include/linux/loop.h   2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/loop.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/loop.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/loop.h
+--- linux-3.0.4/include/linux/loop.h   2009-09-10 15:26:25.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/loop.h   2011-06-10 22:11:24.000000000 +0200
 @@ -45,6 +45,7 @@ struct loop_device {
        struct loop_func_table *lo_encryption;
        __u32           lo_init[2];
@@ -10480,9 +10480,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/loop.h linux-3.0.3-vs2.3.1-pre10
        int             (*ioctl)(struct loop_device *, int cmd, 
                                 unsigned long arg); 
  
-diff -NurpP --minimal linux-3.0.3/include/linux/magic.h linux-3.0.3-vs2.3.1-pre10/include/linux/magic.h
---- linux-3.0.3/include/linux/magic.h  2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/magic.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/magic.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/magic.h
+--- linux-3.0.4/include/linux/magic.h  2011-05-22 16:17:55.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/magic.h  2011-06-10 22:11:24.000000000 +0200
 @@ -3,7 +3,7 @@
  
  #define ADFS_SUPER_MAGIC      0xadf5
@@ -10500,9 +10500,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/magic.h linux-3.0.3-vs2.3.1-pre1
  #define QNX4_SUPER_MAGIC      0x002f          /* qnx4 fs detection */
  
  #define REISERFS_SUPER_MAGIC  0x52654973      /* used by gcc */
-diff -NurpP --minimal linux-3.0.3/include/linux/major.h linux-3.0.3-vs2.3.1-pre10/include/linux/major.h
---- linux-3.0.3/include/linux/major.h  2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/major.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/major.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/major.h
+--- linux-3.0.4/include/linux/major.h  2009-09-10 15:26:25.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/major.h  2011-06-10 22:11:24.000000000 +0200
 @@ -15,6 +15,7 @@
  #define HD_MAJOR              IDE0_MAJOR
  #define PTY_SLAVE_MAJOR               3
@@ -10511,9 +10511,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/major.h linux-3.0.3-vs2.3.1-pre1
  #define TTYAUX_MAJOR          5
  #define LP_MAJOR              6
  #define VCS_MAJOR             7
-diff -NurpP --minimal linux-3.0.3/include/linux/memcontrol.h linux-3.0.3-vs2.3.1-pre10/include/linux/memcontrol.h
---- linux-3.0.3/include/linux/memcontrol.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/memcontrol.h       2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/memcontrol.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/memcontrol.h
+--- linux-3.0.4/include/linux/memcontrol.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/memcontrol.h     2011-06-22 12:39:15.000000000 +0200
 @@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg
  extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
  extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);
@@ -10528,9 +10528,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/memcontrol.h linux-3.0.3-vs2.3.1
  static inline
  int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
  {
-diff -NurpP --minimal linux-3.0.3/include/linux/mm_types.h linux-3.0.3-vs2.3.1-pre10/include/linux/mm_types.h
---- linux-3.0.3/include/linux/mm_types.h       2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/mm_types.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/mm_types.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/mm_types.h
+--- linux-3.0.4/include/linux/mm_types.h       2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/mm_types.h       2011-06-10 22:11:24.000000000 +0200
 @@ -268,6 +268,7 @@ struct mm_struct {
  
        /* Architecture-specific MM context */
@@ -10539,9 +10539,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/mm_types.h linux-3.0.3-vs2.3.1-p
  
        /* Swap token stuff */
        /*
-diff -NurpP --minimal linux-3.0.3/include/linux/mmzone.h linux-3.0.3-vs2.3.1-pre10/include/linux/mmzone.h
---- linux-3.0.3/include/linux/mmzone.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/mmzone.h   2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/mmzone.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/mmzone.h
+--- linux-3.0.4/include/linux/mmzone.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/mmzone.h 2011-07-01 11:35:35.000000000 +0200
 @@ -654,6 +654,13 @@ typedef struct pglist_data {
        __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
  })
@@ -10556,9 +10556,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/mmzone.h linux-3.0.3-vs2.3.1-pre
  #include <linux/memory_hotplug.h>
  
  extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.0.3/include/linux/mount.h linux-3.0.3-vs2.3.1-pre10/include/linux/mount.h
---- linux-3.0.3/include/linux/mount.h  2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/mount.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/mount.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/mount.h
+--- linux-3.0.4/include/linux/mount.h  2011-03-15 18:07:39.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/mount.h  2011-06-10 22:11:24.000000000 +0200
 @@ -52,6 +52,9 @@ struct mnt_pcp {
        int mnt_writers;
  };
@@ -10577,9 +10577,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/mount.h linux-3.0.3-vs2.3.1-pre1
  };
  
  struct file; /* forward dec */
-diff -NurpP --minimal linux-3.0.3/include/linux/net.h linux-3.0.3-vs2.3.1-pre10/include/linux/net.h
---- linux-3.0.3/include/linux/net.h    2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/net.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/net.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/net.h
+--- linux-3.0.4/include/linux/net.h    2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/net.h    2011-06-10 22:11:24.000000000 +0200
 @@ -72,6 +72,7 @@ struct net;
  #define SOCK_NOSPACE          2
  #define SOCK_PASSCRED         3
@@ -10588,9 +10588,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/net.h linux-3.0.3-vs2.3.1-pre10/
  
  #ifndef ARCH_HAS_SOCKET_TYPES
  /**
-diff -NurpP --minimal linux-3.0.3/include/linux/nfs_mount.h linux-3.0.3-vs2.3.1-pre10/include/linux/nfs_mount.h
---- linux-3.0.3/include/linux/nfs_mount.h      2011-01-05 21:50:31.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/nfs_mount.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/nfs_mount.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/nfs_mount.h
+--- linux-3.0.4/include/linux/nfs_mount.h      2011-01-05 21:50:31.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/nfs_mount.h      2011-06-10 22:11:24.000000000 +0200
 @@ -63,7 +63,8 @@ struct nfs_mount_data {
  #define NFS_MOUNT_SECFLAVOUR  0x2000  /* 5 */
  #define NFS_MOUNT_NORDIRPLUS  0x4000  /* 5 */
@@ -10601,9 +10601,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/nfs_mount.h linux-3.0.3-vs2.3.1-
  
  /* The following are for internal use only */
  #define NFS_MOUNT_LOOKUP_CACHE_NONEG  0x10000
-diff -NurpP --minimal linux-3.0.3/include/linux/nsproxy.h linux-3.0.3-vs2.3.1-pre10/include/linux/nsproxy.h
---- linux-3.0.3/include/linux/nsproxy.h        2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/nsproxy.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/nsproxy.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/nsproxy.h
+--- linux-3.0.4/include/linux/nsproxy.h        2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/nsproxy.h        2011-06-10 22:11:24.000000000 +0200
 @@ -3,6 +3,7 @@
  
  #include <linux/spinlock.h>
@@ -10652,9 +10652,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/nsproxy.h linux-3.0.3-vs2.3.1-pr
  }
  
  #endif
-diff -NurpP --minimal linux-3.0.3/include/linux/pid.h linux-3.0.3-vs2.3.1-pre10/include/linux/pid.h
---- linux-3.0.3/include/linux/pid.h    2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/pid.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/pid.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/pid.h
+--- linux-3.0.4/include/linux/pid.h    2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/pid.h    2011-06-10 22:11:24.000000000 +0200
 @@ -8,7 +8,8 @@ enum pid_type
        PIDTYPE_PID,
        PIDTYPE_PGID,
@@ -10673,9 +10673,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/pid.h linux-3.0.3-vs2.3.1-pre10/
  pid_t pid_vnr(struct pid *pid);
  
  #define do_each_pid_task(pid, type, task)                             \
-diff -NurpP --minimal linux-3.0.3/include/linux/proc_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/proc_fs.h
---- linux-3.0.3/include/linux/proc_fs.h        2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/proc_fs.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/proc_fs.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/proc_fs.h
+--- linux-3.0.4/include/linux/proc_fs.h        2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/proc_fs.h        2011-06-10 22:11:24.000000000 +0200
 @@ -56,6 +56,7 @@ struct proc_dir_entry {
        nlink_t nlink;
        uid_t uid;
@@ -10711,9 +10711,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/proc_fs.h linux-3.0.3-vs2.3.1-pr
        int fd;
        union proc_op op;
        struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.0.3/include/linux/quotaops.h linux-3.0.3-vs2.3.1-pre10/include/linux/quotaops.h
---- linux-3.0.3/include/linux/quotaops.h       2011-05-22 16:17:57.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/quotaops.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/quotaops.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/quotaops.h
+--- linux-3.0.4/include/linux/quotaops.h       2011-05-22 16:17:57.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/quotaops.h       2011-06-10 22:11:24.000000000 +0200
 @@ -8,6 +8,7 @@
  #define _LINUX_QUOTAOPS_
  
@@ -10755,9 +10755,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/quotaops.h linux-3.0.3-vs2.3.1-p
  }
  
  static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.0.3/include/linux/reboot.h linux-3.0.3-vs2.3.1-pre10/include/linux/reboot.h
---- linux-3.0.3/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/reboot.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/reboot.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/reboot.h
+--- linux-3.0.4/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/reboot.h 2011-06-10 22:11:24.000000000 +0200
 @@ -33,6 +33,7 @@
  #define       LINUX_REBOOT_CMD_RESTART2       0xA1B2C3D4
  #define       LINUX_REBOOT_CMD_SW_SUSPEND     0xD000FCE2
@@ -10766,9 +10766,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/reboot.h linux-3.0.3-vs2.3.1-pre
  
  
  #ifdef __KERNEL__
-diff -NurpP --minimal linux-3.0.3/include/linux/reiserfs_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/reiserfs_fs.h
---- linux-3.0.3/include/linux/reiserfs_fs.h    2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/reiserfs_fs.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/reiserfs_fs.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/reiserfs_fs.h
+--- linux-3.0.4/include/linux/reiserfs_fs.h    2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/reiserfs_fs.h    2011-06-10 22:11:24.000000000 +0200
 @@ -976,6 +976,11 @@ struct stat_data_v1 {
  #define REISERFS_COMPR_FL     FS_COMPR_FL
  #define REISERFS_NOTAIL_FL    FS_NOTAIL_FL
@@ -10799,9 +10799,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/reiserfs_fs.h linux-3.0.3-vs2.3.
  
  int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
  
-diff -NurpP --minimal linux-3.0.3/include/linux/reiserfs_fs_sb.h linux-3.0.3-vs2.3.1-pre10/include/linux/reiserfs_fs_sb.h
---- linux-3.0.3/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/reiserfs_fs_sb.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/reiserfs_fs_sb.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/reiserfs_fs_sb.h
+--- linux-3.0.4/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/reiserfs_fs_sb.h 2011-06-10 22:11:24.000000000 +0200
 @@ -476,6 +476,7 @@ enum reiserfs_mount_options {
        REISERFS_EXPOSE_PRIVROOT,
        REISERFS_BARRIER_NONE,
@@ -10810,9 +10810,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/reiserfs_fs_sb.h linux-3.0.3-vs2
  
        /* Actions on error */
        REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-3.0.3/include/linux/sched.h linux-3.0.3-vs2.3.1-pre10/include/linux/sched.h
---- linux-3.0.3/include/linux/sched.h  2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/sched.h    2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/sched.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/sched.h
+--- linux-3.0.4/include/linux/sched.h  2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/sched.h  2011-07-22 11:20:39.000000000 +0200
 @@ -1406,6 +1406,14 @@ struct task_struct {
  #endif
        seccomp_t seccomp;
@@ -10859,9 +10859,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/sched.h linux-3.0.3-vs2.3.1-pre1
  }
  
  
-diff -NurpP --minimal linux-3.0.3/include/linux/shmem_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/shmem_fs.h
---- linux-3.0.3/include/linux/shmem_fs.h       2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/shmem_fs.h 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/shmem_fs.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/shmem_fs.h
+--- linux-3.0.4/include/linux/shmem_fs.h       2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/shmem_fs.h       2011-07-01 11:35:35.000000000 +0200
 @@ -12,6 +12,9 @@
  
  #define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t))
@@ -10872,9 +10872,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/shmem_fs.h linux-3.0.3-vs2.3.1-p
  struct shmem_inode_info {
        spinlock_t              lock;
        unsigned long           flags;
-diff -NurpP --minimal linux-3.0.3/include/linux/stat.h linux-3.0.3-vs2.3.1-pre10/include/linux/stat.h
---- linux-3.0.3/include/linux/stat.h   2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/stat.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/stat.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/stat.h
+--- linux-3.0.4/include/linux/stat.h   2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/stat.h   2011-06-10 22:11:24.000000000 +0200
 @@ -66,6 +66,7 @@ struct kstat {
        unsigned int    nlink;
        uid_t           uid;
@@ -10883,9 +10883,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/stat.h linux-3.0.3-vs2.3.1-pre10
        dev_t           rdev;
        loff_t          size;
        struct timespec  atime;
-diff -NurpP --minimal linux-3.0.3/include/linux/sunrpc/auth.h linux-3.0.3-vs2.3.1-pre10/include/linux/sunrpc/auth.h
---- linux-3.0.3/include/linux/sunrpc/auth.h    2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/sunrpc/auth.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/sunrpc/auth.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/sunrpc/auth.h
+--- linux-3.0.4/include/linux/sunrpc/auth.h    2011-03-15 18:07:39.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/sunrpc/auth.h    2011-06-10 22:11:24.000000000 +0200
 @@ -25,6 +25,7 @@
  struct auth_cred {
        uid_t   uid;
@@ -10894,9 +10894,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/sunrpc/auth.h linux-3.0.3-vs2.3.
        struct group_info *group_info;
        unsigned char machine_cred : 1;
  };
-diff -NurpP --minimal linux-3.0.3/include/linux/sunrpc/clnt.h linux-3.0.3-vs2.3.1-pre10/include/linux/sunrpc/clnt.h
---- linux-3.0.3/include/linux/sunrpc/clnt.h    2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/sunrpc/clnt.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/sunrpc/clnt.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/sunrpc/clnt.h
+--- linux-3.0.4/include/linux/sunrpc/clnt.h    2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/sunrpc/clnt.h    2011-06-10 22:11:24.000000000 +0200
 @@ -49,7 +49,8 @@ struct rpc_clnt {
        unsigned int            cl_softrtry : 1,/* soft timeouts */
                                cl_discrtry : 1,/* disconnect before retry */
@@ -10907,9 +10907,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/sunrpc/clnt.h linux-3.0.3-vs2.3.
  
        struct rpc_rtt *        cl_rtt;         /* RTO estimator data */
        const struct rpc_timeout *cl_timeout;   /* Timeout strategy */
-diff -NurpP --minimal linux-3.0.3/include/linux/syscalls.h linux-3.0.3-vs2.3.1-pre10/include/linux/syscalls.h
---- linux-3.0.3/include/linux/syscalls.h       2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/syscalls.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/syscalls.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/syscalls.h
+--- linux-3.0.4/include/linux/syscalls.h       2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/syscalls.h       2011-06-10 22:11:24.000000000 +0200
 @@ -483,6 +483,8 @@ asmlinkage long sys_symlink(const char _
  asmlinkage long sys_unlink(const char __user *pathname);
  asmlinkage long sys_rename(const char __user *oldname,
@@ -10919,9 +10919,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/syscalls.h linux-3.0.3-vs2.3.1-p
  asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
  asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
  
-diff -NurpP --minimal linux-3.0.3/include/linux/sysctl.h linux-3.0.3-vs2.3.1-pre10/include/linux/sysctl.h
---- linux-3.0.3/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/sysctl.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/sysctl.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/sysctl.h
+--- linux-3.0.4/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/sysctl.h 2011-06-10 22:11:24.000000000 +0200
 @@ -60,6 +60,7 @@ enum
        CTL_ABI=9,              /* Binary emulation */
        CTL_CPU=10,             /* CPU stuff (speed scaling, etc) */
@@ -10938,9 +10938,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/sysctl.h linux-3.0.3-vs2.3.1-pre
  
        KERN_SPARC_REBOOT=21,   /* reboot command on Sparc */
        KERN_CTLALTDEL=22,      /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.0.3/include/linux/sysfs.h linux-3.0.3-vs2.3.1-pre10/include/linux/sysfs.h
---- linux-3.0.3/include/linux/sysfs.h  2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/sysfs.h    2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/sysfs.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/sysfs.h
+--- linux-3.0.4/include/linux/sysfs.h  2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/sysfs.h  2011-06-22 12:39:15.000000000 +0200
 @@ -19,6 +19,8 @@
  #include <linux/kobject_ns.h>
  #include <asm/atomic.h>
@@ -10950,9 +10950,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/sysfs.h linux-3.0.3-vs2.3.1-pre1
  struct kobject;
  struct module;
  enum kobj_ns_type;
-diff -NurpP --minimal linux-3.0.3/include/linux/time.h linux-3.0.3-vs2.3.1-pre10/include/linux/time.h
---- linux-3.0.3/include/linux/time.h   2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/time.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/time.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/time.h
+--- linux-3.0.4/include/linux/time.h   2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/time.h   2011-06-10 22:11:24.000000000 +0200
 @@ -256,6 +256,9 @@ static __always_inline void timespec_add
        a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
        a->tv_nsec = ns;
@@ -10963,9 +10963,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/time.h linux-3.0.3-vs2.3.1-pre10
  #endif /* __KERNEL__ */
  
  #define NFDBITS                       __NFDBITS
-diff -NurpP --minimal linux-3.0.3/include/linux/types.h linux-3.0.3-vs2.3.1-pre10/include/linux/types.h
---- linux-3.0.3/include/linux/types.h  2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/types.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/types.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/types.h
+--- linux-3.0.4/include/linux/types.h  2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/types.h  2011-06-10 22:11:24.000000000 +0200
 @@ -40,6 +40,9 @@ typedef __kernel_uid32_t     uid_t;
  typedef __kernel_gid32_t      gid_t;
  typedef __kernel_uid16_t        uid16_t;
@@ -10976,9 +10976,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/types.h linux-3.0.3-vs2.3.1-pre1
  
  typedef unsigned long         uintptr_t;
  
-diff -NurpP --minimal linux-3.0.3/include/linux/utsname.h linux-3.0.3-vs2.3.1-pre10/include/linux/utsname.h
---- linux-3.0.3/include/linux/utsname.h        2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/utsname.h  2011-06-13 14:36:48.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/utsname.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/utsname.h
+--- linux-3.0.4/include/linux/utsname.h        2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/utsname.h        2011-06-13 14:36:48.000000000 +0200
 @@ -54,7 +54,8 @@ static inline void get_uts_ns(struct uts
  }
  
@@ -11005,9 +11005,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/utsname.h linux-3.0.3-vs2.3.1-pr
  }
  #endif
  
-diff -NurpP --minimal linux-3.0.3/include/linux/vroot.h linux-3.0.3-vs2.3.1-pre10/include/linux/vroot.h
---- linux-3.0.3/include/linux/vroot.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vroot.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vroot.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vroot.h
+--- linux-3.0.4/include/linux/vroot.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vroot.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,51 @@
 +
 +/*
@@ -11060,9 +11060,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vroot.h linux-3.0.3-vs2.3.1-pre1
 +#define VROOT_CLR_DEV         0x5601
 +
 +#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_base.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_base.h
---- linux-3.0.3/include/linux/vs_base.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_base.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_base.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_base.h
+--- linux-3.0.4/include/linux/vs_base.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_base.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,10 @@
 +#ifndef _VS_BASE_H
 +#define _VS_BASE_H
@@ -11074,9 +11074,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_base.h linux-3.0.3-vs2.3.1-pr
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_context.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_context.h
---- linux-3.0.3/include/linux/vs_context.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_context.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_context.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_context.h
+--- linux-3.0.4/include/linux/vs_context.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_context.h     2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,242 @@
 +#ifndef _VS_CONTEXT_H
 +#define _VS_CONTEXT_H
@@ -11320,9 +11320,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_context.h linux-3.0.3-vs2.3.1
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_cowbl.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_cowbl.h
---- linux-3.0.3/include/linux/vs_cowbl.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_cowbl.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_cowbl.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_cowbl.h
+--- linux-3.0.4/include/linux/vs_cowbl.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_cowbl.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,48 @@
 +#ifndef _VS_COWBL_H
 +#define _VS_COWBL_H
@@ -11372,9 +11372,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_cowbl.h linux-3.0.3-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_cvirt.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_cvirt.h
---- linux-3.0.3/include/linux/vs_cvirt.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_cvirt.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_cvirt.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_cvirt.h
+--- linux-3.0.4/include/linux/vs_cvirt.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_cvirt.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,50 @@
 +#ifndef _VS_CVIRT_H
 +#define _VS_CVIRT_H
@@ -11426,9 +11426,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_cvirt.h linux-3.0.3-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_device.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_device.h
---- linux-3.0.3/include/linux/vs_device.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_device.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_device.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_device.h
+--- linux-3.0.4/include/linux/vs_device.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_device.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,45 @@
 +#ifndef _VS_DEVICE_H
 +#define _VS_DEVICE_H
@@ -11475,9 +11475,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_device.h linux-3.0.3-vs2.3.1-
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_dlimit.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_dlimit.h
---- linux-3.0.3/include/linux/vs_dlimit.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_dlimit.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_dlimit.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_dlimit.h
+--- linux-3.0.4/include/linux/vs_dlimit.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_dlimit.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,215 @@
 +#ifndef _VS_DLIMIT_H
 +#define _VS_DLIMIT_H
@@ -11694,9 +11694,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_dlimit.h linux-3.0.3-vs2.3.1-
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_inet.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_inet.h
---- linux-3.0.3/include/linux/vs_inet.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_inet.h  2011-08-18 17:01:00.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_inet.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_inet.h
+--- linux-3.0.4/include/linux/vs_inet.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_inet.h        2011-08-18 17:01:00.000000000 +0200
 @@ -0,0 +1,353 @@
 +#ifndef _VS_INET_H
 +#define _VS_INET_H
@@ -12051,9 +12051,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_inet.h linux-3.0.3-vs2.3.1-pr
 +#else
 +// #warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_inet6.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_inet6.h
---- linux-3.0.3/include/linux/vs_inet6.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_inet6.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_inet6.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_inet6.h
+--- linux-3.0.4/include/linux/vs_inet6.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_inet6.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,246 @@
 +#ifndef _VS_INET6_H
 +#define _VS_INET6_H
@@ -12301,9 +12301,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_inet6.h linux-3.0.3-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_limit.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_limit.h
---- linux-3.0.3/include/linux/vs_limit.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_limit.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_limit.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_limit.h
+--- linux-3.0.4/include/linux/vs_limit.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_limit.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,140 @@
 +#ifndef _VS_LIMIT_H
 +#define _VS_LIMIT_H
@@ -12445,9 +12445,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_limit.h linux-3.0.3-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_memory.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_memory.h
---- linux-3.0.3/include/linux/vs_memory.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_memory.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_memory.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_memory.h
+--- linux-3.0.4/include/linux/vs_memory.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_memory.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,58 @@
 +#ifndef _VS_MEMORY_H
 +#define _VS_MEMORY_H
@@ -12507,9 +12507,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_memory.h linux-3.0.3-vs2.3.1-
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_network.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_network.h
---- linux-3.0.3/include/linux/vs_network.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_network.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_network.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_network.h
+--- linux-3.0.4/include/linux/vs_network.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_network.h     2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,169 @@
 +#ifndef _NX_VS_NETWORK_H
 +#define _NX_VS_NETWORK_H
@@ -12680,9 +12680,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_network.h linux-3.0.3-vs2.3.1
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_pid.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_pid.h
---- linux-3.0.3/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_pid.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_pid.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_pid.h
+--- linux-3.0.4/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_pid.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,50 @@
 +#ifndef _VS_PID_H
 +#define _VS_PID_H
@@ -12734,9 +12734,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_pid.h linux-3.0.3-vs2.3.1-pre
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_sched.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_sched.h
---- linux-3.0.3/include/linux/vs_sched.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_sched.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_sched.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_sched.h
+--- linux-3.0.4/include/linux/vs_sched.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_sched.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,40 @@
 +#ifndef _VS_SCHED_H
 +#define _VS_SCHED_H
@@ -12778,9 +12778,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_sched.h linux-3.0.3-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_socket.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_socket.h
---- linux-3.0.3/include/linux/vs_socket.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_socket.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_socket.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_socket.h
+--- linux-3.0.4/include/linux/vs_socket.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_socket.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,67 @@
 +#ifndef _VS_SOCKET_H
 +#define _VS_SOCKET_H
@@ -12849,9 +12849,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_socket.h linux-3.0.3-vs2.3.1-
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_tag.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_tag.h
---- linux-3.0.3/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_tag.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_tag.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_tag.h
+--- linux-3.0.4/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_tag.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,47 @@
 +#ifndef _VS_TAG_H
 +#define _VS_TAG_H
@@ -12900,9 +12900,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_tag.h linux-3.0.3-vs2.3.1-pre
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vs_time.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_time.h
---- linux-3.0.3/include/linux/vs_time.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_time.h  2011-06-13 14:57:45.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vs_time.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_time.h
+--- linux-3.0.4/include/linux/vs_time.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vs_time.h        2011-06-13 14:57:45.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _VS_TIME_H
 +#define _VS_TIME_H
@@ -12923,9 +12923,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vs_time.h linux-3.0.3-vs2.3.1-pr
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/Kbuild linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/Kbuild
---- linux-3.0.3/include/linux/vserver/Kbuild   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/Kbuild     2011-08-08 18:02:46.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/Kbuild linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/Kbuild
+--- linux-3.0.4/include/linux/vserver/Kbuild   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/Kbuild   2011-08-08 18:02:46.000000000 +0200
 @@ -0,0 +1,8 @@
 +
 +header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -12935,9 +12935,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/Kbuild linux-3.0.3-vs2.3
 +
 +header-y += switch.h network.h monitor.h inode.h device.h
 +
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/base.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/base.h
---- linux-3.0.3/include/linux/vserver/base.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/base.h     2011-08-01 18:26:07.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/base.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/base.h
+--- linux-3.0.4/include/linux/vserver/base.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/base.h   2011-08-01 18:26:07.000000000 +0200
 @@ -0,0 +1,178 @@
 +#ifndef _VX_BASE_H
 +#define _VX_BASE_H
@@ -13117,9 +13117,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/base.h linux-3.0.3-vs2.3
 +#define nx_info_state(n, m)   (__nx_state(n) & (m))
 +
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct.h
---- linux-3.0.3/include/linux/vserver/cacct.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/cacct.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cacct.h
+--- linux-3.0.4/include/linux/vserver/cacct.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cacct.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,15 @@
 +#ifndef _VX_CACCT_H
 +#define _VX_CACCT_H
@@ -13136,9 +13136,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct.h linux-3.0.3-vs2.
 +};
 +
 +#endif        /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_cmd.h
---- linux-3.0.3/include/linux/vserver/cacct_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/cacct_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cacct_cmd.h
+--- linux-3.0.4/include/linux/vserver/cacct_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cacct_cmd.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,23 @@
 +#ifndef _VX_CACCT_CMD_H
 +#define _VX_CACCT_CMD_H
@@ -13163,9 +13163,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct_cmd.h linux-3.0.3-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_def.h
---- linux-3.0.3/include/linux/vserver/cacct_def.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_def.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/cacct_def.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cacct_def.h
+--- linux-3.0.4/include/linux/vserver/cacct_def.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cacct_def.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,43 @@
 +#ifndef _VX_CACCT_DEF_H
 +#define _VX_CACCT_DEF_H
@@ -13210,9 +13210,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct_def.h linux-3.0.3-
 +#endif
 +
 +#endif        /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct_int.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_int.h
---- linux-3.0.3/include/linux/vserver/cacct_int.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_int.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/cacct_int.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cacct_int.h
+--- linux-3.0.4/include/linux/vserver/cacct_int.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cacct_int.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _VX_CACCT_INT_H
 +#define _VX_CACCT_INT_H
@@ -13235,9 +13235,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct_int.h linux-3.0.3-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/check.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/check.h
---- linux-3.0.3/include/linux/vserver/check.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/check.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/check.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/check.h
+--- linux-3.0.4/include/linux/vserver/check.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/check.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,89 @@
 +#ifndef _VS_CHECK_H
 +#define _VS_CHECK_H
@@ -13328,9 +13328,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/check.h linux-3.0.3-vs2.
 +#define nx_weak_check(c, m)   ((m) ? nx_check(c, m) : 1)
 +
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/context.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/context.h
---- linux-3.0.3/include/linux/vserver/context.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/context.h  2011-08-01 18:23:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/context.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/context.h
+--- linux-3.0.4/include/linux/vserver/context.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/context.h        2011-08-01 18:23:13.000000000 +0200
 @@ -0,0 +1,190 @@
 +#ifndef _VX_CONTEXT_H
 +#define _VX_CONTEXT_H
@@ -13522,9 +13522,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/context.h linux-3.0.3-vs
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/context_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/context_cmd.h
---- linux-3.0.3/include/linux/vserver/context_cmd.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/context_cmd.h      2011-08-01 18:25:07.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/context_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/context_cmd.h
+--- linux-3.0.4/include/linux/vserver/context_cmd.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/context_cmd.h    2011-08-01 18:25:07.000000000 +0200
 @@ -0,0 +1,162 @@
 +#ifndef _VX_CONTEXT_CMD_H
 +#define _VX_CONTEXT_CMD_H
@@ -13688,9 +13688,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/context_cmd.h linux-3.0.
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cvirt.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt.h
---- linux-3.0.3/include/linux/vserver/cvirt.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/cvirt.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cvirt.h
+--- linux-3.0.4/include/linux/vserver/cvirt.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cvirt.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,20 @@
 +#ifndef _VX_CVIRT_H
 +#define _VX_CVIRT_H
@@ -13712,9 +13712,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cvirt.h linux-3.0.3-vs2.
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cvirt_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt_cmd.h
---- linux-3.0.3/include/linux/vserver/cvirt_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/cvirt_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cvirt_cmd.h
+--- linux-3.0.4/include/linux/vserver/cvirt_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cvirt_cmd.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,53 @@
 +#ifndef _VX_CVIRT_CMD_H
 +#define _VX_CVIRT_CMD_H
@@ -13769,9 +13769,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cvirt_cmd.h linux-3.0.3-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cvirt_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt_def.h
---- linux-3.0.3/include/linux/vserver/cvirt_def.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt_def.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/cvirt_def.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cvirt_def.h
+--- linux-3.0.4/include/linux/vserver/cvirt_def.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/cvirt_def.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,80 @@
 +#ifndef _VX_CVIRT_DEF_H
 +#define _VX_CVIRT_DEF_H
@@ -13853,9 +13853,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cvirt_def.h linux-3.0.3-
 +#endif
 +
 +#endif        /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/debug.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/debug.h
---- linux-3.0.3/include/linux/vserver/debug.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/debug.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/debug.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/debug.h
+--- linux-3.0.4/include/linux/vserver/debug.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/debug.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,140 @@
 +#ifndef _VX_DEBUG_H
 +#define _VX_DEBUG_H
@@ -13997,9 +13997,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/debug.h linux-3.0.3-vs2.
 +
 +
 +#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/debug_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/debug_cmd.h
---- linux-3.0.3/include/linux/vserver/debug_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/debug_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/debug_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/debug_cmd.h
+--- linux-3.0.4/include/linux/vserver/debug_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/debug_cmd.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,58 @@
 +#ifndef _VX_DEBUG_CMD_H
 +#define _VX_DEBUG_CMD_H
@@ -14059,9 +14059,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/debug_cmd.h linux-3.0.3-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/device.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device.h
---- linux-3.0.3/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/device.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/device.h
+--- linux-3.0.4/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/device.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,15 @@
 +#ifndef _VX_DEVICE_H
 +#define _VX_DEVICE_H
@@ -14078,9 +14078,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/device.h linux-3.0.3-vs2
 +#else /* _VX_DEVICE_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/device_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device_cmd.h
---- linux-3.0.3/include/linux/vserver/device_cmd.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device_cmd.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/device_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/device_cmd.h
+--- linux-3.0.4/include/linux/vserver/device_cmd.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/device_cmd.h     2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,44 @@
 +#ifndef _VX_DEVICE_CMD_H
 +#define _VX_DEVICE_CMD_H
@@ -14126,9 +14126,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/device_cmd.h linux-3.0.3
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/device_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device_def.h
---- linux-3.0.3/include/linux/vserver/device_def.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device_def.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/device_def.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/device_def.h
+--- linux-3.0.4/include/linux/vserver/device_def.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/device_def.h     2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,17 @@
 +#ifndef _VX_DEVICE_DEF_H
 +#define _VX_DEVICE_DEF_H
@@ -14147,9 +14147,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/device_def.h linux-3.0.3
 +};
 +
 +#endif        /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/dlimit.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/dlimit.h
---- linux-3.0.3/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/dlimit.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/dlimit.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/dlimit.h
+--- linux-3.0.4/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/dlimit.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,54 @@
 +#ifndef _VX_DLIMIT_H
 +#define _VX_DLIMIT_H
@@ -14205,9 +14205,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/dlimit.h linux-3.0.3-vs2
 +#else /* _VX_DLIMIT_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/dlimit_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/dlimit_cmd.h
---- linux-3.0.3/include/linux/vserver/dlimit_cmd.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/dlimit_cmd.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/dlimit_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/dlimit_cmd.h
+--- linux-3.0.4/include/linux/vserver/dlimit_cmd.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/dlimit_cmd.h     2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,109 @@
 +#ifndef _VX_DLIMIT_CMD_H
 +#define _VX_DLIMIT_CMD_H
@@ -14318,9 +14318,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/dlimit_cmd.h linux-3.0.3
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/global.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/global.h
---- linux-3.0.3/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/global.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/global.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/global.h
+--- linux-3.0.4/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/global.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _VX_GLOBAL_H
 +#define _VX_GLOBAL_H
@@ -14341,9 +14341,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/global.h linux-3.0.3-vs2
 +
 +
 +#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/history.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/history.h
---- linux-3.0.3/include/linux/vserver/history.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/history.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/history.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/history.h
+--- linux-3.0.4/include/linux/vserver/history.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/history.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,197 @@
 +#ifndef _VX_HISTORY_H
 +#define _VX_HISTORY_H
@@ -14542,9 +14542,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/history.h linux-3.0.3-vs
 +#endif /* CONFIG_VSERVER_HISTORY */
 +
 +#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/inode.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/inode.h
---- linux-3.0.3/include/linux/vserver/inode.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/inode.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/inode.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/inode.h
+--- linux-3.0.4/include/linux/vserver/inode.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/inode.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,39 @@
 +#ifndef _VX_INODE_H
 +#define _VX_INODE_H
@@ -14585,9 +14585,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/inode.h linux-3.0.3-vs2.
 +#else /* _VX_INODE_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_INODE_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/inode_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/inode_cmd.h
---- linux-3.0.3/include/linux/vserver/inode_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/inode_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/inode_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/inode_cmd.h
+--- linux-3.0.4/include/linux/vserver/inode_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/inode_cmd.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,59 @@
 +#ifndef _VX_INODE_CMD_H
 +#define _VX_INODE_CMD_H
@@ -14648,9 +14648,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/inode_cmd.h linux-3.0.3-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit.h
---- linux-3.0.3/include/linux/vserver/limit.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/limit.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/limit.h
+--- linux-3.0.4/include/linux/vserver/limit.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/limit.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,71 @@
 +#ifndef _VX_LIMIT_H
 +#define _VX_LIMIT_H
@@ -14723,9 +14723,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit.h linux-3.0.3-vs2.
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_cmd.h
---- linux-3.0.3/include/linux/vserver/limit_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/limit_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/limit_cmd.h
+--- linux-3.0.4/include/linux/vserver/limit_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/limit_cmd.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,71 @@
 +#ifndef _VX_LIMIT_CMD_H
 +#define _VX_LIMIT_CMD_H
@@ -14798,9 +14798,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit_cmd.h linux-3.0.3-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_def.h
---- linux-3.0.3/include/linux/vserver/limit_def.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_def.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/limit_def.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/limit_def.h
+--- linux-3.0.4/include/linux/vserver/limit_def.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/limit_def.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,47 @@
 +#ifndef _VX_LIMIT_DEF_H
 +#define _VX_LIMIT_DEF_H
@@ -14849,9 +14849,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit_def.h linux-3.0.3-
 +#endif
 +
 +#endif        /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit_int.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_int.h
---- linux-3.0.3/include/linux/vserver/limit_int.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_int.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/limit_int.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/limit_int.h
+--- linux-3.0.4/include/linux/vserver/limit_int.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/limit_int.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,198 @@
 +#ifndef _VX_LIMIT_INT_H
 +#define _VX_LIMIT_INT_H
@@ -15051,9 +15051,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit_int.h linux-3.0.3-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/monitor.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/monitor.h
---- linux-3.0.3/include/linux/vserver/monitor.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/monitor.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/monitor.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/monitor.h
+--- linux-3.0.4/include/linux/vserver/monitor.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/monitor.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,96 @@
 +#ifndef _VX_MONITOR_H
 +#define _VX_MONITOR_H
@@ -15151,9 +15151,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/monitor.h linux-3.0.3-vs
 +
 +
 +#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/network.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/network.h
---- linux-3.0.3/include/linux/vserver/network.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/network.h  2011-08-18 16:30:48.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/network.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/network.h
+--- linux-3.0.4/include/linux/vserver/network.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/network.h        2011-08-18 16:30:48.000000000 +0200
 @@ -0,0 +1,148 @@
 +#ifndef _VX_NETWORK_H
 +#define _VX_NETWORK_H
@@ -15303,9 +15303,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/network.h linux-3.0.3-vs
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/network_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/network_cmd.h
---- linux-3.0.3/include/linux/vserver/network_cmd.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/network_cmd.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/network_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/network_cmd.h
+--- linux-3.0.4/include/linux/vserver/network_cmd.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/network_cmd.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,164 @@
 +#ifndef _VX_NETWORK_CMD_H
 +#define _VX_NETWORK_CMD_H
@@ -15471,9 +15471,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/network_cmd.h linux-3.0.
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/percpu.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/percpu.h
---- linux-3.0.3/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/percpu.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/percpu.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/percpu.h
+--- linux-3.0.4/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/percpu.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef _VX_PERCPU_H
 +#define _VX_PERCPU_H
@@ -15489,9 +15489,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/percpu.h linux-3.0.3-vs2
 +#define       PERCPU_PERCTX   (sizeof(struct _vx_percpu))
 +
 +#endif        /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/pid.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/pid.h
---- linux-3.0.3/include/linux/vserver/pid.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/pid.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/pid.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/pid.h
+--- linux-3.0.4/include/linux/vserver/pid.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/pid.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,51 @@
 +#ifndef _VSERVER_PID_H
 +#define _VSERVER_PID_H
@@ -15544,9 +15544,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/pid.h linux-3.0.3-vs2.3.
 +}
 +
 +#endif
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/sched.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched.h
---- linux-3.0.3/include/linux/vserver/sched.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/sched.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/sched.h
+--- linux-3.0.4/include/linux/vserver/sched.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/sched.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,23 @@
 +#ifndef _VX_SCHED_H
 +#define _VX_SCHED_H
@@ -15571,9 +15571,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/sched.h linux-3.0.3-vs2.
 +#else /* _VX_SCHED_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/sched_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched_cmd.h
---- linux-3.0.3/include/linux/vserver/sched_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/sched_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/sched_cmd.h
+--- linux-3.0.4/include/linux/vserver/sched_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/sched_cmd.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _VX_SCHED_CMD_H
 +#define _VX_SCHED_CMD_H
@@ -15596,9 +15596,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/sched_cmd.h linux-3.0.3-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/sched_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched_def.h
---- linux-3.0.3/include/linux/vserver/sched_def.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched_def.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/sched_def.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/sched_def.h
+--- linux-3.0.4/include/linux/vserver/sched_def.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/sched_def.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,38 @@
 +#ifndef _VX_SCHED_DEF_H
 +#define _VX_SCHED_DEF_H
@@ -15638,9 +15638,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/sched_def.h linux-3.0.3-
 +#endif
 +
 +#endif        /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/signal.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/signal.h
---- linux-3.0.3/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/signal.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/signal.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/signal.h
+--- linux-3.0.4/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/signal.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef _VX_SIGNAL_H
 +#define _VX_SIGNAL_H
@@ -15656,9 +15656,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/signal.h linux-3.0.3-vs2
 +#else /* _VX_SIGNAL_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/signal_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/signal_cmd.h
---- linux-3.0.3/include/linux/vserver/signal_cmd.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/signal_cmd.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/signal_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/signal_cmd.h
+--- linux-3.0.4/include/linux/vserver/signal_cmd.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/signal_cmd.h     2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,43 @@
 +#ifndef _VX_SIGNAL_CMD_H
 +#define _VX_SIGNAL_CMD_H
@@ -15703,9 +15703,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/signal_cmd.h linux-3.0.3
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/space.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/space.h
---- linux-3.0.3/include/linux/vserver/space.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/space.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/space.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/space.h
+--- linux-3.0.4/include/linux/vserver/space.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/space.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,12 @@
 +#ifndef _VX_SPACE_H
 +#define _VX_SPACE_H
@@ -15719,9 +15719,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/space.h linux-3.0.3-vs2.
 +#else /* _VX_SPACE_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/space_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/space_cmd.h
---- linux-3.0.3/include/linux/vserver/space_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/space_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/space_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/space_cmd.h
+--- linux-3.0.4/include/linux/vserver/space_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/space_cmd.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,38 @@
 +#ifndef _VX_SPACE_CMD_H
 +#define _VX_SPACE_CMD_H
@@ -15761,9 +15761,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/space_cmd.h linux-3.0.3-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/switch.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/switch.h
---- linux-3.0.3/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/switch.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/switch.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/switch.h
+--- linux-3.0.4/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/switch.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,98 @@
 +#ifndef _VX_SWITCH_H
 +#define _VX_SWITCH_H
@@ -15863,9 +15863,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/switch.h linux-3.0.3-vs2
 +
 +#endif        /* _VX_SWITCH_H */
 +
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/tag.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/tag.h
---- linux-3.0.3/include/linux/vserver/tag.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/tag.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/tag.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/tag.h
+--- linux-3.0.4/include/linux/vserver/tag.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/tag.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,143 @@
 +#ifndef _DX_TAG_H
 +#define _DX_TAG_H
@@ -16010,9 +16010,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/tag.h linux-3.0.3-vs2.3.
 +#endif
 +
 +#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.0.3/include/linux/vserver/tag_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/tag_cmd.h
---- linux-3.0.3/include/linux/vserver/tag_cmd.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/tag_cmd.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/linux/vserver/tag_cmd.h linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/tag_cmd.h
+--- linux-3.0.4/include/linux/vserver/tag_cmd.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/linux/vserver/tag_cmd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,22 @@
 +#ifndef _VX_TAG_CMD_H
 +#define _VX_TAG_CMD_H
@@ -16036,9 +16036,9 @@ diff -NurpP --minimal linux-3.0.3/include/linux/vserver/tag_cmd.h linux-3.0.3-vs
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.0.3/include/net/addrconf.h linux-3.0.3-vs2.3.1-pre10/include/net/addrconf.h
---- linux-3.0.3/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/net/addrconf.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/net/addrconf.h linux-3.0.4-vs2.3.1-pre10.1/include/net/addrconf.h
+--- linux-3.0.4/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/net/addrconf.h 2011-06-10 22:11:24.000000000 +0200
 @@ -80,7 +80,8 @@ extern int                   ipv6_dev_get_saddr(struct n
                                               struct net_device *dev,
                                               const struct in6_addr *daddr,
@@ -16049,9 +16049,9 @@ diff -NurpP --minimal linux-3.0.3/include/net/addrconf.h linux-3.0.3-vs2.3.1-pre
  extern int                    ipv6_get_lladdr(struct net_device *dev,
                                                struct in6_addr *addr,
                                                unsigned char banned_flags);
-diff -NurpP --minimal linux-3.0.3/include/net/af_unix.h linux-3.0.3-vs2.3.1-pre10/include/net/af_unix.h
---- linux-3.0.3/include/net/af_unix.h  2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/net/af_unix.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/net/af_unix.h linux-3.0.4-vs2.3.1-pre10.1/include/net/af_unix.h
+--- linux-3.0.4/include/net/af_unix.h  2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/net/af_unix.h  2011-06-10 22:11:24.000000000 +0200
 @@ -4,6 +4,7 @@
  #include <linux/socket.h>
  #include <linux/un.h>
@@ -16060,9 +16060,9 @@ diff -NurpP --minimal linux-3.0.3/include/net/af_unix.h linux-3.0.3-vs2.3.1-pre1
  #include <net/sock.h>
  
  extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.0.3/include/net/inet_timewait_sock.h linux-3.0.3-vs2.3.1-pre10/include/net/inet_timewait_sock.h
---- linux-3.0.3/include/net/inet_timewait_sock.h       2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/include/net/inet_timewait_sock.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/net/inet_timewait_sock.h linux-3.0.4-vs2.3.1-pre10.1/include/net/inet_timewait_sock.h
+--- linux-3.0.4/include/net/inet_timewait_sock.h       2011-03-15 18:07:40.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/include/net/inet_timewait_sock.h       2011-06-10 22:11:24.000000000 +0200
 @@ -113,6 +113,10 @@ struct inet_timewait_sock {
  #define tw_net                        __tw_common.skc_net
  #define tw_daddr              __tw_common.skc_daddr
@@ -16074,9 +16074,9 @@ diff -NurpP --minimal linux-3.0.3/include/net/inet_timewait_sock.h linux-3.0.3-v
        int                     tw_timeout;
        volatile unsigned char  tw_substate;
        unsigned char           tw_rcv_wscale;
-diff -NurpP --minimal linux-3.0.3/include/net/ip6_route.h linux-3.0.3-vs2.3.1-pre10/include/net/ip6_route.h
---- linux-3.0.3/include/net/ip6_route.h        2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/net/ip6_route.h  2011-06-16 14:16:51.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/net/ip6_route.h linux-3.0.4-vs2.3.1-pre10.1/include/net/ip6_route.h
+--- linux-3.0.4/include/net/ip6_route.h        2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/net/ip6_route.h        2011-06-16 14:16:51.000000000 +0200
 @@ -86,7 +86,8 @@ extern int                   ip6_route_get_saddr(struct 
                                                    struct rt6_info *rt,
                                                    const struct in6_addr *daddr,
@@ -16087,9 +16087,9 @@ diff -NurpP --minimal linux-3.0.3/include/net/ip6_route.h linux-3.0.3-vs2.3.1-pr
  
  extern struct rt6_info                *rt6_lookup(struct net *net,
                                            const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.0.3/include/net/route.h linux-3.0.3-vs2.3.1-pre10/include/net/route.h
---- linux-3.0.3/include/net/route.h    2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/net/route.h      2011-07-27 19:42:59.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/net/route.h linux-3.0.4-vs2.3.1-pre10.1/include/net/route.h
+--- linux-3.0.4/include/net/route.h    2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/net/route.h    2011-07-27 19:42:59.000000000 +0200
 @@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
                dst_release(&rt->dst);
  }
@@ -16137,9 +16137,9 @@ diff -NurpP --minimal linux-3.0.3/include/net/route.h linux-3.0.3-vs2.3.1-pre10/
                rt = __ip_route_output_key(net, fl4);
                if (IS_ERR(rt))
                        return rt;
-diff -NurpP --minimal linux-3.0.3/include/net/sock.h linux-3.0.3-vs2.3.1-pre10/include/net/sock.h
---- linux-3.0.3/include/net/sock.h     2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/include/net/sock.h       2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/include/net/sock.h linux-3.0.4-vs2.3.1-pre10.1/include/net/sock.h
+--- linux-3.0.4/include/net/sock.h     2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/include/net/sock.h     2011-07-01 11:35:35.000000000 +0200
 @@ -149,6 +149,10 @@ struct sock_common {
  #ifdef CONFIG_NET_NS
        struct net              *skc_net;
@@ -16162,9 +16162,9 @@ diff -NurpP --minimal linux-3.0.3/include/net/sock.h linux-3.0.3-vs2.3.1-pre10/i
        socket_lock_t           sk_lock;
        struct sk_buff_head     sk_receive_queue;
        /*
-diff -NurpP --minimal linux-3.0.3/init/Kconfig linux-3.0.3-vs2.3.1-pre10/init/Kconfig
---- linux-3.0.3/init/Kconfig   2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/init/Kconfig     2011-08-08 18:08:57.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/init/Kconfig linux-3.0.4-vs2.3.1-pre10.1/init/Kconfig
+--- linux-3.0.4/init/Kconfig   2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/init/Kconfig   2011-08-08 18:08:57.000000000 +0200
 @@ -574,6 +574,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
  menuconfig CGROUPS
        boolean "Control Group support"
@@ -16181,9 +16181,9 @@ diff -NurpP --minimal linux-3.0.3/init/Kconfig linux-3.0.3-vs2.3.1-pre10/init/Kc
        default y
        help
          This allows containers, i.e. vservers, to use user namespaces
-diff -NurpP --minimal linux-3.0.3/init/main.c linux-3.0.3-vs2.3.1-pre10/init/main.c
---- linux-3.0.3/init/main.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/init/main.c      2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/init/main.c linux-3.0.4-vs2.3.1-pre10.1/init/main.c
+--- linux-3.0.4/init/main.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/init/main.c    2011-06-22 12:39:15.000000000 +0200
 @@ -68,6 +68,7 @@
  #include <linux/shmem_fs.h>
  #include <linux/slab.h>
@@ -16192,9 +16192,9 @@ diff -NurpP --minimal linux-3.0.3/init/main.c linux-3.0.3-vs2.3.1-pre10/init/mai
  
  #include <asm/io.h>
  #include <asm/bugs.h>
-diff -NurpP --minimal linux-3.0.3/ipc/mqueue.c linux-3.0.3-vs2.3.1-pre10/ipc/mqueue.c
---- linux-3.0.3/ipc/mqueue.c   2011-03-15 18:07:41.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/ipc/mqueue.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/ipc/mqueue.c linux-3.0.4-vs2.3.1-pre10.1/ipc/mqueue.c
+--- linux-3.0.4/ipc/mqueue.c   2011-03-15 18:07:41.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/ipc/mqueue.c   2011-06-10 22:11:24.000000000 +0200
 @@ -33,6 +33,8 @@
  #include <linux/pid.h>
  #include <linux/ipc_namespace.h>
@@ -16269,9 +16269,9 @@ diff -NurpP --minimal linux-3.0.3/ipc/mqueue.c linux-3.0.3-vs2.3.1-pre10/ipc/mqu
                free_uid(user);
        }
        if (ipc_ns)
-diff -NurpP --minimal linux-3.0.3/ipc/msg.c linux-3.0.3-vs2.3.1-pre10/ipc/msg.c
---- linux-3.0.3/ipc/msg.c      2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/ipc/msg.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/ipc/msg.c linux-3.0.4-vs2.3.1-pre10.1/ipc/msg.c
+--- linux-3.0.4/ipc/msg.c      2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/ipc/msg.c      2011-06-10 22:11:24.000000000 +0200
 @@ -37,6 +37,7 @@
  #include <linux/rwsem.h>
  #include <linux/nsproxy.h>
@@ -16288,9 +16288,9 @@ diff -NurpP --minimal linux-3.0.3/ipc/msg.c linux-3.0.3-vs2.3.1-pre10/ipc/msg.c
  
        msq->q_perm.security = NULL;
        retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.0.3/ipc/namespace.c linux-3.0.3-vs2.3.1-pre10/ipc/namespace.c
---- linux-3.0.3/ipc/namespace.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/ipc/namespace.c  2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/ipc/namespace.c linux-3.0.4-vs2.3.1-pre10.1/ipc/namespace.c
+--- linux-3.0.4/ipc/namespace.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/ipc/namespace.c        2011-06-13 14:09:44.000000000 +0200
 @@ -13,11 +13,12 @@
  #include <linux/mount.h>
  #include <linux/user_namespace.h>
@@ -16331,9 +16331,9 @@ diff -NurpP --minimal linux-3.0.3/ipc/namespace.c linux-3.0.3-vs2.3.1-pre10/ipc/
  }
  
  /*
-diff -NurpP --minimal linux-3.0.3/ipc/sem.c linux-3.0.3-vs2.3.1-pre10/ipc/sem.c
---- linux-3.0.3/ipc/sem.c      2011-08-29 03:10:25.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/ipc/sem.c        2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/ipc/sem.c linux-3.0.4-vs2.3.1-pre10.1/ipc/sem.c
+--- linux-3.0.4/ipc/sem.c      2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/ipc/sem.c      2011-08-08 23:04:47.000000000 +0200
 @@ -86,6 +86,8 @@
  #include <linux/rwsem.h>
  #include <linux/nsproxy.h>
@@ -16371,9 +16371,9 @@ diff -NurpP --minimal linux-3.0.3/ipc/sem.c linux-3.0.3-vs2.3.1-pre10/ipc/sem.c
        security_sem_free(sma);
        ipc_rcu_putref(sma);
  }
-diff -NurpP --minimal linux-3.0.3/ipc/shm.c linux-3.0.3-vs2.3.1-pre10/ipc/shm.c
---- linux-3.0.3/ipc/shm.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/ipc/shm.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/ipc/shm.c linux-3.0.4-vs2.3.1-pre10.1/ipc/shm.c
+--- linux-3.0.4/ipc/shm.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/ipc/shm.c      2011-06-10 22:11:24.000000000 +0200
 @@ -39,6 +39,8 @@
  #include <linux/nsproxy.h>
  #include <linux/mount.h>
@@ -16429,9 +16429,9 @@ diff -NurpP --minimal linux-3.0.3/ipc/shm.c linux-3.0.3-vs2.3.1-pre10/ipc/shm.c
        return error;
  
  no_id:
-diff -NurpP --minimal linux-3.0.3/kernel/Makefile linux-3.0.3-vs2.3.1-pre10/kernel/Makefile
---- linux-3.0.3/kernel/Makefile        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/Makefile  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/Makefile linux-3.0.4-vs2.3.1-pre10.1/kernel/Makefile
+--- linux-3.0.4/kernel/Makefile        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/Makefile        2011-06-10 22:11:24.000000000 +0200
 @@ -24,6 +24,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg
  CFLAGS_REMOVE_irq_work.o = -pg
  endif
@@ -16440,9 +16440,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/Makefile linux-3.0.3-vs2.3.1-pre10/kern
  obj-$(CONFIG_FREEZER) += freezer.o
  obj-$(CONFIG_PROFILING) += profile.o
  obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
-diff -NurpP --minimal linux-3.0.3/kernel/capability.c linux-3.0.3-vs2.3.1-pre10/kernel/capability.c
---- linux-3.0.3/kernel/capability.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/capability.c      2011-07-19 19:27:53.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/capability.c linux-3.0.4-vs2.3.1-pre10.1/kernel/capability.c
+--- linux-3.0.4/kernel/capability.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/capability.c    2011-07-19 19:27:53.000000000 +0200
 @@ -15,6 +15,7 @@
  #include <linux/syscalls.h>
  #include <linux/pid_namespace.h>
@@ -16478,9 +16478,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/capability.c linux-3.0.3-vs2.3.1-pre10/
        if (security_capable(ns, current_cred(), cap) == 0) {
                current->flags |= PF_SUPERPRIV;
                return true;
-diff -NurpP --minimal linux-3.0.3/kernel/compat.c linux-3.0.3-vs2.3.1-pre10/kernel/compat.c
---- linux-3.0.3/kernel/compat.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/compat.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/compat.c linux-3.0.4-vs2.3.1-pre10.1/kernel/compat.c
+--- linux-3.0.4/kernel/compat.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/compat.c        2011-06-10 22:11:24.000000000 +0200
 @@ -970,7 +970,7 @@ asmlinkage long compat_sys_stime(compat_
        if (err)
                return err;
@@ -16490,9 +16490,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/compat.c linux-3.0.3-vs2.3.1-pre10/kern
        return 0;
  }
  
-diff -NurpP --minimal linux-3.0.3/kernel/cred.c linux-3.0.3-vs2.3.1-pre10/kernel/cred.c
---- linux-3.0.3/kernel/cred.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/cred.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/cred.c linux-3.0.4-vs2.3.1-pre10.1/kernel/cred.c
+--- linux-3.0.4/kernel/cred.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/cred.c  2011-06-10 22:11:24.000000000 +0200
 @@ -61,31 +61,6 @@ struct cred init_cred = {
  #endif
  };
@@ -16562,9 +16562,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/cred.c linux-3.0.3-vs2.3.1-pre10/kernel
  EXPORT_SYMBOL(prepare_creds);
  
  /*
-diff -NurpP --minimal linux-3.0.3/kernel/exit.c linux-3.0.3-vs2.3.1-pre10/kernel/exit.c
---- linux-3.0.3/kernel/exit.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/exit.c    2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/exit.c linux-3.0.4-vs2.3.1-pre10.1/kernel/exit.c
+--- linux-3.0.4/kernel/exit.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/exit.c  2011-06-22 12:39:15.000000000 +0200
 @@ -48,6 +48,10 @@
  #include <linux/fs_struct.h>
  #include <linux/init_task.h>
@@ -16605,9 +16605,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/exit.c linux-3.0.3-vs2.3.1-pre10/kernel
        BUG();
        /* Avoid "noreturn function does return".  */
        for (;;)
-diff -NurpP --minimal linux-3.0.3/kernel/fork.c linux-3.0.3-vs2.3.1-pre10/kernel/fork.c
---- linux-3.0.3/kernel/fork.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/fork.c    2011-06-10 22:21:02.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/fork.c linux-3.0.4-vs2.3.1-pre10.1/kernel/fork.c
+--- linux-3.0.4/kernel/fork.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/fork.c  2011-06-10 22:21:02.000000000 +0200
 @@ -67,6 +67,10 @@
  #include <linux/user-return-notifier.h>
  #include <linux/oom.h>
@@ -16701,9 +16701,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/fork.c linux-3.0.3-vs2.3.1-pre10/kernel
        write_unlock_irq(&tasklist_lock);
        proc_fork_connector(p);
        cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.0.3/kernel/kthread.c linux-3.0.3-vs2.3.1-pre10/kernel/kthread.c
---- linux-3.0.3/kernel/kthread.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/kthread.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/kthread.c linux-3.0.4-vs2.3.1-pre10.1/kernel/kthread.c
+--- linux-3.0.4/kernel/kthread.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/kthread.c       2011-06-10 22:11:24.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/mutex.h>
  #include <linux/slab.h>
@@ -16712,9 +16712,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/kthread.c linux-3.0.3-vs2.3.1-pre10/ker
  #include <trace/events/sched.h>
  
  static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.0.3/kernel/nsproxy.c linux-3.0.3-vs2.3.1-pre10/kernel/nsproxy.c
---- linux-3.0.3/kernel/nsproxy.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/nsproxy.c 2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/nsproxy.c linux-3.0.4-vs2.3.1-pre10.1/kernel/nsproxy.c
+--- linux-3.0.4/kernel/nsproxy.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/nsproxy.c       2011-06-13 14:09:44.000000000 +0200
 @@ -20,6 +20,8 @@
  #include <linux/mnt_namespace.h>
  #include <linux/utsname.h>
@@ -16890,9 +16890,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/nsproxy.c linux-3.0.3-vs2.3.1-pre10/ker
                return -EPERM;
  
        *new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.0.3/kernel/pid.c linux-3.0.3-vs2.3.1-pre10/kernel/pid.c
---- linux-3.0.3/kernel/pid.c   2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/pid.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/pid.c linux-3.0.4-vs2.3.1-pre10.1/kernel/pid.c
+--- linux-3.0.4/kernel/pid.c   2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/pid.c   2011-06-10 22:11:24.000000000 +0200
 @@ -36,6 +36,7 @@
  #include <linux/pid_namespace.h>
  #include <linux/init_task.h>
@@ -16950,9 +16950,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/pid.c linux-3.0.3-vs2.3.1-pre10/kernel/
  pid_t pid_vnr(struct pid *pid)
  {
        return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.0.3/kernel/pid_namespace.c linux-3.0.3-vs2.3.1-pre10/kernel/pid_namespace.c
---- linux-3.0.3/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/pid_namespace.c   2011-06-10 22:17:45.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/pid_namespace.c linux-3.0.4-vs2.3.1-pre10.1/kernel/pid_namespace.c
+--- linux-3.0.4/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/pid_namespace.c 2011-06-10 22:17:45.000000000 +0200
 @@ -15,6 +15,7 @@
  #include <linux/acct.h>
  #include <linux/slab.h>
@@ -16977,9 +16977,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/pid_namespace.c linux-3.0.3-vs2.3.1-pre
        kmem_cache_free(pid_ns_cachep, ns);
  }
  
-diff -NurpP --minimal linux-3.0.3/kernel/posix-timers.c linux-3.0.3-vs2.3.1-pre10/kernel/posix-timers.c
---- linux-3.0.3/kernel/posix-timers.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/posix-timers.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/posix-timers.c linux-3.0.4-vs2.3.1-pre10.1/kernel/posix-timers.c
+--- linux-3.0.4/kernel/posix-timers.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/posix-timers.c  2011-06-10 22:11:24.000000000 +0200
 @@ -47,6 +47,7 @@
  #include <linux/wait.h>
  #include <linux/workqueue.h>
@@ -17015,9 +17015,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/posix-timers.c linux-3.0.3-vs2.3.1-pre1
        /* If we failed to send the signal the timer stops. */
        return ret > 0;
  }
-diff -NurpP --minimal linux-3.0.3/kernel/printk.c linux-3.0.3-vs2.3.1-pre10/kernel/printk.c
---- linux-3.0.3/kernel/printk.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/printk.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/printk.c linux-3.0.4-vs2.3.1-pre10.1/kernel/printk.c
+--- linux-3.0.4/kernel/printk.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/printk.c        2011-06-10 22:11:24.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/cpu.h>
  #include <linux/notifier.h>
@@ -17085,9 +17085,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/printk.c linux-3.0.3-vs2.3.1-pre10/kern
                count = len;
                if (count > log_buf_len)
                        count = log_buf_len;
-diff -NurpP --minimal linux-3.0.3/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/kernel/ptrace.c
---- linux-3.0.3/kernel/ptrace.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/ptrace.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/ptrace.c linux-3.0.4-vs2.3.1-pre10.1/kernel/ptrace.c
+--- linux-3.0.4/kernel/ptrace.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/ptrace.c        2011-06-10 22:11:24.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/syscalls.h>
  #include <linux/uaccess.h>
@@ -17108,9 +17108,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/kern
  
        return security_ptrace_access_check(task, mode);
  }
-diff -NurpP --minimal linux-3.0.3/kernel/sched.c linux-3.0.3-vs2.3.1-pre10/kernel/sched.c
---- linux-3.0.3/kernel/sched.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/sched.c   2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/sched.c linux-3.0.4-vs2.3.1-pre10.1/kernel/sched.c
+--- linux-3.0.4/kernel/sched.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/sched.c 2011-07-22 11:20:39.000000000 +0200
 @@ -71,6 +71,8 @@
  #include <linux/ctype.h>
  #include <linux/ftrace.h>
@@ -17184,9 +17184,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/sched.c linux-3.0.3-vs2.3.1-pre10/kerne
  
        retval = security_task_setnice(current, nice);
        if (retval)
-diff -NurpP --minimal linux-3.0.3/kernel/sched_fair.c linux-3.0.3-vs2.3.1-pre10/kernel/sched_fair.c
---- linux-3.0.3/kernel/sched_fair.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/sched_fair.c      2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/sched_fair.c linux-3.0.4-vs2.3.1-pre10.1/kernel/sched_fair.c
+--- linux-3.0.4/kernel/sched_fair.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/sched_fair.c    2011-07-22 11:20:39.000000000 +0200
 @@ -998,6 +998,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
                __enqueue_entity(cfs_rq, se);
        se->on_rq = 1;
@@ -17205,9 +17205,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/sched_fair.c linux-3.0.3-vs2.3.1-pre10/
        update_cfs_load(cfs_rq, 0);
        account_entity_dequeue(cfs_rq, se);
  
-diff -NurpP --minimal linux-3.0.3/kernel/signal.c linux-3.0.3-vs2.3.1-pre10/kernel/signal.c
---- linux-3.0.3/kernel/signal.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/signal.c  2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/signal.c linux-3.0.4-vs2.3.1-pre10.1/kernel/signal.c
+--- linux-3.0.4/kernel/signal.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/signal.c        2011-07-22 11:20:39.000000000 +0200
 @@ -28,6 +28,8 @@
  #include <linux/freezer.h>
  #include <linux/pid_namespace.h>
@@ -17300,9 +17300,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/signal.c linux-3.0.3-vs2.3.1-pre10/kern
                if (sig_kernel_stop(signr)) {
                        /*
                         * The default action is to stop all threads in
-diff -NurpP --minimal linux-3.0.3/kernel/softirq.c linux-3.0.3-vs2.3.1-pre10/kernel/softirq.c
---- linux-3.0.3/kernel/softirq.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/softirq.c 2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/softirq.c linux-3.0.4-vs2.3.1-pre10.1/kernel/softirq.c
+--- linux-3.0.4/kernel/softirq.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/softirq.c       2011-07-22 11:20:39.000000000 +0200
 @@ -24,6 +24,7 @@
  #include <linux/ftrace.h>
  #include <linux/smp.h>
@@ -17311,18 +17311,18 @@ diff -NurpP --minimal linux-3.0.3/kernel/softirq.c linux-3.0.3-vs2.3.1-pre10/ker
  
  #define CREATE_TRACE_POINTS
  #include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/sys.c
---- linux-3.0.3/kernel/sys.c   2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/sys.c     2011-07-23 15:55:50.000000000 +0200
-@@ -43,6 +43,7 @@
+diff -NurpP --minimal linux-3.0.4/kernel/sys.c linux-3.0.4-vs2.3.1-pre10.1/kernel/sys.c
+--- linux-3.0.4/kernel/sys.c   2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/sys.c   2011-08-31 19:37:44.000000000 +0200
+@@ -45,6 +45,7 @@
  #include <linux/syscalls.h>
  #include <linux/kprobes.h>
  #include <linux/user_namespace.h>
 +#include <linux/vs_pid.h>
  
  #include <linux/kmsg_dump.h>
- 
-@@ -151,7 +152,10 @@ static int set_one_prio(struct task_stru
+ /* Move somewhere else to avoid recompiling? */
+@@ -155,7 +156,10 @@ static int set_one_prio(struct task_stru
                goto out;
        }
        if (niceval < task_nice(p) && !can_nice(p, niceval)) {
@@ -17334,7 +17334,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/
                goto out;
        }
        no_nice = security_task_setnice(p, niceval);
-@@ -201,6 +205,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
+@@ -205,6 +209,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
                        else
                                pgrp = task_pgrp(current);
                        do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -17343,7 +17343,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/
                                error = set_one_prio(p, niceval, error);
                        } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
                        break;
-@@ -264,6 +270,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+@@ -268,6 +274,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
                        else
                                pgrp = task_pgrp(current);
                        do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -17352,7 +17352,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/
                                niceval = 20 - task_nice(p);
                                if (niceval > retval)
                                        retval = niceval;
-@@ -383,6 +391,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
+@@ -387,6 +395,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
  
  static DEFINE_MUTEX(reboot_mutex);
  
@@ -17361,7 +17361,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/
  /*
   * Reboot system call: for obvious reasons only root may call it,
   * and even root needs to set up some magic numbers in the registers
-@@ -415,6 +425,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+@@ -419,6 +429,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
        if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
                cmd = LINUX_REBOOT_CMD_HALT;
  
@@ -17371,7 +17371,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/
        mutex_lock(&reboot_mutex);
        switch (cmd) {
        case LINUX_REBOOT_CMD_RESTART:
-@@ -1197,7 +1210,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+@@ -1235,7 +1248,8 @@ SYSCALL_DEFINE2(sethostname, char __user
        int errno;
        char tmp[__NEW_UTS_LEN];
  
@@ -17381,7 +17381,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/
                return -EPERM;
  
        if (len < 0 || len > __NEW_UTS_LEN)
-@@ -1247,7 +1261,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+@@ -1285,7 +1299,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
        int errno;
        char tmp[__NEW_UTS_LEN];
  
@@ -17391,7 +17391,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/
                return -EPERM;
        if (len < 0 || len > __NEW_UTS_LEN)
                return -EINVAL;
-@@ -1365,7 +1380,7 @@ int do_prlimit(struct task_struct *tsk, 
+@@ -1403,7 +1418,7 @@ int do_prlimit(struct task_struct *tsk, 
                /* Keep the capable check against init_user_ns until
                   cgroups can contain all limits */
                if (new_rlim->rlim_max > rlim->rlim_max &&
@@ -17400,7 +17400,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/
                        retval = -EPERM;
                if (!retval)
                        retval = security_task_setrlimit(tsk->group_leader,
-@@ -1419,7 +1434,8 @@ static int check_prlimit_permission(stru
+@@ -1457,7 +1472,8 @@ static int check_prlimit_permission(stru
             cred->gid == tcred->sgid &&
             cred->gid == tcred->gid))
                return 0;
@@ -17410,9 +17410,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/
                return 0;
  
        return -EPERM;
-diff -NurpP --minimal linux-3.0.3/kernel/sysctl.c linux-3.0.3-vs2.3.1-pre10/kernel/sysctl.c
---- linux-3.0.3/kernel/sysctl.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/sysctl.c  2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/sysctl.c linux-3.0.4-vs2.3.1-pre10.1/kernel/sysctl.c
+--- linux-3.0.4/kernel/sysctl.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/sysctl.c        2011-06-15 02:40:14.000000000 +0200
 @@ -75,6 +75,7 @@
  #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
  #include <linux/lockdep.h>
@@ -17435,9 +17435,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/sysctl.c linux-3.0.3-vs2.3.1-pre10/kern
  #ifdef CONFIG_CHR_DEV_SG
        {
                .procname       = "sg-big-buff",
-diff -NurpP --minimal linux-3.0.3/kernel/sysctl_binary.c linux-3.0.3-vs2.3.1-pre10/kernel/sysctl_binary.c
---- linux-3.0.3/kernel/sysctl_binary.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/sysctl_binary.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/sysctl_binary.c linux-3.0.4-vs2.3.1-pre10.1/kernel/sysctl_binary.c
+--- linux-3.0.4/kernel/sysctl_binary.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/sysctl_binary.c 2011-06-10 22:11:24.000000000 +0200
 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
  
        { CTL_INT,      KERN_PANIC,                     "panic" },
@@ -17446,9 +17446,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/sysctl_binary.c linux-3.0.3-vs2.3.1-pre
  
        { CTL_STR,      KERN_SPARC_REBOOT,              "reboot-cmd" },
        { CTL_INT,      KERN_CTLALTDEL,                 "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.0.3/kernel/time/timekeeping.c linux-3.0.3-vs2.3.1-pre10/kernel/time/timekeeping.c
---- linux-3.0.3/kernel/time/timekeeping.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/time/timekeeping.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/time/timekeeping.c linux-3.0.4-vs2.3.1-pre10.1/kernel/time/timekeeping.c
+--- linux-3.0.4/kernel/time/timekeeping.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/time/timekeeping.c      2011-06-10 22:11:24.000000000 +0200
 @@ -233,6 +233,7 @@ void getnstimeofday(struct timespec *ts)
        } while (read_seqretry(&xtime_lock, seq));
  
@@ -17457,9 +17457,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/time/timekeeping.c linux-3.0.3-vs2.3.1-
  }
  
  EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-3.0.3/kernel/time.c linux-3.0.3-vs2.3.1-pre10/kernel/time.c
---- linux-3.0.3/kernel/time.c  2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/time.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/time.c linux-3.0.4-vs2.3.1-pre10.1/kernel/time.c
+--- linux-3.0.4/kernel/time.c  2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/time.c  2011-06-10 22:11:24.000000000 +0200
 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, 
        if (err)
                return err;
@@ -17478,9 +17478,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/time.c linux-3.0.3-vs2.3.1-pre10/kernel
        }
        return 0;
  }
-diff -NurpP --minimal linux-3.0.3/kernel/timer.c linux-3.0.3-vs2.3.1-pre10/kernel/timer.c
---- linux-3.0.3/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/timer.c   2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/timer.c linux-3.0.4-vs2.3.1-pre10.1/kernel/timer.c
+--- linux-3.0.4/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/timer.c 2011-06-15 02:40:14.000000000 +0200
 @@ -40,6 +40,10 @@
  #include <linux/irq_work.h>
  #include <linux/sched.h>
@@ -17530,9 +17530,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/timer.c linux-3.0.3-vs2.3.1-pre10/kerne
  SYSCALL_DEFINE0(getuid)
  {
        /* Only we change this so SMP safe */
-diff -NurpP --minimal linux-3.0.3/kernel/user_namespace.c linux-3.0.3-vs2.3.1-pre10/kernel/user_namespace.c
---- linux-3.0.3/kernel/user_namespace.c        2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/user_namespace.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/user_namespace.c linux-3.0.4-vs2.3.1-pre10.1/kernel/user_namespace.c
+--- linux-3.0.4/kernel/user_namespace.c        2011-03-15 18:07:42.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/user_namespace.c        2011-06-10 22:11:24.000000000 +0200
 @@ -11,6 +11,7 @@
  #include <linux/user_namespace.h>
  #include <linux/highuid.h>
@@ -17558,9 +17558,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/user_namespace.c linux-3.0.3-vs2.3.1-pr
        INIT_WORK(&ns->destroyer, free_user_ns_work);
        schedule_work(&ns->destroyer);
  }
-diff -NurpP --minimal linux-3.0.3/kernel/utsname.c linux-3.0.3-vs2.3.1-pre10/kernel/utsname.c
---- linux-3.0.3/kernel/utsname.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/utsname.c 2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/utsname.c linux-3.0.4-vs2.3.1-pre10.1/kernel/utsname.c
+--- linux-3.0.4/kernel/utsname.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/utsname.c       2011-06-13 14:09:44.000000000 +0200
 @@ -16,14 +16,17 @@
  #include <linux/slab.h>
  #include <linux/user_namespace.h>
@@ -17629,9 +17629,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/utsname.c linux-3.0.3-vs2.3.1-pre10/ker
        kfree(ns);
  }
  
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/Kconfig linux-3.0.3-vs2.3.1-pre10/kernel/vserver/Kconfig
---- linux-3.0.3/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/Kconfig   2011-08-08 18:06:22.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/Kconfig linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/Kconfig
+--- linux-3.0.4/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/Kconfig 2011-08-08 18:06:22.000000000 +0200
 @@ -0,0 +1,232 @@
 +#
 +# Linux VServer configuration
@@ -17865,9 +17865,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/Kconfig linux-3.0.3-vs2.3.1-pre
 +      bool
 +      default n
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/Makefile linux-3.0.3-vs2.3.1-pre10/kernel/vserver/Makefile
---- linux-3.0.3/kernel/vserver/Makefile        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/Makefile  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/Makefile linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/Makefile
+--- linux-3.0.4/kernel/vserver/Makefile        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/Makefile        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,18 @@
 +#
 +# Makefile for the Linux vserver routines.
@@ -17887,9 +17887,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/Makefile linux-3.0.3-vs2.3.1-pr
 +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
 +vserver-$(CONFIG_VSERVER_DEVICE) += device.o
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/cacct.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct.c
---- linux-3.0.3/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/cacct.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cacct.c
+--- linux-3.0.4/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cacct.c 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,42 @@
 +/*
 + *  linux/kernel/vserver/cacct.c
@@ -17933,9 +17933,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/cacct.c linux-3.0.3-vs2.3.1-pre
 +      return 0;
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/cacct_init.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct_init.h
---- linux-3.0.3/kernel/vserver/cacct_init.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct_init.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/cacct_init.h linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cacct_init.h
+--- linux-3.0.4/kernel/vserver/cacct_init.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cacct_init.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,25 @@
 +
 +
@@ -17962,9 +17962,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/cacct_init.h linux-3.0.3-vs2.3.
 +      return;
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/cacct_proc.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct_proc.h
---- linux-3.0.3/kernel/vserver/cacct_proc.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct_proc.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/cacct_proc.h linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cacct_proc.h
+--- linux-3.0.4/kernel/vserver/cacct_proc.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cacct_proc.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,53 @@
 +#ifndef _VX_CACCT_PROC_H
 +#define _VX_CACCT_PROC_H
@@ -18019,9 +18019,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/cacct_proc.h linux-3.0.3-vs2.3.
 +}
 +
 +#endif        /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/context.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/context.c
---- linux-3.0.3/kernel/vserver/context.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/context.c 2011-08-01 18:28:12.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/context.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/context.c
+--- linux-3.0.4/kernel/vserver/context.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/context.c       2011-08-01 18:28:12.000000000 +0200
 @@ -0,0 +1,1107 @@
 +/*
 + *  linux/kernel/vserver/context.c
@@ -19130,9 +19130,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/context.c linux-3.0.3-vs2.3.1-p
 +
 +EXPORT_SYMBOL_GPL(free_vx_info);
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/cvirt.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt.c
---- linux-3.0.3/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt.c   2011-06-13 14:57:26.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/cvirt.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cvirt.c
+--- linux-3.0.4/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cvirt.c 2011-06-13 14:57:26.000000000 +0200
 @@ -0,0 +1,303 @@
 +/*
 + *  linux/kernel/vserver/cvirt.c
@@ -19437,9 +19437,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/cvirt.c linux-3.0.3-vs2.3.1-pre
 +
 +#endif
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/cvirt_init.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt_init.h
---- linux-3.0.3/kernel/vserver/cvirt_init.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt_init.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/cvirt_init.h linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cvirt_init.h
+--- linux-3.0.4/kernel/vserver/cvirt_init.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cvirt_init.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,70 @@
 +
 +
@@ -19511,9 +19511,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/cvirt_init.h linux-3.0.3-vs2.3.
 +      return;
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/cvirt_proc.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt_proc.h
---- linux-3.0.3/kernel/vserver/cvirt_proc.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt_proc.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/cvirt_proc.h linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cvirt_proc.h
+--- linux-3.0.4/kernel/vserver/cvirt_proc.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/cvirt_proc.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,135 @@
 +#ifndef _VX_CVIRT_PROC_H
 +#define _VX_CVIRT_PROC_H
@@ -19650,9 +19650,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/cvirt_proc.h linux-3.0.3-vs2.3.
 +}
 +
 +#endif        /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/debug.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/debug.c
---- linux-3.0.3/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/debug.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/debug.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/debug.c
+--- linux-3.0.4/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/debug.c 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,32 @@
 +/*
 + *  kernel/vserver/debug.c
@@ -19686,9 +19686,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/debug.c linux-3.0.3-vs2.3.1-pre
 +
 +EXPORT_SYMBOL_GPL(dump_vx_info);
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/device.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/device.c
---- linux-3.0.3/kernel/vserver/device.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/device.c  2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/device.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/device.c
+--- linux-3.0.4/kernel/vserver/device.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/device.c        2011-06-10 23:20:56.000000000 +0200
 @@ -0,0 +1,443 @@
 +/*
 + *  linux/kernel/vserver/device.c
@@ -20133,9 +20133,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/device.c linux-3.0.3-vs2.3.1-pr
 +#endif        /* CONFIG_COMPAT */
 +
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/dlimit.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/dlimit.c
---- linux-3.0.3/kernel/vserver/dlimit.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/dlimit.c  2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/dlimit.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/dlimit.c
+--- linux-3.0.4/kernel/vserver/dlimit.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/dlimit.c        2011-06-10 23:20:56.000000000 +0200
 @@ -0,0 +1,531 @@
 +/*
 + *  linux/kernel/vserver/dlimit.c
@@ -20668,9 +20668,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/dlimit.c linux-3.0.3-vs2.3.1-pr
 +EXPORT_SYMBOL_GPL(locate_dl_info);
 +EXPORT_SYMBOL_GPL(rcu_free_dl_info);
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/helper.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/helper.c
---- linux-3.0.3/kernel/vserver/helper.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/helper.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/helper.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/helper.c
+--- linux-3.0.4/kernel/vserver/helper.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/helper.c        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,223 @@
 +/*
 + *  linux/kernel/vserver/helper.c
@@ -20895,9 +20895,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/helper.c linux-3.0.3-vs2.3.1-pr
 +      return do_vshelper(vshelper_path, argv, envp, 1);
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/history.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/history.c
---- linux-3.0.3/kernel/vserver/history.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/history.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/history.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/history.c
+--- linux-3.0.4/kernel/vserver/history.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/history.c       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,258 @@
 +/*
 + *  kernel/vserver/history.c
@@ -21157,9 +21157,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/history.c linux-3.0.3-vs2.3.1-p
 +
 +#endif        /* CONFIG_COMPAT */
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/inet.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/inet.c
---- linux-3.0.3/kernel/vserver/inet.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/inet.c    2011-06-13 18:20:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/inet.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/inet.c
+--- linux-3.0.4/kernel/vserver/inet.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/inet.c  2011-08-30 20:14:33.000000000 +0200
 @@ -0,0 +1,225 @@
 +
 +#include <linux/in.h>
@@ -21309,7 +21309,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/inet.c linux-3.0.3-vs2.3.1-pre1
 +
 +      /* FIXME: handle lback only case */
 +      if (!NX_IPV4(nxi))
-+              return ERR_PTR(EPERM);
++              return ERR_PTR(-EPERM);
 +
 +      vxdprintk(VXD_CBIT(net, 4),
 +              "ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT,
@@ -21369,7 +21369,7 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/inet.c linux-3.0.3-vs2.3.1-pre1
 +
 +      } else {
 +              if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND))
-+                      return ERR_PTR(EPERM);
++                      return ERR_PTR(-EPERM);
 +      }
 +
 +      if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
@@ -21379,16 +21379,16 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/inet.c linux-3.0.3-vs2.3.1-pre1
 +                      fl4->saddr = nxi->v4_lback.s_addr;
 +      } else if (ipv4_is_loopback(fl4->daddr) &&
 +              !nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
-+              return ERR_PTR(EPERM);
++              return ERR_PTR(-EPERM);
 +
 +      return NULL;
 +}
 +
 +EXPORT_SYMBOL_GPL(ip_v4_find_src);
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/init.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/init.c
---- linux-3.0.3/kernel/vserver/init.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/init.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/init.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/init.c
+--- linux-3.0.4/kernel/vserver/init.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/init.c  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,45 @@
 +/*
 + *  linux/kernel/init.c
@@ -21435,9 +21435,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/init.c linux-3.0.3-vs2.3.1-pre1
 +module_init(init_vserver);
 +module_exit(exit_vserver);
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/inode.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/inode.c
---- linux-3.0.3/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/inode.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/inode.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/inode.c
+--- linux-3.0.4/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/inode.c 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,437 @@
 +/*
 + *  linux/kernel/vserver/inode.c
@@ -21876,9 +21876,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/inode.c linux-3.0.3-vs2.3.1-pre
 +
 +#endif        /* CONFIG_PROPAGATE */
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/limit.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit.c
---- linux-3.0.3/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/limit.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/limit.c
+--- linux-3.0.4/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/limit.c 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,354 @@
 +/*
 + *  linux/kernel/vserver/limit.c
@@ -22234,9 +22234,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/limit.c linux-3.0.3-vs2.3.1-pre
 +      return points;
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/limit_init.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit_init.h
---- linux-3.0.3/kernel/vserver/limit_init.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit_init.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/limit_init.h linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/limit_init.h
+--- linux-3.0.4/kernel/vserver/limit_init.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/limit_init.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,31 @@
 +
 +
@@ -22269,9 +22269,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/limit_init.h linux-3.0.3-vs2.3.
 +      }
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/limit_proc.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit_proc.h
---- linux-3.0.3/kernel/vserver/limit_proc.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit_proc.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/limit_proc.h linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/limit_proc.h
+--- linux-3.0.4/kernel/vserver/limit_proc.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/limit_proc.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,57 @@
 +#ifndef _VX_LIMIT_PROC_H
 +#define _VX_LIMIT_PROC_H
@@ -22330,9 +22330,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/limit_proc.h linux-3.0.3-vs2.3.
 +#endif        /* _VX_LIMIT_PROC_H */
 +
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/network.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/network.c
---- linux-3.0.3/kernel/vserver/network.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/network.c 2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/network.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/network.c
+--- linux-3.0.4/kernel/vserver/network.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/network.c       2011-06-10 23:20:56.000000000 +0200
 @@ -0,0 +1,912 @@
 +/*
 + *  linux/kernel/vserver/network.c
@@ -23246,9 +23246,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/network.c linux-3.0.3-vs2.3.1-p
 +EXPORT_SYMBOL_GPL(free_nx_info);
 +EXPORT_SYMBOL_GPL(unhash_nx_info);
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/proc.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/proc.c
---- linux-3.0.3/kernel/vserver/proc.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/proc.c    2011-08-01 19:57:21.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/proc.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/proc.c
+--- linux-3.0.4/kernel/vserver/proc.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/proc.c  2011-08-01 19:57:21.000000000 +0200
 @@ -0,0 +1,1103 @@
 +/*
 + *  linux/kernel/vserver/proc.c
@@ -24353,9 +24353,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/proc.c linux-3.0.3-vs2.3.1-pre1
 +      return buffer - orig;
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/sched.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched.c
---- linux-3.0.3/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/sched.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/sched.c
+--- linux-3.0.4/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/sched.c 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,82 @@
 +/*
 + *  linux/kernel/vserver/sched.c
@@ -24439,9 +24439,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/sched.c linux-3.0.3-vs2.3.1-pre
 +      return 0;
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/sched_init.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched_init.h
---- linux-3.0.3/kernel/vserver/sched_init.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched_init.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/sched_init.h linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/sched_init.h
+--- linux-3.0.4/kernel/vserver/sched_init.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/sched_init.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,27 @@
 +
 +static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -24470,9 +24470,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/sched_init.h linux-3.0.3-vs2.3.
 +{
 +      return;
 +}
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/sched_proc.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched_proc.h
---- linux-3.0.3/kernel/vserver/sched_proc.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched_proc.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/sched_proc.h linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/sched_proc.h
+--- linux-3.0.4/kernel/vserver/sched_proc.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/sched_proc.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,32 @@
 +#ifndef _VX_SCHED_PROC_H
 +#define _VX_SCHED_PROC_H
@@ -24506,9 +24506,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/sched_proc.h linux-3.0.3-vs2.3.
 +}
 +
 +#endif        /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/signal.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/signal.c
---- linux-3.0.3/kernel/vserver/signal.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/signal.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/signal.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/signal.c
+--- linux-3.0.4/kernel/vserver/signal.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/signal.c        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,134 @@
 +/*
 + *  linux/kernel/vserver/signal.c
@@ -24644,9 +24644,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/signal.c linux-3.0.3-vs2.3.1-pr
 +      return ret;
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/space.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/space.c
---- linux-3.0.3/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/space.c   2011-07-20 02:11:49.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/space.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/space.c
+--- linux-3.0.4/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/space.c 2011-07-20 02:11:49.000000000 +0200
 @@ -0,0 +1,435 @@
 +/*
 + *  linux/kernel/vserver/space.c
@@ -25083,9 +25083,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/space.c linux-3.0.3-vs2.3.1-pre
 +      return 0;
 +}
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/switch.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/switch.c
---- linux-3.0.3/kernel/vserver/switch.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/switch.c  2011-08-01 18:28:26.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/switch.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/switch.c
+--- linux-3.0.4/kernel/vserver/switch.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/switch.c        2011-08-01 18:28:26.000000000 +0200
 @@ -0,0 +1,556 @@
 +/*
 + *  linux/kernel/vserver/switch.c
@@ -25643,9 +25643,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/switch.c linux-3.0.3-vs2.3.1-pr
 +}
 +
 +#endif        /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/sysctl.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sysctl.c
---- linux-3.0.3/kernel/vserver/sysctl.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sysctl.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/sysctl.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/sysctl.c
+--- linux-3.0.4/kernel/vserver/sysctl.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/sysctl.c        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,241 @@
 +/*
 + *  kernel/vserver/sysctl.c
@@ -25888,9 +25888,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/sysctl.c linux-3.0.3-vs2.3.1-pr
 +EXPORT_SYMBOL_GPL(vx_debug_space);
 +EXPORT_SYMBOL_GPL(vx_debug_misc);
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/tag.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/tag.c
---- linux-3.0.3/kernel/vserver/tag.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/tag.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/tag.c linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/tag.c
+--- linux-3.0.4/kernel/vserver/tag.c   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/tag.c   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,63 @@
 +/*
 + *  linux/kernel/vserver/tag.c
@@ -25955,9 +25955,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/tag.c linux-3.0.3-vs2.3.1-pre10
 +}
 +
 +
-diff -NurpP --minimal linux-3.0.3/kernel/vserver/vci_config.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/vci_config.h
---- linux-3.0.3/kernel/vserver/vci_config.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/vci_config.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/kernel/vserver/vci_config.h linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/vci_config.h
+--- linux-3.0.4/kernel/vserver/vci_config.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/kernel/vserver/vci_config.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,76 @@
 +
 +/*  interface version */
@@ -26035,9 +26035,9 @@ diff -NurpP --minimal linux-3.0.3/kernel/vserver/vci_config.h linux-3.0.3-vs2.3.
 +      0;
 +}
 +
-diff -NurpP --minimal linux-3.0.3/mm/filemap_xip.c linux-3.0.3-vs2.3.1-pre10/mm/filemap_xip.c
---- linux-3.0.3/mm/filemap_xip.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/filemap_xip.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/filemap_xip.c linux-3.0.4-vs2.3.1-pre10.1/mm/filemap_xip.c
+--- linux-3.0.4/mm/filemap_xip.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/filemap_xip.c       2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/seqlock.h>
  #include <linux/mutex.h>
@@ -26046,9 +26046,9 @@ diff -NurpP --minimal linux-3.0.3/mm/filemap_xip.c linux-3.0.3-vs2.3.1-pre10/mm/
  #include <asm/tlbflush.h>
  #include <asm/io.h>
  
-diff -NurpP --minimal linux-3.0.3/mm/fremap.c linux-3.0.3-vs2.3.1-pre10/mm/fremap.c
---- linux-3.0.3/mm/fremap.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/fremap.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/fremap.c linux-3.0.4-vs2.3.1-pre10.1/mm/fremap.c
+--- linux-3.0.4/mm/fremap.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/fremap.c    2011-06-10 22:11:24.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/module.h>
  #include <linux/syscalls.h>
@@ -26057,9 +26057,9 @@ diff -NurpP --minimal linux-3.0.3/mm/fremap.c linux-3.0.3-vs2.3.1-pre10/mm/frema
  
  #include <asm/mmu_context.h>
  #include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.0.3/mm/hugetlb.c linux-3.0.3-vs2.3.1-pre10/mm/hugetlb.c
---- linux-3.0.3/mm/hugetlb.c   2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/hugetlb.c     2011-06-22 12:39:16.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/hugetlb.c linux-3.0.4-vs2.3.1-pre10.1/mm/hugetlb.c
+--- linux-3.0.4/mm/hugetlb.c   2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/hugetlb.c   2011-06-22 12:39:16.000000000 +0200
 @@ -28,6 +28,7 @@
  
  #include <linux/hugetlb.h>
@@ -26068,9 +26068,9 @@ diff -NurpP --minimal linux-3.0.3/mm/hugetlb.c linux-3.0.3-vs2.3.1-pre10/mm/huge
  #include "internal.h"
  
  const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-3.0.3/mm/memcontrol.c linux-3.0.3-vs2.3.1-pre10/mm/memcontrol.c
---- linux-3.0.3/mm/memcontrol.c        2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/memcontrol.c  2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/memcontrol.c linux-3.0.4-vs2.3.1-pre10.1/mm/memcontrol.c
+--- linux-3.0.4/mm/memcontrol.c        2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/memcontrol.c        2011-08-08 23:04:47.000000000 +0200
 @@ -741,6 +741,31 @@ struct mem_cgroup *mem_cgroup_from_task(
                                struct mem_cgroup, css);
  }
@@ -26103,9 +26103,9 @@ diff -NurpP --minimal linux-3.0.3/mm/memcontrol.c linux-3.0.3-vs2.3.1-pre10/mm/m
  struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
  {
        struct mem_cgroup *mem = NULL;
-diff -NurpP --minimal linux-3.0.3/mm/memory.c linux-3.0.3-vs2.3.1-pre10/mm/memory.c
---- linux-3.0.3/mm/memory.c    2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/memory.c      2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/memory.c linux-3.0.4-vs2.3.1-pre10.1/mm/memory.c
+--- linux-3.0.4/mm/memory.c    2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/memory.c    2011-08-08 23:04:47.000000000 +0200
 @@ -3388,6 +3388,7 @@ int handle_pte_fault(struct mm_struct *m
  {
        pte_t entry;
@@ -26141,9 +26141,9 @@ diff -NurpP --minimal linux-3.0.3/mm/memory.c linux-3.0.3-vs2.3.1-pre10/mm/memor
  }
  
  /*
-diff -NurpP --minimal linux-3.0.3/mm/mremap.c linux-3.0.3-vs2.3.1-pre10/mm/mremap.c
---- linux-3.0.3/mm/mremap.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/mremap.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/mremap.c linux-3.0.4-vs2.3.1-pre10.1/mm/mremap.c
+--- linux-3.0.4/mm/mremap.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/mremap.c    2011-06-10 22:11:24.000000000 +0200
 @@ -19,6 +19,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -26152,9 +26152,9 @@ diff -NurpP --minimal linux-3.0.3/mm/mremap.c linux-3.0.3-vs2.3.1-pre10/mm/mrema
  
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.0.3/mm/oom_kill.c linux-3.0.3-vs2.3.1-pre10/mm/oom_kill.c
---- linux-3.0.3/mm/oom_kill.c  2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/oom_kill.c    2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/oom_kill.c linux-3.0.4-vs2.3.1-pre10.1/mm/oom_kill.c
+--- linux-3.0.4/mm/oom_kill.c  2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/oom_kill.c  2011-08-08 23:04:47.000000000 +0200
 @@ -32,6 +32,9 @@
  #include <linux/mempolicy.h>
  #include <linux/security.h>
@@ -26249,9 +26249,9 @@ diff -NurpP --minimal linux-3.0.3/mm/oom_kill.c linux-3.0.3-vs2.3.1-pre10/mm/oom
        }
  
        if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.0.3/mm/page_alloc.c linux-3.0.3-vs2.3.1-pre10/mm/page_alloc.c
---- linux-3.0.3/mm/page_alloc.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/page_alloc.c  2011-06-10 22:24:12.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/page_alloc.c linux-3.0.4-vs2.3.1-pre10.1/mm/page_alloc.c
+--- linux-3.0.4/mm/page_alloc.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/page_alloc.c        2011-06-10 22:24:12.000000000 +0200
 @@ -57,6 +57,8 @@
  #include <linux/ftrace_event.h>
  #include <linux/memcontrol.h>
@@ -26281,9 +26281,9 @@ diff -NurpP --minimal linux-3.0.3/mm/page_alloc.c linux-3.0.3-vs2.3.1-pre10/mm/p
  }
  #endif
  
-diff -NurpP --minimal linux-3.0.3/mm/pgtable-generic.c linux-3.0.3-vs2.3.1-pre10/mm/pgtable-generic.c
---- linux-3.0.3/mm/pgtable-generic.c   2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/mm/pgtable-generic.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/pgtable-generic.c linux-3.0.4-vs2.3.1-pre10.1/mm/pgtable-generic.c
+--- linux-3.0.4/mm/pgtable-generic.c   2011-03-15 18:07:42.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/pgtable-generic.c   2011-06-10 22:11:24.000000000 +0200
 @@ -6,6 +6,8 @@
   *  Copyright (C) 2010  Linus Torvalds
   */
@@ -26293,9 +26293,9 @@ diff -NurpP --minimal linux-3.0.3/mm/pgtable-generic.c linux-3.0.3-vs2.3.1-pre10
  #include <linux/pagemap.h>
  #include <asm/tlb.h>
  #include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.0.3/mm/rmap.c linux-3.0.3-vs2.3.1-pre10/mm/rmap.c
---- linux-3.0.3/mm/rmap.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/rmap.c        2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/rmap.c linux-3.0.4-vs2.3.1-pre10.1/mm/rmap.c
+--- linux-3.0.4/mm/rmap.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/rmap.c      2011-07-01 11:35:35.000000000 +0200
 @@ -57,6 +57,7 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -26304,9 +26304,9 @@ diff -NurpP --minimal linux-3.0.3/mm/rmap.c linux-3.0.3-vs2.3.1-pre10/mm/rmap.c
  
  #include <asm/tlbflush.h>
  
-diff -NurpP --minimal linux-3.0.3/mm/shmem.c linux-3.0.3-vs2.3.1-pre10/mm/shmem.c
---- linux-3.0.3/mm/shmem.c     2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/shmem.c       2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/shmem.c linux-3.0.4-vs2.3.1-pre10.1/mm/shmem.c
+--- linux-3.0.4/mm/shmem.c     2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/shmem.c     2011-07-01 11:35:35.000000000 +0200
 @@ -1850,7 +1850,7 @@ static int shmem_statfs(struct dentry *d
  {
        struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
@@ -26325,9 +26325,9 @@ diff -NurpP --minimal linux-3.0.3/mm/shmem.c linux-3.0.3-vs2.3.1-pre10/mm/shmem.
        sb->s_op = &shmem_ops;
        sb->s_time_gran = 1;
  #ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.0.3/mm/slab.c linux-3.0.3-vs2.3.1-pre10/mm/slab.c
---- linux-3.0.3/mm/slab.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/slab.c        2011-06-15 02:41:23.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/slab.c linux-3.0.4-vs2.3.1-pre10.1/mm/slab.c
+--- linux-3.0.4/mm/slab.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/slab.c      2011-06-15 02:41:23.000000000 +0200
 @@ -411,6 +411,8 @@ static void kmem_list3_init(struct kmem_
  #define STATS_INC_FREEMISS(x) do { } while (0)
  #endif
@@ -26361,9 +26361,9 @@ diff -NurpP --minimal linux-3.0.3/mm/slab.c linux-3.0.3-vs2.3.1-pre10/mm/slab.c
  
        kmemcheck_slab_free(cachep, objp, obj_size(cachep));
  
-diff -NurpP --minimal linux-3.0.3/mm/slab_vs.h linux-3.0.3-vs2.3.1-pre10/mm/slab_vs.h
---- linux-3.0.3/mm/slab_vs.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/mm/slab_vs.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/slab_vs.h linux-3.0.4-vs2.3.1-pre10.1/mm/slab_vs.h
+--- linux-3.0.4/mm/slab_vs.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/slab_vs.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,29 @@
 +
 +#include <linux/vserver/context.h>
@@ -26394,9 +26394,9 @@ diff -NurpP --minimal linux-3.0.3/mm/slab_vs.h linux-3.0.3-vs2.3.1-pre10/mm/slab
 +      atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
 +}
 +
-diff -NurpP --minimal linux-3.0.3/mm/swapfile.c linux-3.0.3-vs2.3.1-pre10/mm/swapfile.c
---- linux-3.0.3/mm/swapfile.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/mm/swapfile.c    2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/mm/swapfile.c linux-3.0.4-vs2.3.1-pre10.1/mm/swapfile.c
+--- linux-3.0.4/mm/swapfile.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/mm/swapfile.c  2011-07-01 11:35:35.000000000 +0200
 @@ -37,6 +37,8 @@
  #include <asm/tlbflush.h>
  #include <linux/swapops.h>
@@ -26432,9 +26432,9 @@ diff -NurpP --minimal linux-3.0.3/mm/swapfile.c linux-3.0.3-vs2.3.1-pre10/mm/swa
  }
  
  /*
-diff -NurpP --minimal linux-3.0.3/net/bridge/br_multicast.c linux-3.0.3-vs2.3.1-pre10/net/bridge/br_multicast.c
---- linux-3.0.3/net/bridge/br_multicast.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/bridge/br_multicast.c        2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/bridge/br_multicast.c linux-3.0.4-vs2.3.1-pre10.1/net/bridge/br_multicast.c
+--- linux-3.0.4/net/bridge/br_multicast.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/bridge/br_multicast.c      2011-07-19 00:44:39.000000000 +0200
 @@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
        ip6h->hop_limit = 1;
        ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
@@ -26444,9 +26444,9 @@ diff -NurpP --minimal linux-3.0.3/net/bridge/br_multicast.c linux-3.0.3-vs2.3.1-
        ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
  
        hopopt = (u8 *)(ip6h + 1);
-diff -NurpP --minimal linux-3.0.3/net/core/dev.c linux-3.0.3-vs2.3.1-pre10/net/core/dev.c
---- linux-3.0.3/net/core/dev.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/core/dev.c   2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/core/dev.c linux-3.0.4-vs2.3.1-pre10.1/net/core/dev.c
+--- linux-3.0.4/net/core/dev.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/core/dev.c 2011-06-15 02:40:14.000000000 +0200
 @@ -127,6 +127,7 @@
  #include <linux/in.h>
  #include <linux/jhash.h>
@@ -26548,9 +26548,9 @@ diff -NurpP --minimal linux-3.0.3/net/core/dev.c linux-3.0.3-vs2.3.1-pre10/net/c
        seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
                   "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
                   dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-3.0.3/net/core/rtnetlink.c linux-3.0.3-vs2.3.1-pre10/net/core/rtnetlink.c
---- linux-3.0.3/net/core/rtnetlink.c   2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/core/rtnetlink.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/core/rtnetlink.c linux-3.0.4-vs2.3.1-pre10.1/net/core/rtnetlink.c
+--- linux-3.0.4/net/core/rtnetlink.c   2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/core/rtnetlink.c   2011-06-10 22:11:24.000000000 +0200
 @@ -1015,6 +1015,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
                hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
                        if (idx < s_idx)
@@ -26570,9 +26570,9 @@ diff -NurpP --minimal linux-3.0.3/net/core/rtnetlink.c linux-3.0.3-vs2.3.1-pre10
        skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
        if (skb == NULL)
                goto errout;
-diff -NurpP --minimal linux-3.0.3/net/core/sock.c linux-3.0.3-vs2.3.1-pre10/net/core/sock.c
---- linux-3.0.3/net/core/sock.c        2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/core/sock.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/core/sock.c linux-3.0.4-vs2.3.1-pre10.1/net/core/sock.c
+--- linux-3.0.4/net/core/sock.c        2011-05-22 16:18:00.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/core/sock.c        2011-06-10 22:11:24.000000000 +0200
 @@ -127,6 +127,10 @@
  #include <net/cls_cgroup.h>
  
@@ -26640,9 +26640,9 @@ diff -NurpP --minimal linux-3.0.3/net/core/sock.c linux-3.0.3-vs2.3.1-pre10/net/
        /*
         * Before updating sk_refcnt, we must commit prior changes to memory
         * (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-3.0.3/net/ipv4/af_inet.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/af_inet.c
---- linux-3.0.3/net/ipv4/af_inet.c     2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/af_inet.c       2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/af_inet.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/af_inet.c
+--- linux-3.0.4/net/ipv4/af_inet.c     2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/af_inet.c     2011-07-19 00:44:39.000000000 +0200
 @@ -117,6 +117,7 @@
  #ifdef CONFIG_IP_MROUTE
  #include <linux/mroute.h>
@@ -26720,9 +26720,28 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/af_inet.c linux-3.0.3-vs2.3.1-pre10/n
                sin->sin_port = inet->inet_sport;
                sin->sin_addr.s_addr = addr;
        }
-diff -NurpP --minimal linux-3.0.3/net/ipv4/devinet.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/devinet.c
---- linux-3.0.3/net/ipv4/devinet.c     2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/devinet.c       2011-08-29 03:45:09.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/arp.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/arp.c
+--- linux-3.0.4/net/ipv4/arp.c 2011-05-22 16:18:00.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/arp.c 2011-08-29 05:14:51.000000000 +0200
+@@ -1365,6 +1365,7 @@ static void arp_format_neigh_entry(struc
+       struct net_device *dev = n->dev;
+       int hatype = dev->type;
+ 
++      /* FIXME: check for network context */
+       read_lock(&n->lock);
+       /* Convert hardware address to XX:XX:XX:XX ... form. */
+ #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+@@ -1396,6 +1397,7 @@ static void arp_format_pneigh_entry(stru
+       int hatype = dev ? dev->type : 0;
+       char tbuf[16];
+ 
++      /* FIXME: check for network context */
+       sprintf(tbuf, "%pI4", n->key);
+       seq_printf(seq, "%-16s 0x%-10x0x%-10x%s     *        %s\n",
+                  tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
+diff -NurpP --minimal linux-3.0.4/net/ipv4/devinet.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/devinet.c
+--- linux-3.0.4/net/ipv4/devinet.c     2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/devinet.c     2011-08-29 03:45:09.000000000 +0200
 @@ -518,6 +518,7 @@ struct in_device *inetdev_by_index(struc
  }
  EXPORT_SYMBOL(inetdev_by_index);
@@ -26789,9 +26808,20 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/devinet.c linux-3.0.3-vs2.3.1-pre10/n
                                if (ip_idx < s_ip_idx)
                                        continue;
                                if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.0.3/net/ipv4/inet_connection_sock.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_connection_sock.c
---- linux-3.0.3/net/ipv4/inet_connection_sock.c        2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_connection_sock.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/fib_trie.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/fib_trie.c
+--- linux-3.0.4/net/ipv4/fib_trie.c    2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/fib_trie.c    2011-08-29 04:56:47.000000000 +0200
+@@ -2554,6 +2554,7 @@ static int fib_route_seq_show(struct seq
+                           || fa->fa_type == RTN_MULTICAST)
+                               continue;
+ 
++                      /* FIXME: check for network context? */
+                       if (fi)
+                               seq_printf(seq,
+                                        "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
+diff -NurpP --minimal linux-3.0.4/net/ipv4/inet_connection_sock.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/inet_connection_sock.c
+--- linux-3.0.4/net/ipv4/inet_connection_sock.c        2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/inet_connection_sock.c        2011-06-10 22:11:24.000000000 +0200
 @@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
  }
  EXPORT_SYMBOL(inet_get_local_port_range);
@@ -26841,9 +26871,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/inet_connection_sock.c linux-3.0.3-vs
                                        break;
                        }
                }
-diff -NurpP --minimal linux-3.0.3/net/ipv4/inet_diag.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_diag.c
---- linux-3.0.3/net/ipv4/inet_diag.c   2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_diag.c     2011-06-22 12:39:16.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/inet_diag.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/inet_diag.c
+--- linux-3.0.4/net/ipv4/inet_diag.c   2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/inet_diag.c   2011-06-22 12:39:16.000000000 +0200
 @@ -33,6 +33,8 @@
  #include <linux/stddef.h>
  
@@ -26947,9 +26977,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/inet_diag.c linux-3.0.3-vs2.3.1-pre10
                                if (num < s_num)
                                        goto next_dying;
                                if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-3.0.3/net/ipv4/inet_hashtables.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_hashtables.c
---- linux-3.0.3/net/ipv4/inet_hashtables.c     2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_hashtables.c       2011-08-29 03:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/inet_hashtables.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/inet_hashtables.c
+--- linux-3.0.4/net/ipv4/inet_hashtables.c     2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/inet_hashtables.c     2011-08-29 03:45:56.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <net/inet_connection_sock.h>
  #include <net/inet_hashtables.h>
@@ -26986,9 +27016,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/inet_hashtables.c linux-3.0.3-vs2.3.1
        /*
         * if the nulls value we got at the end of this lookup is
         * not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.0.3/net/ipv4/netfilter/nf_nat_helper.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.0.3/net/ipv4/netfilter/nf_nat_helper.c     2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/netfilter/nf_nat_helper.c       2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/netfilter/nf_nat_helper.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.0.4/net/ipv4/netfilter/nf_nat_helper.c     2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/netfilter/nf_nat_helper.c     2011-06-15 02:40:14.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <net/route.h>
  
@@ -26997,9 +27027,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/netfilter/nf_nat_helper.c linux-3.0.3
  #include <net/netfilter/nf_conntrack.h>
  #include <net/netfilter/nf_conntrack_helper.h>
  #include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-3.0.3/net/ipv4/netfilter.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/netfilter.c
---- linux-3.0.3/net/ipv4/netfilter.c   2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/netfilter.c     2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/netfilter.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/netfilter.c
+--- linux-3.0.4/net/ipv4/netfilter.c   2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/netfilter.c   2011-07-19 00:44:39.000000000 +0200
 @@ -5,7 +5,7 @@
  #include <linux/ip.h>
  #include <linux/skbuff.h>
@@ -27009,9 +27039,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/netfilter.c linux-3.0.3-vs2.3.1-pre10
  #include <net/xfrm.h>
  #include <net/ip.h>
  #include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.0.3/net/ipv4/raw.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/raw.c
---- linux-3.0.3/net/ipv4/raw.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/raw.c   2011-07-27 20:26:04.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/raw.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/raw.c
+--- linux-3.0.4/net/ipv4/raw.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/raw.c 2011-07-27 20:26:04.000000000 +0200
 @@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru
  
                if (net_eq(sock_net(sk), net) && inet->inet_num == num  &&
@@ -27104,9 +27134,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/raw.c linux-3.0.3-vs2.3.1-pre10/net/i
  
        if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
                sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.0.3/net/ipv4/tcp.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp.c
---- linux-3.0.3/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp.c   2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/tcp.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/tcp.c
+--- linux-3.0.4/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/tcp.c 2011-07-19 00:44:39.000000000 +0200
 @@ -266,6 +266,7 @@
  #include <linux/crypto.h>
  #include <linux/time.h>
@@ -27115,9 +27145,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/tcp.c linux-3.0.3-vs2.3.1-pre10/net/i
  
  #include <net/icmp.h>
  #include <net/tcp.h>
-diff -NurpP --minimal linux-3.0.3/net/ipv4/tcp_ipv4.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp_ipv4.c
---- linux-3.0.3/net/ipv4/tcp_ipv4.c    2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp_ipv4.c      2011-08-29 03:45:10.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/tcp_ipv4.c
+--- linux-3.0.4/net/ipv4/tcp_ipv4.c    2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/tcp_ipv4.c    2011-08-29 03:45:10.000000000 +0200
 @@ -2003,6 +2003,12 @@ static void *listening_get_next(struct s
                req = req->dl_next;
                while (1) {
@@ -27201,9 +27231,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/tcp_ipv4.c linux-3.0.3-vs2.3.1-pre10/
                ntohs(ireq->rmt_port),
                TCP_SYN_RECV,
                0, 0, /* could print option size, but that is af dependent. */
-diff -NurpP --minimal linux-3.0.3/net/ipv4/tcp_minisocks.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp_minisocks.c
---- linux-3.0.3/net/ipv4/tcp_minisocks.c       2011-03-15 18:07:45.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp_minisocks.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/tcp_minisocks.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/tcp_minisocks.c
+--- linux-3.0.4/net/ipv4/tcp_minisocks.c       2011-03-15 18:07:45.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/tcp_minisocks.c       2011-06-10 22:11:24.000000000 +0200
 @@ -23,6 +23,9 @@
  #include <linux/slab.h>
  #include <linux/sysctl.h>
@@ -27226,9 +27256,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/tcp_minisocks.c linux-3.0.3-vs2.3.1-p
  #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
                if (tw->tw_family == PF_INET6) {
                        struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.0.3/net/ipv4/udp.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/udp.c
---- linux-3.0.3/net/ipv4/udp.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/udp.c   2011-07-27 20:26:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv4/udp.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/udp.c
+--- linux-3.0.4/net/ipv4/udp.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv4/udp.c 2011-07-27 20:26:14.000000000 +0200
 @@ -296,14 +296,7 @@ fail:
  }
  EXPORT_SYMBOL(udp_lib_get_port);
@@ -27350,9 +27380,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv4/udp.c linux-3.0.3-vs2.3.1-pre10/net/i
  
        if (!sk) {
                if (state->bucket <= state->udp_table->mask)
-diff -NurpP --minimal linux-3.0.3/net/ipv6/Kconfig linux-3.0.3-vs2.3.1-pre10/net/ipv6/Kconfig
---- linux-3.0.3/net/ipv6/Kconfig       2010-08-02 16:52:59.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/Kconfig linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/Kconfig
+--- linux-3.0.4/net/ipv6/Kconfig       2010-08-02 16:52:59.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/Kconfig       2011-06-10 22:11:24.000000000 +0200
 @@ -4,8 +4,8 @@
  
  #   IPv6 as module will cause a CRASH if you try to unload it
@@ -27364,9 +27394,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/Kconfig linux-3.0.3-vs2.3.1-pre10/net
        ---help---
          This is complemental support for the IP version 6.
          You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-3.0.3/net/ipv6/addrconf.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/addrconf.c
---- linux-3.0.3/net/ipv6/addrconf.c    2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/addrconf.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/addrconf.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/addrconf.c
+--- linux-3.0.4/net/ipv6/addrconf.c    2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/addrconf.c    2011-06-10 22:11:24.000000000 +0200
 @@ -87,6 +87,8 @@
  
  #include <linux/proc_fs.h>
@@ -27466,9 +27496,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/addrconf.c linux-3.0.3-vs2.3.1-pre10/
                        idev = __in6_dev_get(dev);
                        if (!idev)
                                goto cont;
-diff -NurpP --minimal linux-3.0.3/net/ipv6/af_inet6.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/af_inet6.c
---- linux-3.0.3/net/ipv6/af_inet6.c    2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/af_inet6.c      2011-08-29 03:45:10.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/af_inet6.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/af_inet6.c
+--- linux-3.0.4/net/ipv6/af_inet6.c    2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/af_inet6.c    2011-08-29 03:45:10.000000000 +0200
 @@ -42,6 +42,8 @@
  #include <linux/netdevice.h>
  #include <linux/icmpv6.h>
@@ -27564,9 +27594,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/af_inet6.c linux-3.0.3-vs2.3.1-pre10/
                if (ipv6_addr_any(&np->rcv_saddr))
                        ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
                else
-diff -NurpP --minimal linux-3.0.3/net/ipv6/fib6_rules.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/fib6_rules.c
---- linux-3.0.3/net/ipv6/fib6_rules.c  2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/fib6_rules.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/fib6_rules.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/fib6_rules.c
+--- linux-3.0.4/net/ipv6/fib6_rules.c  2011-05-22 16:18:00.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/fib6_rules.c  2011-06-10 22:11:24.000000000 +0200
 @@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
                                               ip6_dst_idev(&rt->dst)->dev,
                                               &flp6->daddr,
@@ -27576,9 +27606,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/fib6_rules.c linux-3.0.3-vs2.3.1-pre1
                                goto again;
                        if (!ipv6_prefix_equal(&saddr, &r->src.addr,
                                               r->src.plen))
-diff -NurpP --minimal linux-3.0.3/net/ipv6/inet6_hashtables.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/inet6_hashtables.c
---- linux-3.0.3/net/ipv6/inet6_hashtables.c    2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/inet6_hashtables.c      2011-08-29 03:45:10.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/inet6_hashtables.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/inet6_hashtables.c
+--- linux-3.0.4/net/ipv6/inet6_hashtables.c    2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/inet6_hashtables.c    2011-08-29 03:45:10.000000000 +0200
 @@ -16,6 +16,7 @@
  
  #include <linux/module.h>
@@ -27614,9 +27644,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/inet6_hashtables.c linux-3.0.3-vs2.3.
                }
                if (sk->sk_bound_dev_if) {
                        if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.0.3/net/ipv6/ip6_output.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/ip6_output.c
---- linux-3.0.3/net/ipv6/ip6_output.c  2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/ip6_output.c    2011-08-29 03:45:10.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/ip6_output.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/ip6_output.c
+--- linux-3.0.4/net/ipv6/ip6_output.c  2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/ip6_output.c  2011-08-29 03:45:10.000000000 +0200
 @@ -962,7 +962,8 @@ static int ip6_dst_lookup_tail(struct so
                struct rt6_info *rt = (struct rt6_info *) *dst;
                err = ip6_route_get_saddr(net, rt, &fl6->daddr,
@@ -27627,9 +27657,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/ip6_output.c linux-3.0.3-vs2.3.1-pre1
                if (err)
                        goto out_err_release;
        }
-diff -NurpP --minimal linux-3.0.3/net/ipv6/ndisc.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/ndisc.c
---- linux-3.0.3/net/ipv6/ndisc.c       2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/ndisc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/ndisc.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/ndisc.c
+--- linux-3.0.4/net/ipv6/ndisc.c       2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/ndisc.c       2011-06-10 22:11:24.000000000 +0200
 @@ -597,7 +597,7 @@ static void ndisc_send_na(struct net_dev
        } else {
                if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
@@ -27639,9 +27669,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/ndisc.c linux-3.0.3-vs2.3.1-pre10/net
                        return;
                src_addr = &tmpaddr;
        }
-diff -NurpP --minimal linux-3.0.3/net/ipv6/raw.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/raw.c
---- linux-3.0.3/net/ipv6/raw.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/raw.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/raw.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/raw.c
+--- linux-3.0.4/net/ipv6/raw.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/raw.c 2011-06-10 22:11:24.000000000 +0200
 @@ -30,6 +30,7 @@
  #include <linux/icmpv6.h>
  #include <linux/netfilter.h>
@@ -27664,9 +27694,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/raw.c linux-3.0.3-vs2.3.1-pre10/net/i
                /* ipv4 addr of the socket is invalid.  Only the
                 * unspecified and mapped address have a v4 equivalent.
                 */
-diff -NurpP --minimal linux-3.0.3/net/ipv6/route.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/route.c
---- linux-3.0.3/net/ipv6/route.c       2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/route.c 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/route.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/route.c
+--- linux-3.0.4/net/ipv6/route.c       2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/route.c       2011-08-29 05:05:08.000000000 +0200
 @@ -54,6 +54,7 @@
  #include <net/xfrm.h>
  #include <net/netevent.h>
@@ -27706,9 +27736,17 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/route.c linux-3.0.3-vs2.3.1-pre10/net
                        NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
        }
  
-diff -NurpP --minimal linux-3.0.3/net/ipv6/tcp_ipv6.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/tcp_ipv6.c
---- linux-3.0.3/net/ipv6/tcp_ipv6.c    2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/tcp_ipv6.c      2011-08-29 03:45:10.000000000 +0200
+@@ -2586,6 +2590,7 @@ static int rt6_info_route(struct rt6_inf
+ {
+       struct seq_file *m = p_arg;
+ 
++      /* FIXME: check for network context? */
+       seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
+ 
+ #ifdef CONFIG_IPV6_SUBTREES
+diff -NurpP --minimal linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/tcp_ipv6.c
+--- linux-3.0.4/net/ipv6/tcp_ipv6.c    2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/tcp_ipv6.c    2011-08-29 03:45:10.000000000 +0200
 @@ -70,6 +70,7 @@
  
  #include <linux/crypto.h>
@@ -27735,9 +27773,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/tcp_ipv6.c linux-3.0.3-vs2.3.1-pre10/
  
        addr_type = ipv6_addr_type(&usin->sin6_addr);
  
-diff -NurpP --minimal linux-3.0.3/net/ipv6/udp.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/udp.c
---- linux-3.0.3/net/ipv6/udp.c 2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/udp.c   2011-08-29 03:45:10.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/udp.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/udp.c
+--- linux-3.0.4/net/ipv6/udp.c 2011-08-31 18:56:42.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/udp.c 2011-08-29 03:45:10.000000000 +0200
 @@ -45,41 +45,67 @@
  #include <net/tcp_states.h>
  #include <net/ip6_checksum.h>
@@ -27830,9 +27868,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/udp.c linux-3.0.3-vs2.3.1-pre10/net/i
                }
                if (!ipv6_addr_any(&np->daddr)) {
                        if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.0.3/net/ipv6/xfrm6_policy.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/xfrm6_policy.c
---- linux-3.0.3/net/ipv6/xfrm6_policy.c        2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/xfrm6_policy.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/ipv6/xfrm6_policy.c linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/xfrm6_policy.c
+--- linux-3.0.4/net/ipv6/xfrm6_policy.c        2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/ipv6/xfrm6_policy.c        2011-06-10 22:11:24.000000000 +0200
 @@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
        dev = ip6_dst_idev(dst)->dev;
        ipv6_dev_get_saddr(dev_net(dev), dev,
@@ -27842,9 +27880,9 @@ diff -NurpP --minimal linux-3.0.3/net/ipv6/xfrm6_policy.c linux-3.0.3-vs2.3.1-pr
        dst_release(dst);
        return 0;
  }
-diff -NurpP --minimal linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.3-vs2.3.1-pre10/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c        2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/netfilter/ipvs/ip_vs_xmit.c  2011-07-22 15:27:52.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.4-vs2.3.1-pre10.1/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c        2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/netfilter/ipvs/ip_vs_xmit.c        2011-07-22 15:27:52.000000000 +0200
 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
                return dst;
        if (ipv6_addr_any(&fl6.saddr) &&
@@ -27854,9 +27892,9 @@ diff -NurpP --minimal linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.3-vs
                goto out_err;
        if (do_xfrm) {
                dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.0.3/net/netlink/af_netlink.c linux-3.0.3-vs2.3.1-pre10/net/netlink/af_netlink.c
---- linux-3.0.3/net/netlink/af_netlink.c       2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/netlink/af_netlink.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/netlink/af_netlink.c linux-3.0.4-vs2.3.1-pre10.1/net/netlink/af_netlink.c
+--- linux-3.0.4/net/netlink/af_netlink.c       2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/netlink/af_netlink.c       2011-06-10 22:11:24.000000000 +0200
 @@ -55,6 +55,9 @@
  #include <linux/types.h>
  #include <linux/audit.h>
@@ -27896,9 +27934,9 @@ diff -NurpP --minimal linux-3.0.3/net/netlink/af_netlink.c linux-3.0.3-vs2.3.1-p
                                s = sk_next(s);
                        if (s) {
                                iter->link = i;
-diff -NurpP --minimal linux-3.0.3/net/socket.c linux-3.0.3-vs2.3.1-pre10/net/socket.c
---- linux-3.0.3/net/socket.c   2011-08-29 03:10:26.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/socket.c     2011-08-29 03:45:10.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/socket.c linux-3.0.4-vs2.3.1-pre10.1/net/socket.c
+--- linux-3.0.4/net/socket.c   2011-08-31 18:56:43.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/socket.c   2011-08-29 03:45:10.000000000 +0200
 @@ -98,6 +98,10 @@
  
  #include <net/sock.h>
@@ -28005,9 +28043,9 @@ diff -NurpP --minimal linux-3.0.3/net/socket.c linux-3.0.3-vs2.3.1-pre10/net/soc
  
        err = sock1->ops->socketpair(sock1, sock2);
        if (err < 0)
-diff -NurpP --minimal linux-3.0.3/net/sunrpc/auth.c linux-3.0.3-vs2.3.1-pre10/net/sunrpc/auth.c
---- linux-3.0.3/net/sunrpc/auth.c      2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/sunrpc/auth.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/sunrpc/auth.c linux-3.0.4-vs2.3.1-pre10.1/net/sunrpc/auth.c
+--- linux-3.0.4/net/sunrpc/auth.c      2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/sunrpc/auth.c      2011-06-10 22:11:24.000000000 +0200
 @@ -14,6 +14,7 @@
  #include <linux/hash.h>
  #include <linux/sunrpc/clnt.h>
@@ -28032,9 +28070,9 @@ diff -NurpP --minimal linux-3.0.3/net/sunrpc/auth.c linux-3.0.3-vs2.3.1-pre10/ne
        };
  
        dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.0.3/net/sunrpc/auth_unix.c linux-3.0.3-vs2.3.1-pre10/net/sunrpc/auth_unix.c
---- linux-3.0.3/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/sunrpc/auth_unix.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/sunrpc/auth_unix.c linux-3.0.4-vs2.3.1-pre10.1/net/sunrpc/auth_unix.c
+--- linux-3.0.4/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/sunrpc/auth_unix.c 2011-06-10 22:11:24.000000000 +0200
 @@ -12,12 +12,14 @@
  #include <linux/module.h>
  #include <linux/sunrpc/clnt.h>
@@ -28093,9 +28131,9 @@ diff -NurpP --minimal linux-3.0.3/net/sunrpc/auth_unix.c linux-3.0.3-vs2.3.1-pre
        hold = p++;
        for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
                *p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-3.0.3/net/sunrpc/clnt.c linux-3.0.3-vs2.3.1-pre10/net/sunrpc/clnt.c
---- linux-3.0.3/net/sunrpc/clnt.c      2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/sunrpc/clnt.c        2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/sunrpc/clnt.c linux-3.0.4-vs2.3.1-pre10.1/net/sunrpc/clnt.c
+--- linux-3.0.4/net/sunrpc/clnt.c      2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/sunrpc/clnt.c      2011-07-01 11:35:35.000000000 +0200
 @@ -31,6 +31,7 @@
  #include <linux/in.h>
  #include <linux/in6.h>
@@ -28114,9 +28152,9 @@ diff -NurpP --minimal linux-3.0.3/net/sunrpc/clnt.c linux-3.0.3-vs2.3.1-pre10/ne
        return clnt;
  }
  EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.0.3/net/unix/af_unix.c linux-3.0.3-vs2.3.1-pre10/net/unix/af_unix.c
---- linux-3.0.3/net/unix/af_unix.c     2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/net/unix/af_unix.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/net/unix/af_unix.c linux-3.0.4-vs2.3.1-pre10.1/net/unix/af_unix.c
+--- linux-3.0.4/net/unix/af_unix.c     2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/net/unix/af_unix.c     2011-06-10 22:11:24.000000000 +0200
 @@ -114,6 +114,8 @@
  #include <linux/mount.h>
  #include <net/checksum.h>
@@ -28154,9 +28192,9 @@ diff -NurpP --minimal linux-3.0.3/net/unix/af_unix.c linux-3.0.3-vs2.3.1-pre10/n
                sk = next_unix_socket(&iter->i, sk);
        return sk;
  }
-diff -NurpP --minimal linux-3.0.3/scripts/checksyscalls.sh linux-3.0.3-vs2.3.1-pre10/scripts/checksyscalls.sh
---- linux-3.0.3/scripts/checksyscalls.sh       2011-03-15 18:07:46.000000000 +0100
-+++ linux-3.0.3-vs2.3.1-pre10/scripts/checksyscalls.sh 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/scripts/checksyscalls.sh linux-3.0.4-vs2.3.1-pre10.1/scripts/checksyscalls.sh
+--- linux-3.0.4/scripts/checksyscalls.sh       2011-03-15 18:07:46.000000000 +0100
++++ linux-3.0.4-vs2.3.1-pre10.1/scripts/checksyscalls.sh       2011-06-10 22:11:24.000000000 +0200
 @@ -193,7 +193,6 @@ cat << EOF
  #define __IGNORE_afs_syscall
  #define __IGNORE_getpmsg
@@ -28165,9 +28203,9 @@ diff -NurpP --minimal linux-3.0.3/scripts/checksyscalls.sh linux-3.0.3-vs2.3.1-p
  EOF
  }
  
-diff -NurpP --minimal linux-3.0.3/security/commoncap.c linux-3.0.3-vs2.3.1-pre10/security/commoncap.c
---- linux-3.0.3/security/commoncap.c   2011-07-22 11:18:14.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/security/commoncap.c     2011-06-16 14:16:51.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/security/commoncap.c linux-3.0.4-vs2.3.1-pre10.1/security/commoncap.c
+--- linux-3.0.4/security/commoncap.c   2011-07-22 11:18:14.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/security/commoncap.c   2011-08-30 15:42:43.000000000 +0200
 @@ -83,14 +84,20 @@ EXPORT_SYMBOL(cap_netlink_recv);
  int cap_capable(struct task_struct *tsk, const struct cred *cred,
                struct user_namespace *targ_ns, int cap, int audit)
@@ -28209,9 +28247,9 @@ diff -NurpP --minimal linux-3.0.3/security/commoncap.c linux-3.0.3-vs2.3.1-pre10
                return -EPERM;
        return 0;
  }
-diff -NurpP --minimal linux-3.0.3/security/selinux/hooks.c linux-3.0.3-vs2.3.1-pre10/security/selinux/hooks.c
---- linux-3.0.3/security/selinux/hooks.c       2011-07-22 11:18:14.000000000 +0200
-+++ linux-3.0.3-vs2.3.1-pre10/security/selinux/hooks.c 2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.4/security/selinux/hooks.c linux-3.0.4-vs2.3.1-pre10.1/security/selinux/hooks.c
+--- linux-3.0.4/security/selinux/hooks.c       2011-07-22 11:18:14.000000000 +0200
++++ linux-3.0.4-vs2.3.1-pre10.1/security/selinux/hooks.c       2011-06-15 02:40:14.000000000 +0200
 @@ -67,7 +67,6 @@
  #include <linux/dccp.h>
  #include <linux/quota.h>

diff --git a/kernel.spec b/kernel.spec
index a38f025f0914290da9af028fd96a3136b9b98057..c2faf75c0d3d70a36a55a9e4f7d3ce86cd77ad6f 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -94,7 +94,7 @@
 
 %define                basever         3.0
 %define                postver         .4
-%define                rel             0.1
+%define                rel             1
 
 %define                _enable_debug_packages                  0
 
@@ -240,7 +240,7 @@ Patch70:    kernel-tuxonice-headers.patch
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:       kernel-hostap.patch
 
-# http://vserver.13thfloor.at/Experimental/patch-3.0.3-vs2.3.1-pre10.diff
+# http://vserver.13thfloor.at/Experimental/patch-3.0.4-vs2.3.1-pre10.1.diff
 Patch100:      kernel-vserver-2.3.patch
 Patch101:      kernel-vserver-fixes.patch