summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/Config.in99
-rw-r--r--target/Makefile14
-rw-r--r--target/alix1c/Makefile1
-rw-r--r--target/alix1c/target.mk (renamed from target/alix1c/device.mk)0
-rw-r--r--target/foxboard/target.mk (renamed from target/foxboard/device.mk)0
-rw-r--r--target/g1/target.mk (renamed from target/g1/device.mk)0
-rw-r--r--target/lemote/target.mk (renamed from target/lemote/device.mk)0
-rw-r--r--target/linux/patches/2.6.31.5/aufs2.patch454
-rw-r--r--target/native/target.mk (renamed from target/native/device.mk)0
-rw-r--r--target/qemu-arm/target.mk (renamed from target/qemu-arm/device.mk)0
-rw-r--r--target/qemu-cris/target.mk (renamed from target/qemu-cris/device.mk)0
-rw-r--r--target/qemu-mips/target.mk (renamed from target/qemu-mips/device.mk)0
-rw-r--r--target/qemu-mips64/target.mk (renamed from target/qemu-mips64/device.mk)0
-rw-r--r--target/qemu-mips64el/target.mk (renamed from target/qemu-mips64el/device.mk)0
-rw-r--r--target/qemu-mipsel/target.mk (renamed from target/qemu-mipsel/device.mk)0
-rw-r--r--target/qemu-x86/target.mk (renamed from target/qemu-x86/device.mk)0
-rw-r--r--target/qemu-x86_64/target.mk (renamed from target/qemu-x86_64/device.mk)0
-rw-r--r--target/rb411/target.mk (renamed from target/rb411/device.mk)0
-rw-r--r--target/rb433/target.mk (renamed from target/rb433/device.mk)0
-rw-r--r--target/rb532/target.mk (renamed from target/rb532/device.mk)0
-rw-r--r--target/rescue-x86/target.mk (renamed from target/rescue-x86/device.mk)0
-rw-r--r--target/rescue-x86_64/target.mk (renamed from target/rescue-x86_64/device.mk)0
-rw-r--r--target/shuttle/target.mk (renamed from target/shuttle/device.mk)0
-rw-r--r--target/tomtom/target.mk (renamed from target/tomtom/device.mk)0
-rw-r--r--target/wag54g/target.mk (renamed from target/wag54g/device.mk)0
-rw-r--r--target/zaurus/target.mk (renamed from target/zaurus/device.mk)0
26 files changed, 284 insertions, 284 deletions
diff --git a/target/Config.in b/target/Config.in
index d3b443145..18c57c7b6 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -8,7 +8,7 @@ config ADK_BROKEN
config ADK_TOOLCHAIN_ONLY
bool
-config ADK_DEVICE_NO_FPU
+config ADK_TARGET_NO_FPU
bool
config ADK_EABI
@@ -23,28 +23,28 @@ config ADK_NATIVE
config ADK_alix1c
tristate
-config ADK_qemu_arm
+config ADK_arm_qemu
tristate
-config ADK_qemu_mips
+config ADK_mips_qemu
tristate
-config ADK_qemu_mipsel
+config ADK_mipsel_qemu
tristate
-config ADK_qemu_mips64
+config ADK_mips64_qemu
tristate
-config ADK_qemu_mips64el
+config ADK_mips64el_qemu
tristate
-config ADK_qemu_cris
+config ADK_cris_qemu
tristate
-config ADK_qemu_x86
+config ADK_x86_qemu
tristate
-config ADK_qemu_x86_64
+config ADK_x86_64_qemu
tristate
config ADK_rb532
@@ -68,16 +68,16 @@ config ADK_foxboard
config ADK_lemote
tristate
-config ADK_rescue_x86
+config ADK_x86_rescue
tristate
-config ADK_rescue_x86_64
+config ADK_x86_64_rescue
tristate
-config ADK_rescue_mips
+config ADK_mips_rescue
tristate
-config ADK_rescue_mipsel
+config ADK_mipsel_rescue
tristate
config ADK_wag54g
@@ -89,17 +89,17 @@ config ADK_shuttle
config ADK_g1
tristate
-config ADK_DEVICE
+config ADK_TARGET
string
default "alix1c" if ADK_alix1c
- default "qemu-arm" if ADK_qemu_arm
- default "qemu-cris" if ADK_qemu_cris
- default "qemu-mips" if ADK_qemu_mips
- default "qemu-mipsel" if ADK_qemu_mipsel
- default "qemu-mips64" if ADK_qemu_mips64
- default "qemu-mips64el" if ADK_qemu_mips64el
- default "qemu-x86" if ADK_qemu_x86
- default "qemu-x86_64" if ADK_qemu_x86_64
+ default "qemu-arm" if ADK_arm_qemu
+ default "qemu-cris" if ADK_cris_qemu
+ default "qemu-mips" if ADK_mips_qemu
+ default "qemu-mipsel" if ADK_mipsel_qemu
+ default "qemu-mips64" if ADK_mips64_qemu
+ default "qemu-mips64el" if ADK_mips64el_qemu
+ default "qemu-x86" if ADK_x86_qemu
+ default "qemu-x86_64" if ADK_x86_64_qemu
default "foxboard" if ADK_foxboard
default "native" if ADK_NATIVE
default "rb532" if ADK_rb532
@@ -108,10 +108,10 @@ config ADK_DEVICE
default "zaurus" if ADK_arm
default "lemote" if ADK_lemote
default "wag54g" if ADK_wag54g
- default "rescue-x86" if ADK_rescue_x86
- default "rescue-x86_64" if ADK_rescue_x86_64
- default "rescue-mips" if ADK_rescue_mips
- default "rescue-mipsel" if ADK_rescue_mipsel
+ default "rescue-x86" if ADK_x86_rescue
+ default "rescue-x86_64" if ADK_x86_64_rescue
+ default "rescue-mips" if ADK_mips_rescue
+ default "rescue-mipsel" if ADK_mipsel_rescue
default "shuttle" if ADK_shuttle
default "tomtom" if ADK_tomtom
default "g1" if ADK_g1
@@ -119,7 +119,7 @@ config ADK_DEVICE
menu "Target system"
choice
-prompt "Embedded Device"
+prompt "Embedded Device or Emulator"
default ADK_LINUX_NATIVE
config ADK_LINUX_NATIVE
@@ -184,7 +184,7 @@ config ADK_LINUX_MIPS_WAG54G
config ADK_LINUX_ARM_TOMTOM
bool "TomTom Applications"
select ADK_tomtom
- select ADK_DEVICE_NO_FPU
+ select ADK_TARGET_NO_FPU
select ADK_EABI
select ADK_TOOLCHAIN_ONLY
help
@@ -195,7 +195,7 @@ config ADK_LINUX_ARM_TOMTOM
config ADK_LINUX_ARM_G1
bool "Google G1 Applications"
select ADK_g1
- select ADK_DEVICE_NO_FPU
+ select ADK_TARGET_NO_FPU
select ADK_EABI
select ADK_TOOLCHAIN_ONLY
help
@@ -205,9 +205,8 @@ config ADK_LINUX_ARM_G1
#config ADK_LINUX_XSCALE_ZAURUS
# bool "Zaurus SL-C3200"
-# depends on ADK_BROKEN
# select ADK_zaurus
-# select ADK_DEVICE_NO_FPU
+# select ADK_TARGET_NO_FPU
# help
# Support for Sharp Zaurus SL-C3200 (aka Terrier)
@@ -242,7 +241,6 @@ config ADK_LINUX_X86_64_SHUTTLE
select ADK_KPACKAGE_KMOD_MD_RAID1 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
help
Support for a nice and fast shuttle xpc with AMD quad-core CPU.
- Known as OpenADK multi operating system buildserver.
endchoice
@@ -252,25 +250,25 @@ depends on ADK_LINUX_RESCUE
config ADK_LINUX_X86_64_RESCUE
bool "x86_64"
- select ADK_rescue_x86_64
+ select ADK_x86_64_rescue
help
X86 architecture.
config ADK_LINUX_X86_RESCUE
bool "x86"
- select ADK_rescue_x86
+ select ADK_x86_rescue
help
X86 architecture.
config ADK_LINUX_MIPSEL_RESCUE
bool "mips (little endian)"
- select ADK_rescue_mipsel
+ select ADK_mipsel_rescue
help
MIPS LE architecture.
config ADK_LINUX_MIPS_RESCUE
bool "mips (big endian)"
- select ADK_rescue_mips
+ select ADK_mips_rescue
help
MIPS BE architecture.
@@ -282,7 +280,7 @@ depends on ADK_LINUX_QEMU
config ADK_LINUX_ARM_QEMU
bool "arm"
- select ADK_qemu_arm
+ select ADK_arm_qemu
select ADK_EABI
help
Qemu support for ARM architecture.
@@ -290,40 +288,40 @@ config ADK_LINUX_ARM_QEMU
config ADK_LINUX_MIPS_QEMU
bool "mips (big endian)"
- select ADK_qemu_mips
+ select ADK_mips_qemu
help
Qemu support for MIPS BE architecture.
config ADK_LINUX_MIPSEL_QEMU
bool "mipsel (little endian)"
- select ADK_qemu_mipsel
+ select ADK_mipsel_qemu
help
Qemu support for MIPS LE architecture.
config ADK_LINUX_MIPS64_QEMU
bool "mips64 (big endian)"
- select ADK_qemu_mips64
+ select ADK_mips64_qemu
select ADK_LINUX_64
help
Qemu support for MIPS64 BE architecture.
config ADK_LINUX_MIPS64EL_QEMU
bool "mips64 (little endian)"
- select ADK_qemu_mips64el
+ select ADK_mips64el_qemu
select ADK_LINUX_64
help
Qemu support for MIPS64 LE architecture.
config ADK_LINUX_CRIS_QEMU
bool "cris"
- select ADK_qemu_cris
+ select ADK_cris_qemu
# select ADK_BROKEN
help
Qemu support for CRISv32 architecture.
config ADK_LINUX_X86_QEMU
bool "x86"
- select ADK_qemu_x86
+ select ADK_x86_qemu
select ADK_KPACKAGE_KMOD_NE2K_PCI
select ADK_KERNEL_INPUT_KEYBOARD
help
@@ -331,7 +329,7 @@ config ADK_LINUX_X86_QEMU
config ADK_LINUX_X86_64_QEMU
bool "x86_64"
- select ADK_qemu_x86_64
+ select ADK_x86_64_qemu
select ADK_KPACKAGE_KMOD_NE2K_PCI
select ADK_KERNEL_INPUT_KEYBOARD
help
@@ -416,6 +414,7 @@ config ADK_TARGET_LIB_EGLIBC
ADK_LINUX_MIPS64EL_QEMU || \
ADK_LINUX_X86_ALIX1C || \
ADK_LINUX_MIPS_RB411 || \
+ ADK_LINUX_MIPS_RB433 || \
ADK_LINUX_MIPS_RB532 || \
ADK_LINUX_RESCUE || \
ADK_LINUX_X86_64_SHUTTLE || \
@@ -435,6 +434,7 @@ config ADK_TARGET_LIB_GLIBC
ADK_LINUX_MIPS64EL_QEMU || \
ADK_LINUX_X86_ALIX1C || \
ADK_LINUX_MIPS_RB411 || \
+ ADK_LINUX_MIPS_RB433 || \
ADK_LINUX_RESCUE || \
ADK_LINUX_X86_64_SHUTTLE || \
ADK_LINUX_ARM_TOMTOM || \
@@ -456,7 +456,7 @@ config ADK_TARGET_SUFFIX
choice
prompt "Target Firmware type"
depends on !ADK_TOOLCHAIN_ONLY
- default ADK_TARGET_ROOTFS_EXT2_CF
+ default ADK_TARGET_ROOTFS_ARCHIVE
config ADK_TARGET_ROOTFS_INITRAMFS
bool "initramfs filesystem"
@@ -699,13 +699,13 @@ config ADK_TARGET_PACKAGE_TGZ
boolean
prompt "gzip compressed tar archive"
help
- Create simple compressed tar archives.
+ Create compressed tar archives.
config ADK_TARGET_PACKAGE_RPM
boolean
prompt "rpm package format"
help
- Create rpm binary packages.
+ Create rpm packages.
endchoice
@@ -721,7 +721,7 @@ config ADK_CXX
bool "Enable C++ support"
default n
help
- Enable C++ Compiler and Libraries
+ Enable C++ compiler and libraries.
config ADK_IPV6
bool "Enable IPv6 support"
@@ -731,7 +731,7 @@ config ADK_IPV6
select BUSYBOX_FEATURE_IFUPDOWN_IPV6
select BUSYBOX_PING6
help
- Enable basic IPv6 support (kmod-ipv6) and
+ Enable basic IPv6 support and
make the IPv6 support options in packages visible.
config ADK_X11
@@ -742,5 +742,4 @@ config ADK_X11
Try to compile other packages with X11 support.
(f.e. mplayer)
-
endmenu
diff --git a/target/Makefile b/target/Makefile
index 63c3e58cc..b3f266ee0 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -41,9 +41,9 @@ config-prepare: $(TOPDIR)/.config
>${BUILD_DIR}/.kernelconfig.nokernel
# if native build, first try /proc/config.gz
ifeq ($(ADK_NATIVE),y)
- @if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${DEVICE}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi
+ @if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi
else
- @cp ${DEVICE}/kernel.config ${BUILD_DIR}/.kernelconfig.board
+ @cp ${ADK_TARGET}/kernel.config ${BUILD_DIR}/.kernelconfig.board
endif
@(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \
while IFS='=' read symbol value; do \
@@ -62,11 +62,11 @@ endif
cp .kernelconfig.tmp .kernelconfig
@-rm -f ${BUILD_DIR}/.kernelconfig.tmp
-prepare: $(DEVICE)-prepare
-compile: $(DEVICE)-compile
-image: $(DEVICE)-imageclean $(DEVICE)-imageinstall
-install: $(DEVICE)-imageclean $(DEVICE)-install $(DEVICE)-imageinstall
-clean: $(DEVICE)-clean $(DEVICE)-imageclean
+prepare: $(ADK_TARGET)-prepare
+compile: $(ADK_TARGET)-compile
+image: $(ADK_TARGET)-imageclean $(ADK_TARGET)-imageinstall
+install: $(ADK_TARGET)-imageclean $(ADK_TARGET)-install $(ADK_TARGET)-imageinstall
+clean: $(ADK_TARGET)-clean $(ADK_TARGET)-imageclean
%-clean:
$(TRACE) target/$(patsubst %-clean,%,$@)-clean
diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile
index 539a1fdba..64f442027 100644
--- a/target/alix1c/Makefile
+++ b/target/alix1c/Makefile
@@ -20,7 +20,6 @@ endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
- @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/alix1c/device.mk b/target/alix1c/target.mk
index 18f3c923e..18f3c923e 100644
--- a/target/alix1c/device.mk
+++ b/target/alix1c/target.mk
diff --git a/target/foxboard/device.mk b/target/foxboard/target.mk
index 0dabf25ab..0dabf25ab 100644
--- a/target/foxboard/device.mk
+++ b/target/foxboard/target.mk
diff --git a/target/g1/device.mk b/target/g1/target.mk
index a19b67034..a19b67034 100644
--- a/target/g1/device.mk
+++ b/target/g1/target.mk
diff --git a/target/lemote/device.mk b/target/lemote/target.mk
index 2702be95b..2702be95b 100644
--- a/target/lemote/device.mk
+++ b/target/lemote/target.mk
diff --git a/target/linux/patches/2.6.31.5/aufs2.patch b/target/linux/patches/2.6.31.5/aufs2.patch
index 7a6d3bac6..6c40cfb81 100644
--- a/target/linux/patches/2.6.31.5/aufs2.patch
+++ b/target/linux/patches/2.6.31.5/aufs2.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/debugfs-aufs linux-2.6.31.4/Documentation/ABI/testing/debugfs-aufs
---- linux-2.6.31.4.orig/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/Documentation/ABI/testing/debugfs-aufs 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/Documentation/ABI/testing/debugfs-aufs linux-2.6.31.5/Documentation/ABI/testing/debugfs-aufs
+--- linux-2.6.31.5.orig/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/Documentation/ABI/testing/debugfs-aufs 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,40 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@@ -42,9 +42,9 @@ diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/debugfs-aufs linux-2.6.3
+ When the aufs mount option 'noxino' is specified, it
+ will be empty. About XINO files, see
+ Documentation/filesystems/aufs/aufs.5 in detail.
-diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/sysfs-aufs linux-2.6.31.4/Documentation/ABI/testing/sysfs-aufs
---- linux-2.6.31.4.orig/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/Documentation/ABI/testing/sysfs-aufs 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/Documentation/ABI/testing/sysfs-aufs linux-2.6.31.5/Documentation/ABI/testing/sysfs-aufs
+--- linux-2.6.31.5.orig/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/Documentation/ABI/testing/sysfs-aufs 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,25 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@@ -71,9 +71,9 @@ diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/sysfs-aufs linux-2.6.31.
+ When the aufs mount option 'noxino' is specified, it
+ will be empty. About XINO files, see
+ Documentation/filesystems/aufs/aufs.5 in detail.
-diff -Nur linux-2.6.31.4.orig/fs/aufs/aufs.h linux-2.6.31.4/fs/aufs/aufs.h
---- linux-2.6.31.4.orig/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/aufs.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/aufs.h linux-2.6.31.5/fs/aufs/aufs.h
+--- linux-2.6.31.5.orig/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/aufs.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -126,9 +126,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/aufs.h linux-2.6.31.4/fs/aufs/aufs.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.c linux-2.6.31.4/fs/aufs/branch.c
---- linux-2.6.31.4.orig/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/branch.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/branch.c linux-2.6.31.5/fs/aufs/branch.c
+--- linux-2.6.31.5.orig/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/branch.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,974 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -1104,9 +1104,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.c linux-2.6.31.4/fs/aufs/branch.c
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.h linux-2.6.31.4/fs/aufs/branch.h
---- linux-2.6.31.4.orig/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/branch.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/branch.h linux-2.6.31.5/fs/aufs/branch.h
+--- linux-2.6.31.5.orig/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/branch.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -1327,9 +1327,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.h linux-2.6.31.4/fs/aufs/branch.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_BRANCH_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.c linux-2.6.31.4/fs/aufs/cpup.c
---- linux-2.6.31.4.orig/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/cpup.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/cpup.c linux-2.6.31.5/fs/aufs/cpup.c
+--- linux-2.6.31.5.orig/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/cpup.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,1048 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -2379,9 +2379,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.c linux-2.6.31.4/fs/aufs/cpup.c
+ dput(parent);
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.h linux-2.6.31.4/fs/aufs/cpup.h
---- linux-2.6.31.4.orig/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/cpup.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/cpup.h linux-2.6.31.5/fs/aufs/cpup.h
+--- linux-2.6.31.5.orig/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/cpup.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -2464,9 +2464,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.h linux-2.6.31.4/fs/aufs/cpup.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_CPUP_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.c linux-2.6.31.4/fs/aufs/dbgaufs.c
---- linux-2.6.31.4.orig/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dbgaufs.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dbgaufs.c linux-2.6.31.5/fs/aufs/dbgaufs.c
+--- linux-2.6.31.5.orig/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dbgaufs.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,331 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -2799,9 +2799,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.c linux-2.6.31.4/fs/aufs/dbgaufs.c
+ err = 0;
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.h linux-2.6.31.4/fs/aufs/dbgaufs.h
---- linux-2.6.31.4.orig/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dbgaufs.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dbgaufs.h linux-2.6.31.5/fs/aufs/dbgaufs.h
+--- linux-2.6.31.5.orig/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dbgaufs.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -2882,9 +2882,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.h linux-2.6.31.4/fs/aufs/dbgaufs.h
+
+#endif /* __KERNEL__ */
+#endif /* __DBGAUFS_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.c linux-2.6.31.4/fs/aufs/dcsub.c
---- linux-2.6.31.4.orig/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dcsub.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dcsub.c linux-2.6.31.5/fs/aufs/dcsub.c
+--- linux-2.6.31.5.orig/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dcsub.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -3109,9 +3109,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.c linux-2.6.31.4/fs/aufs/dcsub.c
+ out:
+ return trap;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.h linux-2.6.31.4/fs/aufs/dcsub.h
---- linux-2.6.31.4.orig/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dcsub.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dcsub.h linux-2.6.31.5/fs/aufs/dcsub.h
+--- linux-2.6.31.5.orig/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dcsub.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -3167,9 +3167,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.h linux-2.6.31.4/fs/aufs/dcsub.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DCSUB_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.c linux-2.6.31.4/fs/aufs/debug.c
---- linux-2.6.31.4.orig/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/debug.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/debug.c linux-2.6.31.5/fs/aufs/debug.c
+--- linux-2.6.31.5.orig/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/debug.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,427 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -3598,10 +3598,10 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.c linux-2.6.31.4/fs/aufs/debug.c
+
+ return 0;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.h linux-2.6.31.4/fs/aufs/debug.h
---- linux-2.6.31.4.orig/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/debug.h 2009-10-18 11:26:01.000000000 +0200
-@@ -0,0 +1,260 @@
+diff -Nur linux-2.6.31.5.orig/fs/aufs/debug.h linux-2.6.31.5/fs/aufs/debug.h
+--- linux-2.6.31.5.orig/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/debug.h 2009-11-15 22:16:14.000000000 +0100
+@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
+ *
@@ -3629,9 +3629,10 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.h linux-2.6.31.4/fs/aufs/debug.h
+
+#ifdef __KERNEL__
+
++#include <asm/system.h>
+#include <linux/bug.h>
+/* #include <linux/err.h> */
-+/* #include <linux/init.h> */
++#include <linux/init.h>
+/* #include <linux/kernel.h> */
+#include <linux/delay.h>
+/* #include <linux/kd.h> */
@@ -3862,9 +3863,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.h linux-2.6.31.4/fs/aufs/debug.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DEBUG_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.c linux-2.6.31.4/fs/aufs/dentry.c
---- linux-2.6.31.4.orig/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dentry.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dentry.c linux-2.6.31.5/fs/aufs/dentry.c
+--- linux-2.6.31.5.orig/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dentry.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,880 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -4746,9 +4747,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.c linux-2.6.31.4/fs/aufs/dentry.c
+ .d_revalidate = aufs_d_revalidate,
+ .d_release = aufs_d_release
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.h linux-2.6.31.4/fs/aufs/dentry.h
---- linux-2.6.31.4.orig/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dentry.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dentry.h linux-2.6.31.5/fs/aufs/dentry.h
+--- linux-2.6.31.5.orig/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dentry.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,231 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -4981,9 +4982,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.h linux-2.6.31.4/fs/aufs/dentry.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DENTRY_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dinfo.c linux-2.6.31.4/fs/aufs/dinfo.c
---- linux-2.6.31.4.orig/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dinfo.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dinfo.c linux-2.6.31.5/fs/aufs/dinfo.c
+--- linux-2.6.31.5.orig/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dinfo.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,367 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -5352,9 +5353,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dinfo.c linux-2.6.31.4/fs/aufs/dinfo.c
+ return bindex;
+ return -1;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.c linux-2.6.31.4/fs/aufs/dir.c
---- linux-2.6.31.4.orig/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dir.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dir.c linux-2.6.31.5/fs/aufs/dir.c
+--- linux-2.6.31.5.orig/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dir.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,538 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -5894,9 +5895,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.c linux-2.6.31.4/fs/aufs/dir.c
+ .flush = aufs_flush,
+ .fsync = aufs_fsync_dir
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.h linux-2.6.31.4/fs/aufs/dir.h
---- linux-2.6.31.4.orig/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dir.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dir.h linux-2.6.31.5/fs/aufs/dir.h
+--- linux-2.6.31.5.orig/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dir.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -6012,10 +6013,10 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.h linux-2.6.31.4/fs/aufs/dir.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DIR_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/export.c linux-2.6.31.4/fs/aufs/export.c
---- linux-2.6.31.4.orig/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/export.c 2009-10-18 11:26:01.000000000 +0200
-@@ -0,0 +1,745 @@
+diff -Nur linux-2.6.31.5.orig/fs/aufs/export.c linux-2.6.31.5/fs/aufs/export.c
+--- linux-2.6.31.5.orig/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/export.c 2009-11-15 22:27:33.000000000 +0100
+@@ -0,0 +1,746 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
+ *
@@ -6041,6 +6042,7 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/export.c linux-2.6.31.4/fs/aufs/export.c
+#include <linux/exportfs.h>
+#include <linux/file.h>
+#include <linux/mnt_namespace.h>
++#include <linux/nsproxy.h>
+#include <linux/namei.h>
+#include <linux/random.h>
+#include "aufs.h"
@@ -6761,9 +6763,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/export.c linux-2.6.31.4/fs/aufs/export.c
+ BUILD_BUG_ON(sizeof(u) != sizeof(int));
+ atomic_set(&sbinfo->si_xigen_next, u);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/file.c linux-2.6.31.4/fs/aufs/file.c
---- linux-2.6.31.4.orig/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/file.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/file.c linux-2.6.31.5/fs/aufs/file.c
+--- linux-2.6.31.5.orig/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/file.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,578 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -7343,9 +7345,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/file.c linux-2.6.31.4/fs/aufs/file.c
+ .direct_IO = aufs_direct_IO,
+#endif /* CONFIG_AUFS_DEBUG */
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/file.h linux-2.6.31.4/fs/aufs/file.h
---- linux-2.6.31.4.orig/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/file.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/file.h linux-2.6.31.5/fs/aufs/file.h
+--- linux-2.6.31.5.orig/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/file.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -7522,9 +7524,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/file.h linux-2.6.31.4/fs/aufs/file.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_FILE_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/finfo.c linux-2.6.31.4/fs/aufs/finfo.c
---- linux-2.6.31.4.orig/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/finfo.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/finfo.c linux-2.6.31.5/fs/aufs/finfo.c
+--- linux-2.6.31.5.orig/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/finfo.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -7659,9 +7661,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/finfo.c linux-2.6.31.4/fs/aufs/finfo.c
+
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/f_op.c linux-2.6.31.4/fs/aufs/f_op.c
---- linux-2.6.31.4.orig/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/f_op.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/f_op.c linux-2.6.31.5/fs/aufs/f_op.c
+--- linux-2.6.31.5.orig/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/f_op.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,802 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -8465,9 +8467,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/f_op.c linux-2.6.31.4/fs/aufs/f_op.c
+ .aio_splice_read = aufs_aio_splice_read
+#endif
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/fstype.h linux-2.6.31.4/fs/aufs/fstype.h
---- linux-2.6.31.4.orig/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/fstype.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/fstype.h linux-2.6.31.5/fs/aufs/fstype.h
+--- linux-2.6.31.5.orig/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/fstype.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,474 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -8943,9 +8945,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/fstype.h linux-2.6.31.4/fs/aufs/fstype.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_FSTYPE_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/hinotify.c linux-2.6.31.4/fs/aufs/hinotify.c
---- linux-2.6.31.4.orig/fs/aufs/hinotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/hinotify.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/hinotify.c linux-2.6.31.5/fs/aufs/hinotify.c
+--- linux-2.6.31.5.orig/fs/aufs/hinotify.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/hinotify.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,755 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -9702,9 +9704,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/hinotify.c linux-2.6.31.4/fs/aufs/hinotify
+ if (au_cachep[AuCache_HINOTIFY])
+ au_hin_destroy_cache();
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/iinfo.c linux-2.6.31.4/fs/aufs/iinfo.c
---- linux-2.6.31.4.orig/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/iinfo.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/iinfo.c linux-2.6.31.5/fs/aufs/iinfo.c
+--- linux-2.6.31.5.orig/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/iinfo.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,283 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -9989,9 +9991,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/iinfo.c linux-2.6.31.4/fs/aufs/iinfo.c
+ kfree(iinfo->ii_hinode);
+ AuRwDestroy(&iinfo->ii_rwsem);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.c linux-2.6.31.4/fs/aufs/inode.c
---- linux-2.6.31.4.orig/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/inode.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/inode.c linux-2.6.31.5/fs/aufs/inode.c
+--- linux-2.6.31.5.orig/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/inode.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,380 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -10373,9 +10375,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.c linux-2.6.31.4/fs/aufs/inode.c
+ mask |= MAY_READ; /* force permission check */
+ return au_test_h_perm(h_inode, mask);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.h linux-2.6.31.4/fs/aufs/inode.h
---- linux-2.6.31.4.orig/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/inode.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/inode.h linux-2.6.31.5/fs/aufs/inode.h
+--- linux-2.6.31.5.orig/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/inode.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -10861,9 +10863,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.h linux-2.6.31.4/fs/aufs/inode.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_INODE_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/ioctl.c linux-2.6.31.4/fs/aufs/ioctl.c
---- linux-2.6.31.4.orig/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/ioctl.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/ioctl.c linux-2.6.31.5/fs/aufs/ioctl.c
+--- linux-2.6.31.5.orig/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/ioctl.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -10932,9 +10934,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/ioctl.c linux-2.6.31.4/fs/aufs/ioctl.c
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_add.c linux-2.6.31.4/fs/aufs/i_op_add.c
---- linux-2.6.31.4.orig/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/i_op_add.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op_add.c linux-2.6.31.5/fs/aufs/i_op_add.c
+--- linux-2.6.31.5.orig/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/i_op_add.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,649 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -11585,9 +11587,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_add.c linux-2.6.31.4/fs/aufs/i_op_add
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op.c linux-2.6.31.4/fs/aufs/i_op.c
---- linux-2.6.31.4.orig/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/i_op.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op.c linux-2.6.31.5/fs/aufs/i_op.c
+--- linux-2.6.31.5.orig/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/i_op.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,872 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -12461,9 +12463,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op.c linux-2.6.31.4/fs/aufs/i_op.c
+ .getattr = aufs_getattr,
+ .truncate_range = aufs_truncate_range
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_del.c linux-2.6.31.4/fs/aufs/i_op_del.c
---- linux-2.6.31.4.orig/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/i_op_del.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op_del.c linux-2.6.31.5/fs/aufs/i_op_del.c
+--- linux-2.6.31.5.orig/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/i_op_del.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,468 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -12933,9 +12935,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_del.c linux-2.6.31.4/fs/aufs/i_op_del
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_ren.c linux-2.6.31.4/fs/aufs/i_op_ren.c
---- linux-2.6.31.4.orig/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/i_op_ren.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op_ren.c linux-2.6.31.5/fs/aufs/i_op_ren.c
+--- linux-2.6.31.5.orig/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/i_op_ren.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,948 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -13885,9 +13887,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_ren.c linux-2.6.31.4/fs/aufs/i_op_ren
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/Kconfig linux-2.6.31.4/fs/aufs/Kconfig
---- linux-2.6.31.4.orig/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/Kconfig 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/Kconfig linux-2.6.31.5/fs/aufs/Kconfig
+--- linux-2.6.31.5.orig/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/Kconfig 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,132 @@
+config AUFS_FS
+ tristate "Aufs (Advanced multi layered unification filesystem) support"
@@ -14021,9 +14023,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/Kconfig linux-2.6.31.4/fs/aufs/Kconfig
+ help
+ Automatic configuration for internal use.
+endif
-diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.c linux-2.6.31.4/fs/aufs/loop.c
---- linux-2.6.31.4.orig/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/loop.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/loop.c linux-2.6.31.5/fs/aufs/loop.c
+--- linux-2.6.31.5.orig/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/loop.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -14080,9 +14082,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.c linux-2.6.31.4/fs/aufs/loop.c
+ && '0' <= c && c <= '9'
+ && strncmp(current->comm, "loop", 4) == 0;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.h linux-2.6.31.4/fs/aufs/loop.h
---- linux-2.6.31.4.orig/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/loop.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/loop.h linux-2.6.31.5/fs/aufs/loop.h
+--- linux-2.6.31.5.orig/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/loop.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -14135,9 +14137,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.h linux-2.6.31.4/fs/aufs/loop.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_LOOP_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/magic.mk linux-2.6.31.4/fs/aufs/magic.mk
---- linux-2.6.31.4.orig/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/magic.mk 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/magic.mk linux-2.6.31.5/fs/aufs/magic.mk
+--- linux-2.6.31.5.orig/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/magic.mk 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,52 @@
+
+# defined in ${srctree}/fs/fuse/inode.c
@@ -14191,9 +14193,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/magic.mk linux-2.6.31.4/fs/aufs/magic.mk
+ifdef CONFIG_UBIFS_FS
+ccflags-y += -DUBIFS_SUPER_MAGIC=0x24051905
+endif
-diff -Nur linux-2.6.31.4.orig/fs/aufs/Makefile linux-2.6.31.4/fs/aufs/Makefile
---- linux-2.6.31.4.orig/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/Makefile 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/Makefile linux-2.6.31.5/fs/aufs/Makefile
+--- linux-2.6.31.5.orig/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/Makefile 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,23 @@
+
+include ${src}/magic.mk
@@ -14218,9 +14220,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/Makefile linux-2.6.31.4/fs/aufs/Makefile
+aufs-$(CONFIG_AUFS_POLL) += poll.o
+aufs-$(CONFIG_AUFS_DEBUG) += debug.o
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
-diff -Nur linux-2.6.31.4.orig/fs/aufs/module.c linux-2.6.31.4/fs/aufs/module.c
---- linux-2.6.31.4.orig/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/module.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/module.c linux-2.6.31.5/fs/aufs/module.c
+--- linux-2.6.31.5.orig/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/module.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -14395,9 +14397,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/module.c linux-2.6.31.4/fs/aufs/module.c
+
+module_init(aufs_init);
+module_exit(aufs_exit);
-diff -Nur linux-2.6.31.4.orig/fs/aufs/module.h linux-2.6.31.4/fs/aufs/module.h
---- linux-2.6.31.4.orig/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/module.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/module.h linux-2.6.31.5/fs/aufs/module.h
+--- linux-2.6.31.5.orig/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/module.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -14477,9 +14479,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/module.h linux-2.6.31.4/fs/aufs/module.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_MODULE_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.c linux-2.6.31.4/fs/aufs/opts.c
---- linux-2.6.31.4.orig/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/opts.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/opts.c linux-2.6.31.5/fs/aufs/opts.c
+--- linux-2.6.31.5.orig/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/opts.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,1543 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16024,9 +16026,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.c linux-2.6.31.4/fs/aufs/opts.c
+{
+ return au_mntflags(sb) & AuOptMask_UDBA;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.h linux-2.6.31.4/fs/aufs/opts.h
---- linux-2.6.31.4.orig/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/opts.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/opts.h linux-2.6.31.5/fs/aufs/opts.h
+--- linux-2.6.31.5.orig/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/opts.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16224,9 +16226,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.h linux-2.6.31.4/fs/aufs/opts.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_OPTS_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/plink.c linux-2.6.31.4/fs/aufs/plink.c
---- linux-2.6.31.4.orig/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/plink.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/plink.c linux-2.6.31.5/fs/aufs/plink.c
+--- linux-2.6.31.5.orig/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/plink.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16582,9 +16584,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/plink.c linux-2.6.31.4/fs/aufs/plink.c
+ iput(inode);
+ }
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/poll.c linux-2.6.31.4/fs/aufs/poll.c
---- linux-2.6.31.4.orig/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/poll.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/poll.c linux-2.6.31.5/fs/aufs/poll.c
+--- linux-2.6.31.5.orig/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/poll.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16642,9 +16644,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/poll.c linux-2.6.31.4/fs/aufs/poll.c
+ AuTraceErr((int)mask);
+ return mask;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/rwsem.h linux-2.6.31.4/fs/aufs/rwsem.h
---- linux-2.6.31.4.orig/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/rwsem.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/rwsem.h linux-2.6.31.5/fs/aufs/rwsem.h
+--- linux-2.6.31.5.orig/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/rwsem.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16832,9 +16834,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/rwsem.h linux-2.6.31.4/fs/aufs/rwsem.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_RWSEM_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sbinfo.c linux-2.6.31.4/fs/aufs/sbinfo.c
---- linux-2.6.31.4.orig/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sbinfo.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sbinfo.c linux-2.6.31.5/fs/aufs/sbinfo.c
+--- linux-2.6.31.5.orig/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sbinfo.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -17044,9 +17046,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sbinfo.c linux-2.6.31.4/fs/aufs/sbinfo.c
+ di_write_unlock2(d1, d2);
+ si_read_unlock(d1->d_sb);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/spl.h linux-2.6.31.4/fs/aufs/spl.h
---- linux-2.6.31.4.orig/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/spl.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/spl.h linux-2.6.31.5/fs/aufs/spl.h
+--- linux-2.6.31.5.orig/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/spl.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -17105,9 +17107,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/spl.h linux-2.6.31.4/fs/aufs/spl.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_SPL_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/super.c linux-2.6.31.4/fs/aufs/super.c
---- linux-2.6.31.4.orig/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/super.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/super.c linux-2.6.31.5/fs/aufs/super.c
+--- linux-2.6.31.5.orig/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/super.c 2009-11-15 22:20:26.000000000 +0100
@@ -0,0 +1,874 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -17494,7 +17496,7 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/super.c linux-2.6.31.4/fs/aufs/super.c
+ lockdep_off();
+ down_write(&h_sb->s_umount);
+ shrink_dcache_sb(h_sb);
-+ fsync_super(h_sb);
++ sync_filesystem(h_sb);
+ up_write(&h_sb->s_umount);
+ lockdep_on();
+ }
@@ -17983,9 +17985,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/super.c linux-2.6.31.4/fs/aufs/super.c
+ /* no need to __module_get() and module_put(). */
+ .owner = THIS_MODULE,
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/super.h linux-2.6.31.4/fs/aufs/super.h
---- linux-2.6.31.4.orig/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/super.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/super.h linux-2.6.31.5/fs/aufs/super.h
+--- linux-2.6.31.5.orig/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/super.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,384 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18371,9 +18373,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/super.h linux-2.6.31.4/fs/aufs/super.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_SUPER_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.c linux-2.6.31.4/fs/aufs/sysaufs.c
---- linux-2.6.31.4.orig/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sysaufs.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sysaufs.c linux-2.6.31.5/fs/aufs/sysaufs.c
+--- linux-2.6.31.5.orig/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sysaufs.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18479,9 +18481,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.c linux-2.6.31.4/fs/aufs/sysaufs.c
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.h linux-2.6.31.4/fs/aufs/sysaufs.h
---- linux-2.6.31.4.orig/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sysaufs.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sysaufs.h linux-2.6.31.5/fs/aufs/sysaufs.h
+--- linux-2.6.31.5.orig/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sysaufs.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18603,9 +18605,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.h linux-2.6.31.4/fs/aufs/sysaufs.h
+
+#endif /* __KERNEL__ */
+#endif /* __SYSAUFS_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sysfs.c linux-2.6.31.4/fs/aufs/sysfs.c
---- linux-2.6.31.4.orig/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sysfs.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sysfs.c linux-2.6.31.5/fs/aufs/sysfs.c
+--- linux-2.6.31.5.orig/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sysfs.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18817,9 +18819,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysfs.c linux-2.6.31.4/fs/aufs/sysfs.c
+ AuWarn("failed %s under sysfs(%d)\n", br->br_name, err);
+ }
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sysrq.c linux-2.6.31.4/fs/aufs/sysrq.c
---- linux-2.6.31.4.orig/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sysrq.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sysrq.c linux-2.6.31.5/fs/aufs/sysrq.c
+--- linux-2.6.31.5.orig/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sysrq.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18936,9 +18938,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysrq.c linux-2.6.31.4/fs/aufs/sysrq.c
+ if (unlikely(err))
+ AuErr("err %d (ignored)\n", err);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/vdir.c linux-2.6.31.4/fs/aufs/vdir.c
---- linux-2.6.31.4.orig/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/vdir.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/vdir.c linux-2.6.31.5/fs/aufs/vdir.c
+--- linux-2.6.31.5.orig/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/vdir.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,882 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -19822,9 +19824,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/vdir.c linux-2.6.31.4/fs/aufs/vdir.c
+ /* smp_mb(); */
+ return 0;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.c linux-2.6.31.4/fs/aufs/vfsub.c
---- linux-2.6.31.4.orig/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/vfsub.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/vfsub.c linux-2.6.31.5/fs/aufs/vfsub.c
+--- linux-2.6.31.5.orig/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/vfsub.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,740 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -20566,9 +20568,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.c linux-2.6.31.4/fs/aufs/vfsub.c
+
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.h linux-2.6.31.4/fs/aufs/vfsub.h
---- linux-2.6.31.4.orig/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/vfsub.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/vfsub.h linux-2.6.31.5/fs/aufs/vfsub.h
+--- linux-2.6.31.5.orig/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/vfsub.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -20742,9 +20744,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.h linux-2.6.31.4/fs/aufs/vfsub.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_VFSUB_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/wbr_policy.c linux-2.6.31.4/fs/aufs/wbr_policy.c
---- linux-2.6.31.4.orig/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/wbr_policy.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/wbr_policy.c linux-2.6.31.5/fs/aufs/wbr_policy.c
+--- linux-2.6.31.5.orig/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/wbr_policy.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,641 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -21387,9 +21389,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/wbr_policy.c linux-2.6.31.4/fs/aufs/wbr_po
+ .fin = au_wbr_create_fin_mfs
+ }
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.c linux-2.6.31.4/fs/aufs/whout.c
---- linux-2.6.31.4.orig/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/whout.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/whout.c linux-2.6.31.5/fs/aufs/whout.c
+--- linux-2.6.31.5.orig/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/whout.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,1048 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -22439,9 +22441,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.c linux-2.6.31.4/fs/aufs/whout.c
+ au_whtmp_rmdir_free(args);
+ }
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.h linux-2.6.31.4/fs/aufs/whout.h
---- linux-2.6.31.4.orig/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/whout.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/whout.h linux-2.6.31.5/fs/aufs/whout.h
+--- linux-2.6.31.5.orig/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/whout.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -22530,9 +22532,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.h linux-2.6.31.4/fs/aufs/whout.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_WHOUT_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/wkq.c linux-2.6.31.4/fs/aufs/wkq.c
---- linux-2.6.31.4.orig/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/wkq.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/wkq.c linux-2.6.31.5/fs/aufs/wkq.c
+--- linux-2.6.31.5.orig/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/wkq.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -22793,9 +22795,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/wkq.c linux-2.6.31.4/fs/aufs/wkq.c
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/wkq.h linux-2.6.31.4/fs/aufs/wkq.h
---- linux-2.6.31.4.orig/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/wkq.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/wkq.h linux-2.6.31.5/fs/aufs/wkq.h
+--- linux-2.6.31.5.orig/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/wkq.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -22879,9 +22881,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/wkq.h linux-2.6.31.4/fs/aufs/wkq.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_WKQ_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/xino.c linux-2.6.31.4/fs/aufs/xino.c
---- linux-2.6.31.4.orig/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/xino.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/xino.c linux-2.6.31.5/fs/aufs/xino.c
+--- linux-2.6.31.5.orig/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/xino.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,1200 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -24083,9 +24085,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/xino.c linux-2.6.31.4/fs/aufs/xino.c
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/Kconfig linux-2.6.31.4/fs/Kconfig
---- linux-2.6.31.4.orig/fs/Kconfig 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/fs/Kconfig 2009-10-18 11:26:53.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/Kconfig linux-2.6.31.5/fs/Kconfig
+--- linux-2.6.31.5.orig/fs/Kconfig 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/fs/Kconfig 2009-11-15 22:02:37.000000000 +0100
@@ -187,6 +187,7 @@
source "fs/ufs/Kconfig"
source "fs/exofs/Kconfig"
@@ -24094,9 +24096,9 @@ diff -Nur linux-2.6.31.4.orig/fs/Kconfig linux-2.6.31.4/fs/Kconfig
endif # MISC_FILESYSTEMS
-diff -Nur linux-2.6.31.4.orig/fs/Makefile linux-2.6.31.4/fs/Makefile
---- linux-2.6.31.4.orig/fs/Makefile 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/fs/Makefile 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/Makefile linux-2.6.31.5/fs/Makefile
+--- linux-2.6.31.5.orig/fs/Makefile 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/fs/Makefile 2009-11-15 22:02:37.000000000 +0100
@@ -85,6 +85,7 @@
obj-$(CONFIG_HFS_FS) += hfs/
obj-$(CONFIG_ECRYPT_FS) += ecryptfs/
@@ -24105,9 +24107,9 @@ diff -Nur linux-2.6.31.4.orig/fs/Makefile linux-2.6.31.4/fs/Makefile
obj-$(CONFIG_NFS_FS) += nfs/
obj-$(CONFIG_EXPORTFS) += exportfs/
obj-$(CONFIG_NFSD) += nfsd/
-diff -Nur linux-2.6.31.4.orig/fs/namei.c linux-2.6.31.4/fs/namei.c
---- linux-2.6.31.4.orig/fs/namei.c 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/fs/namei.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/namei.c linux-2.6.31.5/fs/namei.c
+--- linux-2.6.31.5.orig/fs/namei.c 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/fs/namei.c 2009-11-15 22:02:37.000000000 +0100
@@ -337,6 +337,7 @@
return 0;
@@ -24144,9 +24146,9 @@ diff -Nur linux-2.6.31.4.orig/fs/namei.c linux-2.6.31.4/fs/namei.c
/**
* lookup_one_len - filesystem helper to lookup single pathname component
-diff -Nur linux-2.6.31.4.orig/fs/namespace.c linux-2.6.31.4/fs/namespace.c
---- linux-2.6.31.4.orig/fs/namespace.c 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/fs/namespace.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/namespace.c linux-2.6.31.5/fs/namespace.c
+--- linux-2.6.31.5.orig/fs/namespace.c 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/fs/namespace.c 2009-11-15 22:02:37.000000000 +0100
@@ -39,6 +39,7 @@
/* spinlock for vfsmount related operations, inplace of dcache_lock */
@@ -24155,9 +24157,9 @@ diff -Nur linux-2.6.31.4.orig/fs/namespace.c linux-2.6.31.4/fs/namespace.c
static int event;
static DEFINE_IDA(mnt_id_ida);
-diff -Nur linux-2.6.31.4.orig/fs/open.c linux-2.6.31.4/fs/open.c
---- linux-2.6.31.4.orig/fs/open.c 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/fs/open.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/open.c linux-2.6.31.5/fs/open.c
+--- linux-2.6.31.5.orig/fs/open.c 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/fs/open.c 2009-11-15 22:02:37.000000000 +0100
@@ -221,6 +221,7 @@
mutex_unlock(&dentry->d_inode->i_mutex);
return err;
@@ -24166,9 +24168,9 @@ diff -Nur linux-2.6.31.4.orig/fs/open.c linux-2.6.31.4/fs/open.c
static long do_sys_truncate(const char __user *pathname, loff_t length)
{
-diff -Nur linux-2.6.31.4.orig/fs/splice.c linux-2.6.31.4/fs/splice.c
---- linux-2.6.31.4.orig/fs/splice.c 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/fs/splice.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/splice.c linux-2.6.31.5/fs/splice.c
+--- linux-2.6.31.5.orig/fs/splice.c 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/fs/splice.c 2009-11-15 22:02:37.000000000 +0100
@@ -1057,8 +1057,8 @@
/*
* Attempt to initiate a splice from pipe to file.
@@ -24206,9 +24208,9 @@ diff -Nur linux-2.6.31.4.orig/fs/splice.c linux-2.6.31.4/fs/splice.c
/**
* splice_direct_to_actor - splices data directly between two non-pipes
-diff -Nur linux-2.6.31.4.orig/include/linux/aufs_type.h linux-2.6.31.4/include/linux/aufs_type.h
---- linux-2.6.31.4.orig/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/include/linux/aufs_type.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/include/linux/aufs_type.h linux-2.6.31.5/include/linux/aufs_type.h
+--- linux-2.6.31.5.orig/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/include/linux/aufs_type.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -24319,9 +24321,9 @@ diff -Nur linux-2.6.31.4.orig/include/linux/aufs_type.h linux-2.6.31.4/include/l
+#define AUFS_CTL_PLINK_CLEAN _IO(AuCtlType, AuCtl_PLINK_CLEAN)
+
+#endif /* __AUFS_TYPE_H__ */
-diff -Nur linux-2.6.31.4.orig/include/linux/Kbuild linux-2.6.31.4/include/linux/Kbuild
---- linux-2.6.31.4.orig/include/linux/Kbuild 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/include/linux/Kbuild 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/include/linux/Kbuild linux-2.6.31.5/include/linux/Kbuild
+--- linux-2.6.31.5.orig/include/linux/Kbuild 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/include/linux/Kbuild 2009-11-15 22:02:38.000000000 +0100
@@ -34,6 +34,7 @@
header-y += atmsap.h
header-y += atmsvc.h
@@ -24330,9 +24332,9 @@ diff -Nur linux-2.6.31.4.orig/include/linux/Kbuild linux-2.6.31.4/include/linux/
header-y += auto_fs4.h
header-y += ax25.h
header-y += b1lli.h
-diff -Nur linux-2.6.31.4.orig/include/linux/namei.h linux-2.6.31.4/include/linux/namei.h
---- linux-2.6.31.4.orig/include/linux/namei.h 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/include/linux/namei.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/include/linux/namei.h linux-2.6.31.5/include/linux/namei.h
+--- linux-2.6.31.5.orig/include/linux/namei.h 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/include/linux/namei.h 2009-11-15 22:02:38.000000000 +0100
@@ -75,6 +75,9 @@
extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
extern void release_open_intent(struct nameidata *);
@@ -24343,9 +24345,9 @@ diff -Nur linux-2.6.31.4.orig/include/linux/namei.h linux-2.6.31.4/include/linux
extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
extern struct dentry *lookup_one_noperm(const char *, struct dentry *);
-diff -Nur linux-2.6.31.4.orig/include/linux/splice.h linux-2.6.31.4/include/linux/splice.h
---- linux-2.6.31.4.orig/include/linux/splice.h 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/include/linux/splice.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/include/linux/splice.h linux-2.6.31.5/include/linux/splice.h
+--- linux-2.6.31.5.orig/include/linux/splice.h 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/include/linux/splice.h 2009-11-15 22:02:38.000000000 +0100
@@ -82,4 +82,10 @@
extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
splice_direct_actor *);
@@ -24357,9 +24359,9 @@ diff -Nur linux-2.6.31.4.orig/include/linux/splice.h linux-2.6.31.4/include/linu
+ unsigned int flags);
+
#endif
-diff -Nur linux-2.6.31.4.orig/security/device_cgroup.c linux-2.6.31.4/security/device_cgroup.c
---- linux-2.6.31.4.orig/security/device_cgroup.c 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/security/device_cgroup.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/security/device_cgroup.c linux-2.6.31.5/security/device_cgroup.c
+--- linux-2.6.31.5.orig/security/device_cgroup.c 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/security/device_cgroup.c 2009-11-15 22:02:38.000000000 +0100
@@ -513,6 +513,7 @@
return -EPERM;
@@ -24368,9 +24370,9 @@ diff -Nur linux-2.6.31.4.orig/security/device_cgroup.c linux-2.6.31.4/security/d
int devcgroup_inode_mknod(int mode, dev_t dev)
{
-diff -Nur linux-2.6.31.4.orig/security/security.c linux-2.6.31.4/security/security.c
---- linux-2.6.31.4.orig/security/security.c 2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/security/security.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/security/security.c linux-2.6.31.5/security/security.c
+--- linux-2.6.31.5.orig/security/security.c 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/security/security.c 2009-11-15 22:02:38.000000000 +0100
@@ -386,6 +386,7 @@
return 0;
return security_ops->path_mkdir(path, dentry, mode);
diff --git a/target/native/device.mk b/target/native/target.mk
index 8b38a16b2..8b38a16b2 100644
--- a/target/native/device.mk
+++ b/target/native/target.mk
diff --git a/target/qemu-arm/device.mk b/target/qemu-arm/target.mk
index f6e2c2e25..f6e2c2e25 100644
--- a/target/qemu-arm/device.mk
+++ b/target/qemu-arm/target.mk
diff --git a/target/qemu-cris/device.mk b/target/qemu-cris/target.mk
index 3c8d8c4f9..3c8d8c4f9 100644
--- a/target/qemu-cris/device.mk
+++ b/target/qemu-cris/target.mk
diff --git a/target/qemu-mips/device.mk b/target/qemu-mips/target.mk
index 8a5abd384..8a5abd384 100644
--- a/target/qemu-mips/device.mk
+++ b/target/qemu-mips/target.mk
diff --git a/target/qemu-mips64/device.mk b/target/qemu-mips64/target.mk
index 19b0fba32..19b0fba32 100644
--- a/target/qemu-mips64/device.mk
+++ b/target/qemu-mips64/target.mk
diff --git a/target/qemu-mips64el/device.mk b/target/qemu-mips64el/target.mk
index 1222cdee6..1222cdee6 100644
--- a/target/qemu-mips64el/device.mk
+++ b/target/qemu-mips64el/target.mk
diff --git a/target/qemu-mipsel/device.mk b/target/qemu-mipsel/target.mk
index bd8f7ca79..bd8f7ca79 100644
--- a/target/qemu-mipsel/device.mk
+++ b/target/qemu-mipsel/target.mk
diff --git a/target/qemu-x86/device.mk b/target/qemu-x86/target.mk
index f825d0259..f825d0259 100644
--- a/target/qemu-x86/device.mk
+++ b/target/qemu-x86/target.mk
diff --git a/target/qemu-x86_64/device.mk b/target/qemu-x86_64/target.mk
index 7652dbff4..7652dbff4 100644
--- a/target/qemu-x86_64/device.mk
+++ b/target/qemu-x86_64/target.mk
diff --git a/target/rb411/device.mk b/target/rb411/target.mk
index 2ab6faed7..2ab6faed7 100644
--- a/target/rb411/device.mk
+++ b/target/rb411/target.mk
diff --git a/target/rb433/device.mk b/target/rb433/target.mk
index 2ab6faed7..2ab6faed7 100644
--- a/target/rb433/device.mk
+++ b/target/rb433/target.mk
diff --git a/target/rb532/device.mk b/target/rb532/target.mk
index c0924be1f..c0924be1f 100644
--- a/target/rb532/device.mk
+++ b/target/rb532/target.mk
diff --git a/target/rescue-x86/device.mk b/target/rescue-x86/target.mk
index 7021d0bb9..7021d0bb9 100644
--- a/target/rescue-x86/device.mk
+++ b/target/rescue-x86/target.mk
diff --git a/target/rescue-x86_64/device.mk b/target/rescue-x86_64/target.mk
index 7ff8b016e..7ff8b016e 100644
--- a/target/rescue-x86_64/device.mk
+++ b/target/rescue-x86_64/target.mk
diff --git a/target/shuttle/device.mk b/target/shuttle/target.mk
index caf9be90a..caf9be90a 100644
--- a/target/shuttle/device.mk
+++ b/target/shuttle/target.mk
diff --git a/target/tomtom/device.mk b/target/tomtom/target.mk
index a35a5b7ba..a35a5b7ba 100644
--- a/target/tomtom/device.mk
+++ b/target/tomtom/target.mk
diff --git a/target/wag54g/device.mk b/target/wag54g/target.mk
index c0924be1f..c0924be1f 100644
--- a/target/wag54g/device.mk
+++ b/target/wag54g/target.mk
diff --git a/target/zaurus/device.mk b/target/zaurus/target.mk
index f6e2c2e25..f6e2c2e25 100644
--- a/target/zaurus/device.mk
+++ b/target/zaurus/target.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 01:49:23 +0000