main/linux-vserver: upgrade to 3.6.3

author: Natanael Copa <ncopa@alpinelinux.org> 2012-10-22 09:49:02 +0000
committer: Natanael Copa <ncopa@alpinelinux.org> 2012-10-22 13:13:20 +0000
commit: 605fc412762b96bd7c11eb0493af6a0da2f96a7a (patch)
tree: ed0543060b50e3076a4cc13d72bfbc86e4d642ab /main/linux-vserver
parent: ce95a5b57de16d961d1f8be7eb4ef12b440b4e9e (diff)
download: aports-605fc412762b96bd7c11eb0493af6a0da2f96a7a.tar.bz2
aports-605fc412762b96bd7c11eb0493af6a0da2f96a7a.tar.xz
4 files changed, 2410 insertions, 3249 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index c4a080349..0229d5820 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,9 +2,9 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=3.4.13
+pkgver=3.6.3
 pkgrel=0
-_vsver=vs2.3.3.8
+_vsver=vs2.3.4.3-noxfs-nocow
 
 if [ "${pkgver##*.*.*}" = "$pkgver" ]; then
 	_kernver=$pkgver
@@ -38,6 +38,9 @@ prepare() {
 		unxz -c < ../patch-$pkgver.xz | patch -p1 -N || return 1
 	fi
 
+	# ERR is no valid signal
+	sed -i -e '/^trap/s/ERR//' scripts/link-vmlinux.sh
+
 	# first apply patches in specified order
 	for i in $source; do
 		i=${i##*/}
@@ -132,8 +135,8 @@ dev() {
 		"$subpkgdir"/lib/modules/${_abi_release}/build
 }
 
-md5sums="967f72983655e2479f951195953e8480  linux-3.4.tar.xz
-65c1d3da2074c552e0a405a1c2f44310  patch-3.4.13.xz
-a5306ddb3b03c64509a1643bd129aa33  patch-3.4.13-vs2.3.3.8.diff
-0b4b3aa4d261b25c06dd3a5228c07ef1  kernelconfig.x86
-fbaa6797813e2bb81d7c8feb6a50e28d  kernelconfig.x86_64"
+md5sums="1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
+96701113d37ef4f9b785206ab8bcc71e  patch-3.6.3.xz
+a7c1fa5d1c41a97a9453a63de5eadb88  patch-3.6.3-vs2.3.4.3-noxfs-nocow.diff
+a2f41b951b1923e2520ef610f37ec55b  kernelconfig.x86
+a7ae4e8a88d495109b63354cfa8e4fcd  kernelconfig.x86_64"
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86
index ef893806f..416c59156 100644
--- a/main/linux-vserver/kernelconfig.x86
+++ b/main/linux-vserver/kernelconfig.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.4.6-vs2.3.3.6 Kernel Configuration
+# Linux/i386 3.6.2-vs2.3.4.3-noxfs-nocow Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -9,10 +9,6 @@ CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -26,9 +22,7 @@ CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -47,11 +41,12 @@ CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_32_LAZY_GS=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
-CONFIG_KTIME_SCALAR=y
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
@@ -94,8 +89,24 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 
 #
 # RCU Subsystem
@@ -103,6 +114,7 @@ CONFIG_SPARSE_IRQ=y
 CONFIG_TREE_RCU=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
@@ -117,9 +129,7 @@ CONFIG_CGROUP_DEVICE=y
 # CONFIG_CPUSETS is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
-# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
+# CONFIG_MEMCG is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -134,7 +144,6 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -173,7 +182,6 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
@@ -199,7 +207,9 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
@@ -211,6 +221,8 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 
 #
 # GCOV-based kernel profiling
@@ -301,11 +313,6 @@ CONFIG_FREEZER=y
 # Processor type and features
 #
 CONFIG_ZONE_DMA=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_BIGSMP=y
@@ -441,7 +448,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
 # CONFIG_HIGHPTE is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
@@ -480,6 +489,8 @@ CONFIG_SUSPEND_FREEZER=y
 # CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
 # CONFIG_PM_RUNTIME is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
@@ -561,6 +572,7 @@ CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -598,7 +610,6 @@ CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
-# CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 # CONFIG_OLPC is not set
 CONFIG_ALIX=y
@@ -654,6 +665,7 @@ CONFIG_PACKET=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
@@ -683,6 +695,7 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -776,6 +789,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
@@ -796,6 +810,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -956,7 +971,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1029,7 +1043,6 @@ CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1061,11 +1074,11 @@ CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP_DECAP=y
 CONFIG_X25=m
 CONFIG_LAPB=m
-# CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -1089,6 +1102,8 @@ CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_SCH_PLUG=m
 
@@ -1114,6 +1129,7 @@ CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
@@ -1220,6 +1236,7 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
+# CONFIG_BT_HCIUART_3WIRE is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1246,11 +1263,11 @@ CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1267,6 +1284,7 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1306,6 +1324,7 @@ CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_SPI=m
 CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_CMA is not set
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 CONFIG_MTD_TESTS=m
@@ -1452,7 +1471,6 @@ CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1533,7 +1551,8 @@ CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_TI_DAC7512=m
 CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
 CONFIG_PCH_PHUB=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 CONFIG_C2PORT=m
@@ -1551,9 +1570,6 @@ CONFIG_EEPROM_93XX46=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1565,6 +1581,7 @@ CONFIG_SENSORS_LIS3_I2C=m
 # Altera FPGA firmware download module
 #
 # CONFIG_ALTERA_STAPL is not set
+# CONFIG_INTEL_MEI is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1594,7 +1611,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1689,6 +1705,7 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPR_DUMP is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1834,7 +1851,6 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -1853,6 +1869,7 @@ CONFIG_TCM_PSCSI=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1888,10 +1905,14 @@ CONFIG_EQUALIZER=m
 CONFIG_MII=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+# CONFIG_IEEE802154_AT86RF230 is not set
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
@@ -2025,10 +2046,13 @@ CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IGB_DCA=y
+# CONFIG_IGB_PTP is not set
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
+# CONFIG_IXGBE_PTP is not set
 # CONFIG_IXGBEVF is not set
 CONFIG_NET_VENDOR_I825XX=y
 # CONFIG_ZNET is not set
@@ -2122,6 +2146,12 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_FDDI=y
@@ -2146,6 +2176,7 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -2173,7 +2204,6 @@ CONFIG_SLHC=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
-# CONFIG_TR is not set
 
 #
 # USB Network Adapters
@@ -2245,7 +2275,6 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DFS_CERTIFIED is not set
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
@@ -2300,6 +2329,7 @@ CONFIG_IPW2200_QOS=y
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
 
 #
 # Debugging Options
@@ -2315,8 +2345,6 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
@@ -2347,6 +2375,7 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 # CONFIG_RT2800PCI_RT35XX is not set
 CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@@ -2369,27 +2398,28 @@ CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_SPI=m
-CONFIG_WL12XX_SDIO=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
 
 #
 # WiMAX Wireless Broadband devices
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-CONFIG_WIMAX_IWMC3200_SDIO=y
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 CONFIG_WAN=y
 CONFIG_LANMEDIA=m
@@ -2477,6 +2507,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
+# CONFIG_INPUT_MATRIXKMAP is not set
 
 #
 # Userland interfaces
@@ -2505,6 +2536,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
@@ -2553,12 +2585,15 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2568,7 +2603,6 @@ CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
 CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-# CONFIG_TOUCHSCREEN_MC13783 is not set
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2599,7 +2633,6 @@ CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 # CONFIG_INPUT_BMA150 is not set
 CONFIG_INPUT_PCSPKR=m
-# CONFIG_INPUT_MC13783_PWRBUTTON is not set
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
@@ -2750,7 +2783,6 @@ CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2843,6 +2875,7 @@ CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=y
 CONFIG_SPI_TOPCLIFF_PCH=m
+CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_PCI=m
@@ -2882,6 +2915,7 @@ CONFIG_GPIO_MAX730X=m
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
 CONFIG_GPIO_VX855=m
 
 #
@@ -2897,6 +2931,8 @@ CONFIG_GPIO_ADP5588=m
 # PCI GPIO expanders:
 #
 CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_BT8XX=m
+CONFIG_GPIO_AMD8111=m
 # CONFIG_GPIO_LANGWELL is not set
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_ML_IOH=m
@@ -2921,7 +2957,7 @@ CONFIG_GPIO_74X164=m
 #
 CONFIG_GPIO_JANZ_TTL=m
 # CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
@@ -2938,6 +2974,7 @@ CONFIG_POWER_SUPPLY=m
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2978,6 +3015,7 @@ CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_GPIO_FAN=m
+# CONFIG_SENSORS_HIH6130 is not set
 CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
@@ -3044,6 +3082,7 @@ CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
+# CONFIG_SENSORS_INA2XX is not set
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP401=m
@@ -3063,7 +3102,6 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_APPLESMC=m
-# CONFIG_SENSORS_MC13783_ADC is not set
 
 #
 # ACPI drivers
@@ -3093,6 +3131,7 @@ CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
 CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
 CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
@@ -3160,6 +3199,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SM501_GPIO is not set
 CONFIG_HTC_PASIC3=m
 CONFIG_UCB1400_CORE=m
+# CONFIG_MFD_LM3533 is not set
 # CONFIG_TPS6105X is not set
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
@@ -3168,19 +3208,20 @@ CONFIG_TPS6507X=m
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_DA9052_SPI is not set
-CONFIG_MFD_WM8400=m
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_WM831X_SPI is not set
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
 CONFIG_ABX500_CORE=y
 # CONFIG_EZX_PCAP is not set
-# CONFIG_AB8500_CORE is not set
 CONFIG_MFD_CS5535=m
 CONFIG_MFD_TIMBERDALE=m
 CONFIG_LPC_SCH=m
+CONFIG_LPC_ICH=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_VX855=m
@@ -3191,74 +3232,22 @@ CONFIG_MEDIA_SUPPORT=m
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_RC_CORE=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_RC_ATI_REMOTE=m
-# CONFIG_IR_ENE is not set
-CONFIG_IR_IMON=m
-# CONFIG_IR_MCEUSB is not set
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-# CONFIG_IR_NUVOTON is not set
-CONFIG_IR_REDRAT3=m
-# CONFIG_IR_STREAMZAP is not set
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_RC_LOOPBACK=m
-# CONFIG_IR_GPIO_CIR is not set
-# CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18212=m
+
+#
+# Media drivers
+#
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
@@ -3269,7 +3258,6 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
 
 #
 # Encoders, decoders, sensors and other helper chips
@@ -3332,6 +3320,7 @@ CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
 CONFIG_VIDEO_AK881X=m
 
 #
@@ -3370,6 +3359,10 @@ CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_VIVI is not set
 CONFIG_V4L_USB_DRIVERS=y
+
+#
+# Webcam devices
+#
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
@@ -3419,327 +3412,22 @@ CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_VICAM=m
 # CONFIG_USB_GSPCA_XIRLINK_CIT is not set
 CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-# CONFIG_VIDEO_TM6000 is not set
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
 # CONFIG_USB_PWC is not set
 # CONFIG_VIDEO_CPIA2 is not set
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
-CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-# CONFIG_MEDIA_ALTERA_CI is not set
-# CONFIG_VIDEO_CX25821 is not set
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_USB_SN9C102=m
+
+#
+# Webcam and/or TV USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
 # CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_RADIO_SI470X is not set
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-# CONFIG_I2C_SI4713 is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_USB_KEENE is not set
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-# CONFIG_DVB_USB_FRIIO is not set
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-# CONFIG_DVB_PT1 is not set
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-CONFIG_DVB_DDBRIDGE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IT913X_FE=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
 
 #
 # Graphics support
@@ -3755,7 +3443,8 @@ CONFIG_AGP_SIS=m
 # CONFIG_AGP_SWORKS is not set
 CONFIG_AGP_VIA=m
 # CONFIG_AGP_EFFICEON is not set
-# CONFIG_VGA_ARB is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_KMS_HELPER=m
@@ -3782,10 +3471,14 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
 # CONFIG_DRM_UDL is not set
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_STUB_POULSBO is not set
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3896,6 +3589,7 @@ CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_BROADSHEET=m
+# CONFIG_FB_AUO_K190X is not set
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -3913,6 +3607,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_APPLE is not set
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_ADP8860=m
@@ -4042,7 +3737,6 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0
 CONFIG_SND_HDA_INPUT_JACK=y
 # CONFIG_SND_HDA_PATCH_LOADER is not set
 CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -4101,6 +3795,7 @@ CONFIG_SND_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_ALL_CODECS=m
 CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_AB8500_CODEC=m
 CONFIG_SND_SOC_AD1836=m
 CONFIG_SND_SOC_AD193X=m
 CONFIG_SND_SOC_AD73311=m
@@ -4115,6 +3810,7 @@ CONFIG_SND_SOC_AK4671=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_ALC5632=m
 CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L52=m
 CONFIG_SND_SOC_CS42L73=m
 CONFIG_SND_SOC_CS4270=m
 CONFIG_SND_SOC_CS4271=m
@@ -4122,7 +3818,10 @@ CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_JZ4740_CODEC=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_DA7210=m
+CONFIG_SND_SOC_DA732X=m
 CONFIG_SND_SOC_DFBMCS320=m
+CONFIG_SND_SOC_ISABELLE=m
+CONFIG_SND_SOC_LM49453=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX9850=m
@@ -4132,6 +3831,7 @@ CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA529=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC26=m
 CONFIG_SND_SOC_TLV320AIC32X4=m
@@ -4144,7 +3844,6 @@ CONFIG_SND_SOC_WM1250_EV1=m
 CONFIG_SND_SOC_WM2000=m
 CONFIG_SND_SOC_WM2200=m
 CONFIG_SND_SOC_WM5100=m
-CONFIG_SND_SOC_WM8400=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8580=m
@@ -4184,26 +3883,19 @@ CONFIG_SND_SOC_WM9090=m
 CONFIG_SND_SOC_LM4857=m
 CONFIG_SND_SOC_MAX9768=m
 CONFIG_SND_SOC_MAX9877=m
+CONFIG_SND_SOC_ML26124=m
 CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-# CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
 
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
+# HID support
 #
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
 
 #
 # Special HID drivers
@@ -4211,6 +3903,7 @@ CONFIG_USB_MOUSE=m
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_ACRUX is not set
 CONFIG_HID_APPLE=m
+# CONFIG_HID_AUREAL is not set
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
@@ -4229,6 +3922,7 @@ CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_TWINHAN is not set
 # CONFIG_HID_KENSINGTON is not set
 CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
 # CONFIG_HID_LOGITECH is not set
 CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MICROSOFT is not set
@@ -4260,6 +3954,19 @@ CONFIG_HID_HYPERV_MOUSE=m
 # CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_ZEROPLUS is not set
 CONFIG_HID_ZYDACRON=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4273,8 +3980,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -4298,8 +4003,8 @@ CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_SSB=y
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -4311,6 +4016,8 @@ CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB Device Class drivers
@@ -4410,6 +4117,7 @@ CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
 CONFIG_USB_SERIAL_ZIO=m
 # CONFIG_USB_SERIAL_SSU100 is not set
+CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -4436,6 +4144,11 @@ CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 # CONFIG_USB_YUREX is not set
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_USB_ISP1301 is not set
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
@@ -4517,15 +4230,17 @@ CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
-# CONFIG_LEDS_MC13783 is not set
 # CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_LM3556=m
 # CONFIG_LEDS_OT200 is not set
+CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4534,6 +4249,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_ACCESSIBILITY=y
 # CONFIG_A11Y_BRAILLE_CONSOLE is not set
 CONFIG_INFINIBAND=m
@@ -4551,6 +4267,7 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
+# CONFIG_INFINIBAND_OCRDMA is not set
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
@@ -4631,7 +4348,6 @@ CONFIG_RTC_DRV_PCF50633=m
 #
 # on-CPU RTC drivers
 #
-# CONFIG_RTC_DRV_MC13XXX is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -4665,6 +4381,9 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 # CONFIG_UIO_PCI_GENERIC is not set
 CONFIG_UIO_NETX=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_RING=m
 
@@ -4674,6 +4393,7 @@ CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -4707,13 +4427,9 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
-# CONFIG_VME_BUS is not set
 # CONFIG_DX_SEP is not set
-# CONFIG_IIO is not set
-# CONFIG_ZRAM is not set
 # CONFIG_ZSMALLOC is not set
 # CONFIG_WLAGS49_H2 is not set
 # CONFIG_WLAGS49_H25 is not set
@@ -4733,7 +4449,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-# CONFIG_INTEL_MEI is not set
 # CONFIG_STAGING_MEDIA is not set
 
 #
@@ -4742,6 +4457,14 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_ANDROID is not set
 # CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
+# CONFIG_IPACK_BUS is not set
+CONFIG_WIMAX_GDM72XX=m
+# CONFIG_WIMAX_GDM72XX_QOS is not set
+# CONFIG_WIMAX_GDM72XX_K_MODE is not set
+# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+# CONFIG_CSR_WIFI is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -4813,6 +4536,16 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 #
 CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
 
 #
 # Firmware Drivers
@@ -4863,11 +4596,7 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_DLM=y
 CONFIG_OCFS2_FS=m
@@ -4974,11 +4703,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_JFFS2_CMODE_SIZE is not set
 # CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_XATTR is not set
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
@@ -5001,6 +4728,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 CONFIG_ROMFS_ON_BLOCK=y
 CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_RAM=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -5010,9 +4739,11 @@ CONFIG_EXOFS_FS=m
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
 # CONFIG_NFS_V4_1 is not set
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5087,6 +4818,17 @@ CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
@@ -5102,6 +4844,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -5114,6 +4857,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
@@ -5159,7 +4904,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_LKDTM is not set
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_LATENCYTOP=y
 # CONFIG_DEBUG_PAGEALLOC is not set
@@ -5197,6 +4942,7 @@ CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_DEBUG_NX_TEST=m
 CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_X86_DECODER_SELFTEST=y
@@ -5220,7 +4966,7 @@ CONFIG_DEBUG_NMI_SELFTEST=y
 #
 CONFIG_VSERVER_AUTO_LBACK=y
 CONFIG_VSERVER_AUTO_SINGLE=y
-CONFIG_VSERVER_COWBL=y
+# CONFIG_VSERVER_COWBL is not set
 # CONFIG_VSERVER_VTIME is not set
 # CONFIG_VSERVER_DEVICE is not set
 CONFIG_VSERVER_PROC_SECURE=y
@@ -5297,6 +5043,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -5395,11 +5143,13 @@ CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_VHOST_NET=m
+CONFIG_TCM_VHOST=m
 # CONFIG_LGUEST is not set
 # CONFIG_BINARY_PRINTF is not set
 
@@ -5408,6 +5158,8 @@ CONFIG_VHOST_NET=m
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
@@ -5445,6 +5197,8 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
@@ -5458,6 +5212,8 @@ CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
 CONFIG_CORDIC=m
+CONFIG_DDR=y
diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64
index bcfe7817f..889204b6a 100644
--- a/main/linux-vserver/kernelconfig.x86_64
+++ b/main/linux-vserver/kernelconfig.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.4.6-vs2.3.3.6 Kernel Configuration
+# Linux/x86_64 3.6.3-vs2.3.4.3-noxfs-nocow Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -9,11 +9,6 @@ CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -28,9 +23,7 @@ CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -48,11 +41,12 @@ CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-# CONFIG_KTIME_SCALAR is not set
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
@@ -95,8 +89,25 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 
 #
 # RCU Subsystem
@@ -104,6 +115,7 @@ CONFIG_SPARSE_IRQ=y
 CONFIG_TREE_RCU=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
@@ -119,9 +131,7 @@ CONFIG_CPUSETS=y
 # CONFIG_PROC_PID_CPUSET is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
-# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
+# CONFIG_MEMCG is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -136,7 +146,6 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -175,7 +184,6 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
@@ -202,6 +210,7 @@ CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
@@ -213,7 +222,9 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 
 #
 # GCOV-based kernel profiling
@@ -304,11 +315,6 @@ CONFIG_FREEZER=y
 # Processor type and features
 #
 CONFIG_ZONE_DMA=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_SMP=y
 CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
@@ -411,7 +417,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
 CONFIG_MTRR=y
@@ -449,6 +457,8 @@ CONFIG_HIBERNATE_CALLBACKS=y
 # CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
 # CONFIG_PM_RUNTIME is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
@@ -519,6 +529,7 @@ CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -603,6 +614,7 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_KEYS_COMPAT=y
 CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
@@ -613,6 +625,7 @@ CONFIG_PACKET=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
@@ -642,6 +655,7 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -735,6 +749,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
@@ -755,6 +770,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -915,7 +931,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -988,7 +1003,6 @@ CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1020,11 +1034,11 @@ CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP_DECAP=y
 CONFIG_X25=m
 CONFIG_LAPB=m
-# CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -1048,6 +1062,8 @@ CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_SCH_PLUG=m
 
@@ -1073,6 +1089,7 @@ CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
@@ -1095,7 +1112,6 @@ CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NETPRIO_CGROUP=m
 CONFIG_BQL=y
-CONFIG_HAVE_BPF_JIT=y
 CONFIG_BPF_JIT=y
 
 #
@@ -1180,6 +1196,7 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
+# CONFIG_BT_HCIUART_3WIRE is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1206,11 +1223,11 @@ CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1227,6 +1244,7 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1242,6 +1260,7 @@ CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 # CONFIG_NFC is not set
+CONFIG_HAVE_BPF_JIT=y
 
 #
 # Device Drivers
@@ -1411,7 +1430,6 @@ CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1494,7 +1512,8 @@ CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_TI_DAC7512=m
 CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
 CONFIG_PCH_PHUB=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 CONFIG_C2PORT=m
@@ -1512,9 +1531,6 @@ CONFIG_EEPROM_93XX46=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1526,6 +1542,7 @@ CONFIG_SENSORS_LIS3_I2C=m
 # Altera FPGA firmware download module
 #
 # CONFIG_ALTERA_STAPL is not set
+# CONFIG_INTEL_MEI is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1555,7 +1572,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1649,6 +1665,7 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPR_DUMP is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1787,7 +1804,6 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -1806,6 +1822,7 @@ CONFIG_TCM_PSCSI=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1842,10 +1859,14 @@ CONFIG_EQUALIZER=m
 CONFIG_MII=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+# CONFIG_IEEE802154_AT86RF230 is not set
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
@@ -1979,10 +2000,13 @@ CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IGB_DCA=y
+# CONFIG_IGB_PTP is not set
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
+# CONFIG_IXGBE_PTP is not set
 # CONFIG_IXGBEVF is not set
 CONFIG_NET_VENDOR_I825XX=y
 # CONFIG_ZNET is not set
@@ -2077,6 +2101,12 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_FDDI=y
@@ -2101,6 +2131,7 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -2128,7 +2159,6 @@ CONFIG_SLHC=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
-# CONFIG_TR is not set
 
 #
 # USB Network Adapters
@@ -2200,7 +2230,6 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DFS_CERTIFIED is not set
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
@@ -2255,6 +2284,7 @@ CONFIG_IPW2200_QOS=y
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
 
 #
 # Debugging Options
@@ -2270,8 +2300,6 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
@@ -2302,6 +2330,7 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 # CONFIG_RT2800PCI_RT35XX is not set
 CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@@ -2324,27 +2353,28 @@ CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_SPI=m
-CONFIG_WL12XX_SDIO=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
 
 #
 # WiMAX Wireless Broadband devices
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-CONFIG_WIMAX_IWMC3200_SDIO=y
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 CONFIG_WAN=y
 CONFIG_LANMEDIA=m
@@ -2434,6 +2464,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
+# CONFIG_INPUT_MATRIXKMAP is not set
 
 #
 # Userland interfaces
@@ -2462,6 +2493,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
@@ -2510,12 +2542,15 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2525,7 +2560,6 @@ CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
 CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-# CONFIG_TOUCHSCREEN_MC13783 is not set
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2556,7 +2590,6 @@ CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 # CONFIG_INPUT_BMA150 is not set
 CONFIG_INPUT_PCSPKR=m
-# CONFIG_INPUT_MC13783_PWRBUTTON is not set
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
@@ -2706,7 +2739,6 @@ CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2797,6 +2829,7 @@ CONFIG_SPI_LM70_LLP=m
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_TOPCLIFF_PCH=m
+CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_PCI=m
@@ -2836,6 +2869,7 @@ CONFIG_GPIO_MAX730X=m
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
 CONFIG_GPIO_VX855=m
 
 #
@@ -2851,6 +2885,8 @@ CONFIG_GPIO_ADP5588=m
 # PCI GPIO expanders:
 #
 CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_BT8XX=m
+CONFIG_GPIO_AMD8111=m
 # CONFIG_GPIO_LANGWELL is not set
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_ML_IOH=m
@@ -2875,7 +2911,7 @@ CONFIG_GPIO_74X164=m
 #
 CONFIG_GPIO_JANZ_TTL=m
 # CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
@@ -2892,6 +2928,7 @@ CONFIG_POWER_SUPPLY=m
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2932,6 +2969,7 @@ CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_GPIO_FAN=m
+# CONFIG_SENSORS_HIH6130 is not set
 CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
@@ -2998,6 +3036,7 @@ CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
+# CONFIG_SENSORS_INA2XX is not set
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP401=m
@@ -3017,7 +3056,6 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_APPLESMC=m
-# CONFIG_SENSORS_MC13783_ADC is not set
 
 #
 # ACPI drivers
@@ -3047,6 +3085,7 @@ CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
 CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
 CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
@@ -3114,6 +3153,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SM501_GPIO is not set
 CONFIG_HTC_PASIC3=m
 CONFIG_UCB1400_CORE=m
+# CONFIG_MFD_LM3533 is not set
 # CONFIG_TPS6105X is not set
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
@@ -3122,19 +3162,20 @@ CONFIG_TPS6507X=m
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_DA9052_SPI is not set
-CONFIG_MFD_WM8400=m
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_WM831X_SPI is not set
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
 CONFIG_ABX500_CORE=y
 # CONFIG_EZX_PCAP is not set
-# CONFIG_AB8500_CORE is not set
 CONFIG_MFD_CS5535=m
 CONFIG_MFD_TIMBERDALE=m
 CONFIG_LPC_SCH=m
+CONFIG_LPC_ICH=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_VX855=m
@@ -3145,74 +3186,22 @@ CONFIG_MEDIA_SUPPORT=m
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_RC_CORE=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_RC_ATI_REMOTE=m
-# CONFIG_IR_ENE is not set
-CONFIG_IR_IMON=m
-# CONFIG_IR_MCEUSB is not set
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-# CONFIG_IR_NUVOTON is not set
-CONFIG_IR_REDRAT3=m
-# CONFIG_IR_STREAMZAP is not set
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_RC_LOOPBACK=m
-# CONFIG_IR_GPIO_CIR is not set
-# CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18212=m
+
+#
+# Media drivers
+#
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
@@ -3223,7 +3212,6 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
 
 #
 # Encoders, decoders, sensors and other helper chips
@@ -3286,6 +3274,7 @@ CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
 CONFIG_VIDEO_AK881X=m
 
 #
@@ -3324,6 +3313,10 @@ CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_VIVI is not set
 CONFIG_V4L_USB_DRIVERS=y
+
+#
+# Webcam devices
+#
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
@@ -3373,327 +3366,22 @@ CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_VICAM=m
 # CONFIG_USB_GSPCA_XIRLINK_CIT is not set
 CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-# CONFIG_VIDEO_TM6000 is not set
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
 # CONFIG_USB_PWC is not set
 # CONFIG_VIDEO_CPIA2 is not set
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
-CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-# CONFIG_MEDIA_ALTERA_CI is not set
-# CONFIG_VIDEO_CX25821 is not set
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_USB_SN9C102=m
+
+#
+# Webcam and/or TV USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
 # CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_RADIO_SI470X is not set
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-# CONFIG_I2C_SI4713 is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_USB_KEENE is not set
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-# CONFIG_DVB_USB_FRIIO is not set
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-# CONFIG_DVB_USB_LME2510 is not set
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-# CONFIG_DVB_PT1 is not set
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-CONFIG_DVB_DDBRIDGE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IT913X_FE=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
 
 #
 # Graphics support
@@ -3703,7 +3391,8 @@ CONFIG_AGP_AMD64=m
 CONFIG_AGP_INTEL=m
 CONFIG_AGP_SIS=m
 CONFIG_AGP_VIA=m
-# CONFIG_VGA_ARB is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_KMS_HELPER=m
@@ -3730,10 +3419,14 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
 # CONFIG_DRM_UDL is not set
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_STUB_POULSBO is not set
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3844,6 +3537,7 @@ CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_BROADSHEET=m
+# CONFIG_FB_AUO_K190X is not set
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -3861,6 +3555,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_APPLE is not set
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_ADP8860=m
@@ -3990,7 +3685,6 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0
 CONFIG_SND_HDA_INPUT_JACK=y
 # CONFIG_SND_HDA_PATCH_LOADER is not set
 CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -4048,6 +3742,7 @@ CONFIG_SND_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_ALL_CODECS=m
 CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_AB8500_CODEC=m
 CONFIG_SND_SOC_AD1836=m
 CONFIG_SND_SOC_AD193X=m
 CONFIG_SND_SOC_AD73311=m
@@ -4062,6 +3757,7 @@ CONFIG_SND_SOC_AK4671=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_ALC5632=m
 CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L52=m
 CONFIG_SND_SOC_CS42L73=m
 CONFIG_SND_SOC_CS4270=m
 CONFIG_SND_SOC_CS4271=m
@@ -4069,7 +3765,10 @@ CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_JZ4740_CODEC=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_DA7210=m
+CONFIG_SND_SOC_DA732X=m
 CONFIG_SND_SOC_DFBMCS320=m
+CONFIG_SND_SOC_ISABELLE=m
+CONFIG_SND_SOC_LM49453=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX9850=m
@@ -4079,6 +3778,7 @@ CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA529=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC26=m
 CONFIG_SND_SOC_TLV320AIC32X4=m
@@ -4091,7 +3791,6 @@ CONFIG_SND_SOC_WM1250_EV1=m
 CONFIG_SND_SOC_WM2000=m
 CONFIG_SND_SOC_WM2200=m
 CONFIG_SND_SOC_WM5100=m
-CONFIG_SND_SOC_WM8400=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8580=m
@@ -4131,26 +3830,19 @@ CONFIG_SND_SOC_WM9090=m
 CONFIG_SND_SOC_LM4857=m
 CONFIG_SND_SOC_MAX9768=m
 CONFIG_SND_SOC_MAX9877=m
+CONFIG_SND_SOC_ML26124=m
 CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-# CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
 
 #
-# USB HID Boot Protocol drivers
+# HID support
 #
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
 
 #
 # Special HID drivers
@@ -4158,6 +3850,7 @@ CONFIG_USB_MOUSE=m
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_ACRUX is not set
 CONFIG_HID_APPLE=m
+# CONFIG_HID_AUREAL is not set
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
@@ -4176,6 +3869,7 @@ CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_TWINHAN is not set
 # CONFIG_HID_KENSINGTON is not set
 CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
 # CONFIG_HID_LOGITECH is not set
 CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MICROSOFT is not set
@@ -4207,6 +3901,19 @@ CONFIG_HID_HYPERV_MOUSE=m
 # CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_ZEROPLUS is not set
 CONFIG_HID_ZYDACRON=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4220,8 +3927,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -4245,8 +3950,8 @@ CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_SSB=y
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -4258,6 +3963,8 @@ CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB Device Class drivers
@@ -4357,6 +4064,7 @@ CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
 CONFIG_USB_SERIAL_ZIO=m
 # CONFIG_USB_SERIAL_SSU100 is not set
+CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -4383,6 +4091,11 @@ CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 # CONFIG_USB_YUREX is not set
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_USB_ISP1301 is not set
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
@@ -4465,15 +4178,17 @@ CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
-# CONFIG_LEDS_MC13783 is not set
 # CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_LM3556=m
 # CONFIG_LEDS_OT200 is not set
+CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4482,6 +4197,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_ACCESSIBILITY=y
 # CONFIG_A11Y_BRAILLE_CONSOLE is not set
 CONFIG_INFINIBAND=m
@@ -4501,6 +4217,7 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
+# CONFIG_INFINIBAND_OCRDMA is not set
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
@@ -4581,7 +4298,6 @@ CONFIG_RTC_DRV_PCF50633=m
 #
 # on-CPU RTC drivers
 #
-# CONFIG_RTC_DRV_MC13XXX is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -4615,6 +4331,9 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_RING=m
 
@@ -4624,6 +4343,7 @@ CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -4675,13 +4395,9 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
-# CONFIG_VME_BUS is not set
 # CONFIG_DX_SEP is not set
-# CONFIG_IIO is not set
-# CONFIG_ZRAM is not set
 # CONFIG_ZSMALLOC is not set
 # CONFIG_WLAGS49_H2 is not set
 # CONFIG_WLAGS49_H25 is not set
@@ -4701,7 +4417,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-# CONFIG_INTEL_MEI is not set
 # CONFIG_STAGING_MEDIA is not set
 
 #
@@ -4710,6 +4425,14 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_ANDROID is not set
 # CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
+# CONFIG_IPACK_BUS is not set
+CONFIG_WIMAX_GDM72XX=m
+# CONFIG_WIMAX_GDM72XX_QOS is not set
+# CONFIG_WIMAX_GDM72XX_K_MODE is not set
+# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+# CONFIG_CSR_WIFI is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -4783,6 +4506,16 @@ CONFIG_IRQ_REMAP=y
 #
 CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
 
 #
 # Firmware Drivers
@@ -4833,11 +4566,7 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_DLM=y
 CONFIG_OCFS2_FS=m
@@ -4945,11 +4674,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_JFFS2_CMODE_SIZE is not set
 # CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_XATTR is not set
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
@@ -4972,6 +4699,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 CONFIG_ROMFS_ON_BLOCK=y
 CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_RAM=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -4981,9 +4710,11 @@ CONFIG_EXOFS_FS=m
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
 # CONFIG_NFS_V4_1 is not set
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5058,6 +4789,17 @@ CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
@@ -5073,6 +4815,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -5085,6 +4828,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
@@ -5129,7 +4874,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_LKDTM is not set
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_LATENCYTOP=y
 # CONFIG_DEBUG_PAGEALLOC is not set
@@ -5166,6 +4911,7 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_DEBUG_NX_TEST=m
+# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -5190,7 +4936,7 @@ CONFIG_DEBUG_NMI_SELFTEST=y
 #
 CONFIG_VSERVER_AUTO_LBACK=y
 CONFIG_VSERVER_AUTO_SINGLE=y
-CONFIG_VSERVER_COWBL=y
+# CONFIG_VSERVER_COWBL is not set
 # CONFIG_VSERVER_VTIME is not set
 # CONFIG_VSERVER_DEVICE is not set
 CONFIG_VSERVER_PROC_SECURE=y
@@ -5267,6 +5013,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -5337,11 +5085,13 @@ CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 
 #
 # Compression
@@ -5367,11 +5117,13 @@ CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_VHOST_NET=m
+CONFIG_TCM_VHOST=m
 # CONFIG_BINARY_PRINTF is not set
 
 #
@@ -5379,6 +5131,8 @@ CONFIG_VHOST_NET=m
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
@@ -5416,6 +5170,8 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
@@ -5429,6 +5185,8 @@ CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
 CONFIG_CORDIC=m
+CONFIG_DDR=y
diff --git a/main/linux-vserver/patch-3.4.13-vs2.3.3.8.diff b/main/linux-vserver/patch-3.6.3-vs2.3.4.3-noxfs-nocow.diff
index a1f3b71e7..6c8630df0 100644
--- a/main/linux-vserver/patch-3.4.13-vs2.3.3.8.diff
+++ b/main/linux-vserver/patch-3.6.3-vs2.3.4.3-noxfs-nocow.diff
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.4.11/Documentation/vserver/debug.txt linux-3.4.11-vs2.3.3.8/Documentation/vserver/debug.txt
---- linux-3.4.11/Documentation/vserver/debug.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/Documentation/vserver/debug.txt	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/Documentation/vserver/debug.txt linux-3.6-vs2.3.4.3-noxfs-nocow/Documentation/vserver/debug.txt
+--- linux-3.6/Documentation/vserver/debug.txt	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/Documentation/vserver/debug.txt	2012-10-04 18:46:59.000000000 +0200
 @@ -0,0 +1,154 @@
 +
 +debug_cvirt:
@@ -156,22 +156,22 @@ diff -NurpP --minimal linux-3.4.11/Documentation/vserver/debug.txt linux-3.4.11-
 + 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.4.11/Makefile linux-3.4.11-vs2.3.3.8/Makefile
---- linux-3.4.11/Makefile	2012-09-16 20:46:09.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/Makefile	2012-09-16 21:17:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/Makefile linux-3.6-vs2.3.4.3-noxfs-nocow/Makefile
+--- linux-3.6/Makefile	2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/Makefile	2012-10-09 14:44:29.000000000 +0200
 @@ -1,7 +1,7 @@
  VERSION = 3
- PATCHLEVEL = 4
- SUBLEVEL = 13
+ PATCHLEVEL = 6
+ SUBLEVEL = 3
 -EXTRAVERSION =
-+EXTRAVERSION = -vs2.3.3.8
- NAME = Saber-toothed Squirrel
++EXTRAVERSION = -vs2.3.4.3-noxfs-nocow
+ NAME = Terrified Chipmunk
  
  # *DOCUMENTATION*
-diff -NurpP --minimal linux-3.4.11/arch/alpha/Kconfig linux-3.4.11-vs2.3.3.8/arch/alpha/Kconfig
---- linux-3.4.11/arch/alpha/Kconfig	2012-05-21 18:06:12.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/alpha/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -662,6 +662,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-3.6/arch/alpha/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/Kconfig
+--- linux-3.6/arch/alpha/Kconfig	2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/Kconfig	2012-10-04 18:46:59.000000000 +0200
+@@ -664,6 +664,8 @@ config DUMMY_CONSOLE
  	depends on VGA_HOSE
  	default y
  
@@ -180,44 +180,9 @@ diff -NurpP --minimal linux-3.4.11/arch/alpha/Kconfig linux-3.4.11-vs2.3.3.8/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/entry.S linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/entry.S
---- linux-3.4.11/arch/alpha/kernel/entry.S	2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/entry.S	2012-05-21 18:15:04.000000000 +0200
-@@ -860,24 +860,15 @@ sys_getxgid:
- 	.globl	sys_getxpid
- 	.ent	sys_getxpid
- sys_getxpid:
-+	lda	$sp, -16($sp)
-+	stq	$26, 0($sp)
- 	.prologue 0
--	ldq	$2, TI_TASK($8)
- 
--	/* See linux/kernel/timer.c sys_getppid for discussion
--	   about this loop.  */
--	ldq	$3, TASK_GROUP_LEADER($2)
--	ldq	$4, TASK_REAL_PARENT($3)
--	ldl	$0, TASK_TGID($2)
--1:	ldl	$1, TASK_TGID($4)
--#ifdef CONFIG_SMP
--	mov	$4, $5
--	mb
--	ldq	$3, TASK_GROUP_LEADER($2)
--	ldq	$4, TASK_REAL_PARENT($3)
--	cmpeq	$4, $5, $5
--	beq	$5, 1b
--#endif
--	stq	$1, 80($sp)
-+	lda	$16, 96($sp)
-+	jsr	$26, do_getxpid
-+	ldq	$26, 0($sp)
-+
-+	lda	$sp, 16($sp)
- 	ret
- .end sys_getxpid
- 
-diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/ptrace.c
---- linux-3.4.11/arch/alpha/kernel/ptrace.c	2012-05-21 18:06:12.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/ptrace.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/alpha/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/ptrace.c
+--- linux-3.6/arch/alpha/kernel/ptrace.c	2012-05-21 18:06:12.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/ptrace.c	2012-10-04 18:46:59.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <linux/user.h>
  #include <linux/security.h>
@@ -226,9 +191,9 @@ diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/ptrace.c linux-3.4.11-vs2.3
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/systbls.S linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/systbls.S
---- linux-3.4.11/arch/alpha/kernel/systbls.S	2012-01-09 16:13:54.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/systbls.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/alpha/kernel/systbls.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/systbls.S
+--- linux-3.6/arch/alpha/kernel/systbls.S	2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/systbls.S	2012-10-04 18:46:59.000000000 +0200
 @@ -446,7 +446,7 @@ sys_call_table:
  	.quad sys_stat64			/* 425 */
  	.quad sys_lstat64
@@ -238,9 +203,9 @@ diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/systbls.S linux-3.4.11-vs2.
  	.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.4.11/arch/alpha/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/traps.c
---- linux-3.4.11/arch/alpha/kernel/traps.c	2012-05-21 18:06:12.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/alpha/kernel/traps.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/alpha/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/traps.c
+--- linux-3.6/arch/alpha/kernel/traps.c	2012-05-21 18:06:12.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/traps.c	2012-10-04 18:46:59.000000000 +0200
 @@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
  	printk("CPU %d ", hard_smp_processor_id());
@@ -251,10 +216,10 @@ diff -NurpP --minimal linux-3.4.11/arch/alpha/kernel/traps.c linux-3.4.11-vs2.3.
  	dik_show_regs(regs, r9_15);
  	add_taint(TAINT_DIE);
  	dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.4.11/arch/arm/Kconfig linux-3.4.11-vs2.3.3.8/arch/arm/Kconfig
---- linux-3.4.11/arch/arm/Kconfig	2012-09-16 20:46:09.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/arm/Kconfig	2012-09-16 20:49:11.000000000 +0200
-@@ -2300,6 +2300,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/arm/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/Kconfig
+--- linux-3.6/arch/arm/Kconfig	2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/Kconfig	2012-10-04 18:46:59.000000000 +0200
+@@ -2331,6 +2331,8 @@ source "fs/Kconfig"
  
  source "arch/arm/Kconfig.debug"
  
@@ -263,9 +228,9 @@ diff -NurpP --minimal linux-3.4.11/arch/arm/Kconfig linux-3.4.11-vs2.3.3.8/arch/
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/calls.S linux-3.4.11-vs2.3.3.8/arch/arm/kernel/calls.S
---- linux-3.4.11/arch/arm/kernel/calls.S	2012-01-09 16:13:54.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/arm/kernel/calls.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/arm/kernel/calls.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/kernel/calls.S
+--- linux-3.6/arch/arm/kernel/calls.S	2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/kernel/calls.S	2012-10-04 18:46:59.000000000 +0200
 @@ -322,7 +322,7 @@
  /* 310 */	CALL(sys_request_key)
  		CALL(sys_keyctl)
@@ -275,10 +240,10 @@ diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/calls.S linux-3.4.11-vs2.3.3.
  		CALL(sys_ioprio_set)
  /* 315 */	CALL(sys_ioprio_get)
  		CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/process.c linux-3.4.11-vs2.3.3.8/arch/arm/kernel/process.c
---- linux-3.4.11/arch/arm/kernel/process.c	2012-09-16 20:46:09.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/arm/kernel/process.c	2012-09-01 10:50:48.000000000 +0200
-@@ -357,7 +357,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-3.6/arch/arm/kernel/process.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/kernel/process.c
+--- linux-3.6/arch/arm/kernel/process.c	2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/kernel/process.c	2012-10-04 18:46:59.000000000 +0200
+@@ -337,7 +337,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
  	printk("\n");
@@ -288,24 +253,24 @@ diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/process.c linux-3.4.11-vs2.3.
  	__show_regs(regs);
  	dump_stack();
  }
-diff -NurpP --minimal linux-3.4.11/arch/arm/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/arm/kernel/traps.c
---- linux-3.4.11/arch/arm/kernel/traps.c	2012-09-16 20:46:09.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/arm/kernel/traps.c	2012-09-01 10:50:48.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/arm/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/kernel/traps.c
+--- linux-3.6/arch/arm/kernel/traps.c	2012-10-04 15:26:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/kernel/traps.c	2012-10-04 19:03:56.000000000 +0200
 @@ -249,8 +249,8 @@ static int __die(const char *str, int er
  
  	print_modules();
  	__show_regs(regs);
 -	printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
--		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
+-		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
 +	printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
-+		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
++		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
  
  	if (!user_mode(regs) || in_interrupt()) {
  		dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.4.11/arch/cris/Kconfig linux-3.4.11-vs2.3.3.8/arch/cris/Kconfig
---- linux-3.4.11/arch/cris/Kconfig	2012-03-19 19:46:39.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/cris/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -675,6 +675,8 @@ source "drivers/staging/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/cris/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/cris/Kconfig
+--- linux-3.6/arch/cris/Kconfig	2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/cris/Kconfig	2012-10-04 18:46:59.000000000 +0200
+@@ -673,6 +673,8 @@ source "drivers/staging/Kconfig"
  
  source "arch/cris/Kconfig.debug"
  
@@ -314,9 +279,9 @@ diff -NurpP --minimal linux-3.4.11/arch/cris/Kconfig linux-3.4.11-vs2.3.3.8/arch
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/frv/kernel/kernel_thread.S linux-3.4.11-vs2.3.3.8/arch/frv/kernel/kernel_thread.S
---- linux-3.4.11/arch/frv/kernel/kernel_thread.S	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/frv/kernel/kernel_thread.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/frv/kernel/kernel_thread.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/frv/kernel/kernel_thread.S
+--- linux-3.6/arch/frv/kernel/kernel_thread.S	2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/frv/kernel/kernel_thread.S	2012-10-04 18:46:59.000000000 +0200
 @@ -37,7 +37,7 @@ kernel_thread:
  
  	# start by forking the current process, but with shared VM
@@ -326,10 +291,10 @@ diff -NurpP --minimal linux-3.4.11/arch/frv/kernel/kernel_thread.S linux-3.4.11-
  	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.4.11/arch/h8300/Kconfig linux-3.4.11-vs2.3.3.8/arch/h8300/Kconfig
---- linux-3.4.11/arch/h8300/Kconfig	2012-03-19 19:46:39.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/h8300/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -214,6 +214,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/h8300/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/h8300/Kconfig
+--- linux-3.6/arch/h8300/Kconfig	2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/h8300/Kconfig	2012-10-04 18:46:59.000000000 +0200
+@@ -215,6 +215,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
  
@@ -338,10 +303,10 @@ diff -NurpP --minimal linux-3.4.11/arch/h8300/Kconfig linux-3.4.11-vs2.3.3.8/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/ia64/Kconfig linux-3.4.11-vs2.3.3.8/arch/ia64/Kconfig
---- linux-3.4.11/arch/ia64/Kconfig	2012-03-19 19:46:39.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/ia64/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -654,6 +654,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/ia64/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/Kconfig
+--- linux-3.6/arch/ia64/Kconfig	2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/Kconfig	2012-10-04 18:46:59.000000000 +0200
+@@ -652,6 +652,8 @@ source "fs/Kconfig"
  
  source "arch/ia64/Kconfig.debug"
  
@@ -350,9 +315,9 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/Kconfig linux-3.4.11-vs2.3.3.8/arch
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/entry.S linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/entry.S
---- linux-3.4.11/arch/ia64/kernel/entry.S	2012-03-19 19:46:40.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/entry.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/ia64/kernel/entry.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/entry.S
+--- linux-3.6/arch/ia64/kernel/entry.S	2012-03-19 19:46:40.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/entry.S	2012-10-04 18:46:59.000000000 +0200
 @@ -1714,7 +1714,7 @@ sys_call_table:
  	data8 sys_mq_notify
  	data8 sys_mq_getsetattr
@@ -362,9 +327,9 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/entry.S linux-3.4.11-vs2.3.3
  	data8 sys_waitid			// 1270
  	data8 sys_add_key
  	data8 sys_request_key
-diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/process.c linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/process.c
---- linux-3.4.11/arch/ia64/kernel/process.c	2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/process.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/ia64/kernel/process.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/process.c
+--- linux-3.6/arch/ia64/kernel/process.c	2012-07-22 23:38:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/process.c	2012-10-04 18:46:59.000000000 +0200
 @@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
  	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
  
@@ -376,9 +341,9 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/process.c linux-3.4.11-vs2.3
  	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.4.11/arch/ia64/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/ptrace.c
---- linux-3.4.11/arch/ia64/kernel/ptrace.c	2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/ptrace.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/ia64/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/ptrace.c
+--- linux-3.6/arch/ia64/kernel/ptrace.c	2012-05-21 18:06:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/ptrace.c	2012-10-04 18:46:59.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/regset.h>
  #include <linux/elf.h>
@@ -387,9 +352,9 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/ptrace.c linux-3.4.11-vs2.3.
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/traps.c
---- linux-3.4.11/arch/ia64/kernel/traps.c	2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/ia64/kernel/traps.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/ia64/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/traps.c
+--- linux-3.6/arch/ia64/kernel/traps.c	2012-05-21 18:06:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/traps.c	2012-10-04 18:47:00.000000000 +0200
 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
  	put_cpu();
  
@@ -414,9 +379,9 @@ diff -NurpP --minimal linux-3.4.11/arch/ia64/kernel/traps.c linux-3.4.11-vs2.3.3
  			}
  		}
  	}
-diff -NurpP --minimal linux-3.4.11/arch/m32r/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/m32r/kernel/traps.c
---- linux-3.4.11/arch/m32r/kernel/traps.c	2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/m32r/kernel/traps.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/m32r/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/m32r/kernel/traps.c
+--- linux-3.6/arch/m32r/kernel/traps.c	2012-05-21 18:06:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/m32r/kernel/traps.c	2012-10-04 18:47:00.000000000 +0200
 @@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
  	} else {
  		printk("SPI: %08lx\n", sp);
@@ -429,10 +394,10 @@ diff -NurpP --minimal linux-3.4.11/arch/m32r/kernel/traps.c linux-3.4.11-vs2.3.3
  
  	/*
  	 * When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.4.11/arch/m68k/Kconfig linux-3.4.11-vs2.3.3.8/arch/m68k/Kconfig
---- linux-3.4.11/arch/m68k/Kconfig	2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/m68k/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -146,6 +146,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/m68k/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/m68k/Kconfig
+--- linux-3.6/arch/m68k/Kconfig	2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/m68k/Kconfig	2012-10-04 18:47:00.000000000 +0200
+@@ -129,6 +129,8 @@ source "fs/Kconfig"
  
  source "arch/m68k/Kconfig.debug"
  
@@ -441,10 +406,10 @@ diff -NurpP --minimal linux-3.4.11/arch/m68k/Kconfig linux-3.4.11-vs2.3.3.8/arch
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/mips/Kconfig linux-3.4.11-vs2.3.3.8/arch/mips/Kconfig
---- linux-3.4.11/arch/mips/Kconfig	2012-05-21 18:06:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/mips/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -2516,6 +2516,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/mips/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/Kconfig
+--- linux-3.6/arch/mips/Kconfig	2012-10-04 15:26:52.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/Kconfig	2012-10-04 18:47:00.000000000 +0200
+@@ -2554,6 +2554,8 @@ source "fs/Kconfig"
  
  source "arch/mips/Kconfig.debug"
  
@@ -453,9 +418,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/Kconfig linux-3.4.11-vs2.3.3.8/arch
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/arch/mips/kernel/ptrace.c
---- linux-3.4.11/arch/mips/kernel/ptrace.c	2012-05-21 18:06:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/mips/kernel/ptrace.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/ptrace.c
+--- linux-3.6/arch/mips/kernel/ptrace.c	2012-07-22 23:38:52.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/ptrace.c	2012-10-04 18:47:00.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/security.h>
  #include <linux/audit.h>
@@ -474,9 +439,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/ptrace.c linux-3.4.11-vs2.3.
  	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.4.11/arch/mips/kernel/scall32-o32.S linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall32-o32.S
---- linux-3.4.11/arch/mips/kernel/scall32-o32.S	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall32-o32.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/scall32-o32.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall32-o32.S
+--- linux-3.6/arch/mips/kernel/scall32-o32.S	2012-01-09 16:14:05.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall32-o32.S	2012-10-04 18:47:00.000000000 +0200
 @@ -523,7 +523,7 @@ einval:	li	v0, -ENOSYS
  	sys	sys_mq_timedreceive	5
  	sys	sys_mq_notify		2	/* 4275 */
@@ -486,9 +451,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall32-o32.S linux-3.4.11-v
  	sys	sys_waitid		5
  	sys	sys_ni_syscall		0	/* available, was setaltroot */
  	sys	sys_add_key		5	/* 4280 */
-diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-64.S linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall64-64.S
---- linux-3.4.11/arch/mips/kernel/scall64-64.S	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall64-64.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/scall64-64.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall64-64.S
+--- linux-3.6/arch/mips/kernel/scall64-64.S	2012-01-09 16:14:05.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall64-64.S	2012-10-04 18:47:00.000000000 +0200
 @@ -362,7 +362,7 @@ sys_call_table:
  	PTR	sys_mq_timedreceive
  	PTR	sys_mq_notify
@@ -498,9 +463,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-64.S linux-3.4.11-vs
  	PTR	sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-n32.S linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall64-n32.S
---- linux-3.4.11/arch/mips/kernel/scall64-n32.S	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall64-n32.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/scall64-n32.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall64-n32.S
+--- linux-3.6/arch/mips/kernel/scall64-n32.S	2012-01-09 16:14:05.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall64-n32.S	2012-10-04 18:47:00.000000000 +0200
 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
  	PTR	compat_sys_mq_timedreceive
  	PTR	compat_sys_mq_notify
@@ -510,9 +475,9 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-n32.S linux-3.4.11-v
  	PTR	compat_sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-o32.S linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall64-o32.S
---- linux-3.4.11/arch/mips/kernel/scall64-o32.S	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/mips/kernel/scall64-o32.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/scall64-o32.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall64-o32.S
+--- linux-3.6/arch/mips/kernel/scall64-o32.S	2012-01-09 16:14:05.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall64-o32.S	2012-10-04 18:47:00.000000000 +0200
 @@ -480,7 +480,7 @@ sys_call_table:
  	PTR	compat_sys_mq_timedreceive
  	PTR	compat_sys_mq_notify		/* 4275 */
@@ -522,10 +487,10 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/scall64-o32.S linux-3.4.11-v
  	PTR	sys_32_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key			/* 4280 */
-diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/mips/kernel/traps.c
---- linux-3.4.11/arch/mips/kernel/traps.c	2012-05-21 18:06:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/mips/kernel/traps.c	2012-05-21 18:15:04.000000000 +0200
-@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/traps.c
+--- linux-3.6/arch/mips/kernel/traps.c	2012-10-04 15:26:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/traps.c	2012-10-04 18:47:00.000000000 +0200
+@@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs
  
  	__show_regs(regs);
  	print_modules();
@@ -539,10 +504,10 @@ diff -NurpP --minimal linux-3.4.11/arch/mips/kernel/traps.c linux-3.4.11-vs2.3.3
  	if (cpu_has_userlocal) {
  		unsigned long tls;
  
-diff -NurpP --minimal linux-3.4.11/arch/parisc/Kconfig linux-3.4.11-vs2.3.3.8/arch/parisc/Kconfig
---- linux-3.4.11/arch/parisc/Kconfig	2012-03-19 19:46:44.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/parisc/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -279,6 +279,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/parisc/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/Kconfig
+--- linux-3.6/arch/parisc/Kconfig	2012-07-22 23:38:52.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/Kconfig	2012-10-04 18:47:00.000000000 +0200
+@@ -281,6 +281,8 @@ source "fs/Kconfig"
  
  source "arch/parisc/Kconfig.debug"
  
@@ -551,9 +516,9 @@ diff -NurpP --minimal linux-3.4.11/arch/parisc/Kconfig linux-3.4.11-vs2.3.3.8/ar
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/parisc/kernel/syscall_table.S linux-3.4.11-vs2.3.3.8/arch/parisc/kernel/syscall_table.S
---- linux-3.4.11/arch/parisc/kernel/syscall_table.S	2011-10-24 18:45:00.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/parisc/kernel/syscall_table.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/parisc/kernel/syscall_table.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/kernel/syscall_table.S
+--- linux-3.6/arch/parisc/kernel/syscall_table.S	2011-10-24 18:45:00.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/kernel/syscall_table.S	2012-10-04 18:47:00.000000000 +0200
 @@ -361,7 +361,7 @@
  	ENTRY_COMP(mbind)		/* 260 */
  	ENTRY_COMP(get_mempolicy)
@@ -563,9 +528,9 @@ diff -NurpP --minimal linux-3.4.11/arch/parisc/kernel/syscall_table.S linux-3.4.
  	ENTRY_SAME(add_key)
  	ENTRY_SAME(request_key)		/* 265 */
  	ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.4.11/arch/parisc/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/parisc/kernel/traps.c
---- linux-3.4.11/arch/parisc/kernel/traps.c	2012-05-21 18:06:28.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/parisc/kernel/traps.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/parisc/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/kernel/traps.c
+--- linux-3.6/arch/parisc/kernel/traps.c	2012-05-21 18:06:28.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/kernel/traps.c	2012-10-04 18:47:00.000000000 +0200
 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
  		if (err == 0)
  			return; /* STFU */
@@ -589,9 +554,9 @@ diff -NurpP --minimal linux-3.4.11/arch/parisc/kernel/traps.c linux-3.4.11-vs2.3
  
  	/* Wot's wrong wif bein' racy? */
  	if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.4.11/arch/parisc/mm/fault.c linux-3.4.11-vs2.3.3.8/arch/parisc/mm/fault.c
---- linux-3.4.11/arch/parisc/mm/fault.c	2010-08-02 16:52:06.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/parisc/mm/fault.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/parisc/mm/fault.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/mm/fault.c
+--- linux-3.6/arch/parisc/mm/fault.c	2010-08-02 16:52:06.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/mm/fault.c	2012-10-04 18:47:00.000000000 +0200
 @@ -237,8 +237,9 @@ bad_area:
  
  #ifdef PRINT_USER_FAULTS
@@ -604,10 +569,10 @@ diff -NurpP --minimal linux-3.4.11/arch/parisc/mm/fault.c linux-3.4.11-vs2.3.3.8
  		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.4.11/arch/powerpc/Kconfig linux-3.4.11-vs2.3.3.8/arch/powerpc/Kconfig
---- linux-3.4.11/arch/powerpc/Kconfig	2012-05-21 18:06:28.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/powerpc/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -1002,6 +1002,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/powerpc/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/Kconfig
+--- linux-3.6/arch/powerpc/Kconfig	2012-10-04 15:26:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/Kconfig	2012-10-04 18:47:00.000000000 +0200
+@@ -996,6 +996,8 @@ source "lib/Kconfig"
  
  source "arch/powerpc/Kconfig.debug"
  
@@ -616,9 +581,9 @@ diff -NurpP --minimal linux-3.4.11/arch/powerpc/Kconfig linux-3.4.11-vs2.3.3.8/a
  source "security/Kconfig"
  
  config KEYS_COMPAT
-diff -NurpP --minimal linux-3.4.11/arch/powerpc/include/asm/unistd.h linux-3.4.11-vs2.3.3.8/arch/powerpc/include/asm/unistd.h
---- linux-3.4.11/arch/powerpc/include/asm/unistd.h	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/powerpc/include/asm/unistd.h	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/powerpc/include/asm/unistd.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/include/asm/unistd.h
+--- linux-3.6/arch/powerpc/include/asm/unistd.h	2012-10-04 15:26:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/include/asm/unistd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -275,7 +275,7 @@
  #endif
  #define __NR_rtas		255
@@ -628,9 +593,9 @@ diff -NurpP --minimal linux-3.4.11/arch/powerpc/include/asm/unistd.h linux-3.4.1
  #define __NR_migrate_pages	258
  #define __NR_mbind		259
  #define __NR_get_mempolicy	260
-diff -NurpP --minimal linux-3.4.11/arch/powerpc/kernel/process.c linux-3.4.11-vs2.3.3.8/arch/powerpc/kernel/process.c
---- linux-3.4.11/arch/powerpc/kernel/process.c	2012-09-16 20:46:10.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/powerpc/kernel/process.c	2012-09-16 20:49:11.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/powerpc/kernel/process.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/kernel/process.c
+--- linux-3.6/arch/powerpc/kernel/process.c	2012-10-04 15:26:54.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/kernel/process.c	2012-10-04 18:47:00.000000000 +0200
 @@ -661,8 +661,9 @@ void show_regs(struct pt_regs * regs)
  #else
  		printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
@@ -643,9 +608,9 @@ diff -NurpP --minimal linux-3.4.11/arch/powerpc/kernel/process.c linux-3.4.11-vs
  
  #ifdef CONFIG_SMP
  	printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.4.11/arch/powerpc/kernel/traps.c linux-3.4.11-vs2.3.3.8/arch/powerpc/kernel/traps.c
---- linux-3.4.11/arch/powerpc/kernel/traps.c	2012-09-16 20:46:10.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/powerpc/kernel/traps.c	2012-09-16 20:49:11.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/powerpc/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/kernel/traps.c
+--- linux-3.6/arch/powerpc/kernel/traps.c	2012-10-04 15:26:54.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/kernel/traps.c	2012-10-04 18:47:00.000000000 +0200
 @@ -1119,8 +1119,9 @@ void nonrecoverable_exception(struct pt_
  
  void trace_syscall(struct pt_regs *regs)
@@ -658,10 +623,10 @@ diff -NurpP --minimal linux-3.4.11/arch/powerpc/kernel/traps.c linux-3.4.11-vs2.
  	       regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
  }
  
-diff -NurpP --minimal linux-3.4.11/arch/s390/Kconfig linux-3.4.11-vs2.3.3.8/arch/s390/Kconfig
---- linux-3.4.11/arch/s390/Kconfig	2012-05-21 18:06:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/s390/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -639,6 +639,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/s390/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/Kconfig
+--- linux-3.6/arch/s390/Kconfig	2012-10-04 15:26:54.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/Kconfig	2012-10-04 18:47:00.000000000 +0200
+@@ -634,6 +634,8 @@ source "fs/Kconfig"
  
  source "arch/s390/Kconfig.debug"
  
@@ -670,9 +635,9 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/Kconfig linux-3.4.11-vs2.3.3.8/arch
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/s390/include/asm/tlb.h linux-3.4.11-vs2.3.3.8/arch/s390/include/asm/tlb.h
---- linux-3.4.11/arch/s390/include/asm/tlb.h	2012-05-21 18:06:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/s390/include/asm/tlb.h	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/s390/include/asm/tlb.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/include/asm/tlb.h
+--- linux-3.6/arch/s390/include/asm/tlb.h	2012-07-22 23:38:59.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/include/asm/tlb.h	2012-10-04 18:47:00.000000000 +0200
 @@ -24,6 +24,7 @@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
@@ -681,10 +646,10 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/include/asm/tlb.h linux-3.4.11-vs2.
  #include <asm/processor.h>
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.4.11/arch/s390/include/asm/unistd.h linux-3.4.11-vs2.3.3.8/arch/s390/include/asm/unistd.h
---- linux-3.4.11/arch/s390/include/asm/unistd.h	2012-03-19 19:46:48.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/s390/include/asm/unistd.h	2012-05-21 18:15:04.000000000 +0200
-@@ -202,7 +202,7 @@
+diff -NurpP --minimal linux-3.6/arch/s390/include/asm/unistd.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/include/asm/unistd.h
+--- linux-3.6/arch/s390/include/asm/unistd.h	2012-10-04 15:26:55.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/include/asm/unistd.h	2012-10-04 18:47:00.000000000 +0200
+@@ -200,7 +200,7 @@
  #define __NR_clock_gettime	(__NR_timer_create+6)
  #define __NR_clock_getres	(__NR_timer_create+7)
  #define __NR_clock_nanosleep	(__NR_timer_create+8)
@@ -693,9 +658,9 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/include/asm/unistd.h linux-3.4.11-v
  #define __NR_statfs64		265
  #define __NR_fstatfs64		266
  #define __NR_remap_file_pages	267
-diff -NurpP --minimal linux-3.4.11/arch/s390/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/arch/s390/kernel/ptrace.c
---- linux-3.4.11/arch/s390/kernel/ptrace.c	2012-05-21 18:06:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/s390/kernel/ptrace.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/s390/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/kernel/ptrace.c
+--- linux-3.6/arch/s390/kernel/ptrace.c	2012-10-04 15:26:55.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/kernel/ptrace.c	2012-10-04 18:47:00.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/tracehook.h>
  #include <linux/seccomp.h>
@@ -704,9 +669,9 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/kernel/ptrace.c linux-3.4.11-vs2.3.
  #include <trace/syscall.h>
  #include <asm/segment.h>
  #include <asm/page.h>
-diff -NurpP --minimal linux-3.4.11/arch/s390/kernel/syscalls.S linux-3.4.11-vs2.3.3.8/arch/s390/kernel/syscalls.S
---- linux-3.4.11/arch/s390/kernel/syscalls.S	2012-01-09 16:14:06.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/s390/kernel/syscalls.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/s390/kernel/syscalls.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/kernel/syscalls.S
+--- linux-3.6/arch/s390/kernel/syscalls.S	2012-01-09 16:14:06.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/kernel/syscalls.S	2012-10-04 18:47:00.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)
@@ -716,10 +681,10 @@ diff -NurpP --minimal linux-3.4.11/arch/s390/kernel/syscalls.S linux-3.4.11-vs2.
  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.4.11/arch/sh/Kconfig linux-3.4.11-vs2.3.3.8/arch/sh/Kconfig
---- linux-3.4.11/arch/sh/Kconfig	2012-05-21 18:06:33.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/sh/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -905,6 +905,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/sh/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sh/Kconfig
+--- linux-3.6/arch/sh/Kconfig	2012-10-04 15:26:55.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sh/Kconfig	2012-10-04 18:47:00.000000000 +0200
+@@ -940,6 +940,8 @@ source "fs/Kconfig"
  
  source "arch/sh/Kconfig.debug"
  
@@ -728,9 +693,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sh/Kconfig linux-3.4.11-vs2.3.3.8/arch/s
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/sh/kernel/irq.c linux-3.4.11-vs2.3.3.8/arch/sh/kernel/irq.c
---- linux-3.4.11/arch/sh/kernel/irq.c	2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/sh/kernel/irq.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/sh/kernel/irq.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sh/kernel/irq.c
+--- linux-3.6/arch/sh/kernel/irq.c	2012-10-04 15:26:56.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sh/kernel/irq.c	2012-10-04 18:47:00.000000000 +0200
 @@ -14,6 +14,7 @@
  #include <linux/ftrace.h>
  #include <linux/delay.h>
@@ -739,10 +704,10 @@ diff -NurpP --minimal linux-3.4.11/arch/sh/kernel/irq.c linux-3.4.11-vs2.3.3.8/a
  #include <asm/processor.h>
  #include <asm/machvec.h>
  #include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.4.11/arch/sparc/Kconfig linux-3.4.11-vs2.3.3.8/arch/sparc/Kconfig
---- linux-3.4.11/arch/sparc/Kconfig	2012-09-16 20:46:10.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/sparc/Kconfig	2012-06-08 15:57:24.000000000 +0200
-@@ -599,6 +599,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/sparc/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/Kconfig
+--- linux-3.6/arch/sparc/Kconfig	2012-10-04 15:26:58.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/Kconfig	2012-10-04 18:47:00.000000000 +0200
+@@ -593,6 +593,8 @@ source "fs/Kconfig"
  
  source "arch/sparc/Kconfig.debug"
  
@@ -751,9 +716,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sparc/Kconfig linux-3.4.11-vs2.3.3.8/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/sparc/include/asm/unistd.h linux-3.4.11-vs2.3.3.8/arch/sparc/include/asm/unistd.h
---- linux-3.4.11/arch/sparc/include/asm/unistd.h	2012-01-09 16:14:07.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/sparc/include/asm/unistd.h	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/sparc/include/asm/unistd.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/include/asm/unistd.h
+--- linux-3.6/arch/sparc/include/asm/unistd.h	2012-10-04 15:26:59.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/include/asm/unistd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -335,7 +335,7 @@
  #define __NR_timer_getoverrun	264
  #define __NR_timer_delete	265
@@ -763,9 +728,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sparc/include/asm/unistd.h linux-3.4.11-
  #define __NR_io_setup		268
  #define __NR_io_destroy		269
  #define __NR_io_submit		270
-diff -NurpP --minimal linux-3.4.11/arch/sparc/kernel/systbls_32.S linux-3.4.11-vs2.3.3.8/arch/sparc/kernel/systbls_32.S
---- linux-3.4.11/arch/sparc/kernel/systbls_32.S	2012-01-09 16:14:09.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/sparc/kernel/systbls_32.S	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/sparc/kernel/systbls_32.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/kernel/systbls_32.S
+--- linux-3.6/arch/sparc/kernel/systbls_32.S	2012-01-09 16:14:09.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/kernel/systbls_32.S	2012-10-04 18:47:00.000000000 +0200
 @@ -70,7 +70,7 @@ sys_call_table:
  /*250*/	.long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
  /*255*/	.long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -775,9 +740,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sparc/kernel/systbls_32.S linux-3.4.11-v
  /*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.4.11/arch/sparc/kernel/systbls_64.S linux-3.4.11-vs2.3.3.8/arch/sparc/kernel/systbls_64.S
---- linux-3.4.11/arch/sparc/kernel/systbls_64.S	2012-09-16 20:46:10.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/sparc/kernel/systbls_64.S	2012-06-08 15:57:24.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/sparc/kernel/systbls_64.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/kernel/systbls_64.S
+--- linux-3.6/arch/sparc/kernel/systbls_64.S	2012-07-22 23:39:00.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/kernel/systbls_64.S	2012-10-04 18:47:00.000000000 +0200
 @@ -71,7 +71,7 @@ sys_call_table32:
  /*250*/	.word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall
  	.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -796,9 +761,9 @@ diff -NurpP --minimal linux-3.4.11/arch/sparc/kernel/systbls_64.S linux-3.4.11-v
  /*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.4.11/arch/um/Kconfig.rest linux-3.4.11-vs2.3.3.8/arch/um/Kconfig.rest
---- linux-3.4.11/arch/um/Kconfig.rest	2012-01-09 16:14:09.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/um/Kconfig.rest	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/um/Kconfig.rest linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/Kconfig.rest
+--- linux-3.6/arch/um/Kconfig.rest	2012-01-09 16:14:09.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/Kconfig.rest	2012-10-04 18:47:00.000000000 +0200
 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
  
  source "fs/Kconfig"
@@ -808,14 +773,14 @@ diff -NurpP --minimal linux-3.4.11/arch/um/Kconfig.rest linux-3.4.11-vs2.3.3.8/a
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/um/include/shared/kern_constants.h linux-3.4.11-vs2.3.3.8/arch/um/include/shared/kern_constants.h
---- linux-3.4.11/arch/um/include/shared/kern_constants.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/um/include/shared/kern_constants.h	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/um/include/shared/kern_constants.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/include/shared/kern_constants.h
+--- linux-3.6/arch/um/include/shared/kern_constants.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/include/shared/kern_constants.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1 @@
 +#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.4.11/arch/um/include/shared/user_constants.h linux-3.4.11-vs2.3.3.8/arch/um/include/shared/user_constants.h
---- linux-3.4.11/arch/um/include/shared/user_constants.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/arch/um/include/shared/user_constants.h	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/um/include/shared/user_constants.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/include/shared/user_constants.h
+--- linux-3.6/arch/um/include/shared/user_constants.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/include/shared/user_constants.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,40 @@
 +/*
 + * DO NOT MODIFY.
@@ -857,10 +822,10 @@ diff -NurpP --minimal linux-3.4.11/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.4.11/arch/x86/Kconfig linux-3.4.11-vs2.3.3.8/arch/x86/Kconfig
---- linux-3.4.11/arch/x86/Kconfig	2012-05-21 18:06:35.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/x86/Kconfig	2012-05-21 18:15:04.000000000 +0200
-@@ -2225,6 +2225,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/x86/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/Kconfig
+--- linux-3.6/arch/x86/Kconfig	2012-10-04 15:27:00.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/Kconfig	2012-10-04 18:47:00.000000000 +0200
+@@ -2228,6 +2228,8 @@ source "fs/Kconfig"
  
  source "arch/x86/Kconfig.debug"
  
@@ -869,9 +834,9 @@ diff -NurpP --minimal linux-3.4.11/arch/x86/Kconfig linux-3.4.11-vs2.3.3.8/arch/
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.11/arch/x86/syscalls/syscall_32.tbl linux-3.4.11-vs2.3.3.8/arch/x86/syscalls/syscall_32.tbl
---- linux-3.4.11/arch/x86/syscalls/syscall_32.tbl	2012-05-21 18:06:42.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/x86/syscalls/syscall_32.tbl	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/x86/syscalls/syscall_32.tbl linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.6/arch/x86/syscalls/syscall_32.tbl	2012-07-22 23:39:02.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/syscalls/syscall_32.tbl	2012-10-04 18:47:00.000000000 +0200
 @@ -279,7 +279,7 @@
  270	i386	tgkill			sys_tgkill
  271	i386	utimes			sys_utimes			compat_sys_utimes
@@ -881,9 +846,9 @@ diff -NurpP --minimal linux-3.4.11/arch/x86/syscalls/syscall_32.tbl linux-3.4.11
  274	i386	mbind			sys_mbind
  275	i386	get_mempolicy		sys_get_mempolicy		compat_sys_get_mempolicy
  276	i386	set_mempolicy		sys_set_mempolicy
-diff -NurpP --minimal linux-3.4.11/arch/x86/syscalls/syscall_64.tbl linux-3.4.11-vs2.3.3.8/arch/x86/syscalls/syscall_64.tbl
---- linux-3.4.11/arch/x86/syscalls/syscall_64.tbl	2012-09-16 20:46:10.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/arch/x86/syscalls/syscall_64.tbl	2012-09-16 20:49:11.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/x86/syscalls/syscall_64.tbl linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.6/arch/x86/syscalls/syscall_64.tbl	2012-10-04 15:27:01.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/syscalls/syscall_64.tbl	2012-10-04 18:47:00.000000000 +0200
 @@ -242,7 +242,7 @@
  233	common	epoll_ctl		sys_epoll_ctl
  234	common	tgkill			sys_tgkill
@@ -893,9 +858,9 @@ diff -NurpP --minimal linux-3.4.11/arch/x86/syscalls/syscall_64.tbl linux-3.4.11
  237	common	mbind			sys_mbind
  238	common	set_mempolicy		sys_set_mempolicy
  239	common	get_mempolicy		sys_get_mempolicy
-diff -NurpP --minimal linux-3.4.11/drivers/block/Kconfig linux-3.4.11-vs2.3.3.8/drivers/block/Kconfig
---- linux-3.4.11/drivers/block/Kconfig	2012-05-21 18:06:43.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/drivers/block/Kconfig	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/block/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/Kconfig
+--- linux-3.6/drivers/block/Kconfig	2012-05-21 18:06:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/Kconfig	2012-10-04 18:47:00.000000000 +0200
 @@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP
  
  source "drivers/block/drbd/Kconfig"
@@ -910,9 +875,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/Kconfig linux-3.4.11-vs2.3.3.8/
  config BLK_DEV_NBD
  	tristate "Network block device support"
  	depends on NET
-diff -NurpP --minimal linux-3.4.11/drivers/block/Makefile linux-3.4.11-vs2.3.3.8/drivers/block/Makefile
---- linux-3.4.11/drivers/block/Makefile	2012-03-19 19:46:52.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/drivers/block/Makefile	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/block/Makefile linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/Makefile
+--- linux-3.6/drivers/block/Makefile	2012-03-19 19:46:52.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/Makefile	2012-10-04 18:47:00.000000000 +0200
 @@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD)		+= viodasd.o
  obj-$(CONFIG_BLK_DEV_SX8)	+= sx8.o
  obj-$(CONFIG_BLK_DEV_UB)	+= ub.o
@@ -921,9 +886,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/Makefile linux-3.4.11-vs2.3.3.8
  
  obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
  obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen-blkback/
-diff -NurpP --minimal linux-3.4.11/drivers/block/loop.c linux-3.4.11-vs2.3.3.8/drivers/block/loop.c
---- linux-3.4.11/drivers/block/loop.c	2012-05-21 18:06:43.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/drivers/block/loop.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/block/loop.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/loop.c
+--- linux-3.6/drivers/block/loop.c	2012-07-22 23:39:02.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/loop.c	2012-10-04 18:47:00.000000000 +0200
 @@ -76,6 +76,7 @@
  #include <linux/sysfs.h>
  #include <linux/miscdevice.h>
@@ -979,9 +944,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/loop.c linux-3.4.11-vs2.3.3.8/d
  	mutex_lock(&lo->lo_ctl_mutex);
  	lo->lo_refcnt++;
  	mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.4.11/drivers/block/vroot.c linux-3.4.11-vs2.3.3.8/drivers/block/vroot.c
---- linux-3.4.11/drivers/block/vroot.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/drivers/block/vroot.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/block/vroot.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/vroot.c
+--- linux-3.6/drivers/block/vroot.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/vroot.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,291 @@
 +/*
 + *  linux/drivers/block/vroot.c
@@ -1274,9 +1239,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/block/vroot.c linux-3.4.11-vs2.3.3.8/
 +
 +#endif
 +
-diff -NurpP --minimal linux-3.4.11/drivers/infiniband/Kconfig linux-3.4.11-vs2.3.3.8/drivers/infiniband/Kconfig
---- linux-3.4.11/drivers/infiniband/Kconfig	2012-03-19 19:46:54.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/drivers/infiniband/Kconfig	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/infiniband/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/infiniband/Kconfig
+--- linux-3.6/drivers/infiniband/Kconfig	2012-07-22 23:39:06.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/infiniband/Kconfig	2012-10-04 18:47:00.000000000 +0200
 @@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
  config INFINIBAND_ADDR_TRANS
  	bool
@@ -1286,9 +1251,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/infiniband/Kconfig linux-3.4.11-vs2.3
  	default y
  
  source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.4.11/drivers/infiniband/core/addr.c linux-3.4.11-vs2.3.3.8/drivers/infiniband/core/addr.c
---- linux-3.4.11/drivers/infiniband/core/addr.c	2012-05-21 18:06:46.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/drivers/infiniband/core/addr.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/infiniband/core/addr.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/infiniband/core/addr.c
+--- linux-3.6/drivers/infiniband/core/addr.c	2012-10-04 15:27:10.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/infiniband/core/addr.c	2012-10-04 18:47:00.000000000 +0200
 @@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr
  
  	if (ipv6_addr_any(&fl6.saddr)) {
@@ -1298,9 +1263,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/infiniband/core/addr.c linux-3.4.11-v
  		if (ret)
  			goto put;
  
-diff -NurpP --minimal linux-3.4.11/drivers/md/dm-ioctl.c linux-3.4.11-vs2.3.3.8/drivers/md/dm-ioctl.c
---- linux-3.4.11/drivers/md/dm-ioctl.c	2012-05-21 18:06:49.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/drivers/md/dm-ioctl.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/md/dm-ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm-ioctl.c
+--- linux-3.6/drivers/md/dm-ioctl.c	2012-10-04 15:27:11.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm-ioctl.c	2012-10-04 18:47:00.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/dm-ioctl.h>
  #include <linux/hdreg.h>
@@ -1375,7 +1340,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm-ioctl.c linux-3.4.11-vs2.3.3.8/
  			if (old_nl)
  				old_nl->next = (uint32_t) ((void *) nl -
  							   (void *) old_nl);
-@@ -1616,8 +1628,8 @@ static int ctl_ioctl(uint command, struc
+@@ -1619,8 +1631,8 @@ static int ctl_ioctl(uint command, struc
  	ioctl_fn fn = NULL;
  	size_t input_param_size;
  
@@ -1386,9 +1351,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm-ioctl.c linux-3.4.11-vs2.3.3.8/
  		return -EACCES;
  
  	if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.4.11/drivers/md/dm.c linux-3.4.11-vs2.3.3.8/drivers/md/dm.c
---- linux-3.4.11/drivers/md/dm.c	2012-05-21 18:06:49.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/drivers/md/dm.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/md/dm.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm.c
+--- linux-3.6/drivers/md/dm.c	2012-10-04 15:27:11.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm.c	2012-10-04 18:47:00.000000000 +0200
 @@ -19,6 +19,7 @@
  #include <linux/idr.h>
  #include <linux/hdreg.h>
@@ -1454,7 +1419,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm.c linux-3.4.11-vs2.3.3.8/driver
  /*-----------------------------------------------------------------
   * CRUD START:
   *   A more elegant soln is in the works that uses the queue
-@@ -1850,6 +1862,7 @@ static struct mapped_device *alloc_dev(i
+@@ -1892,6 +1904,7 @@ static struct mapped_device *alloc_dev(i
  	INIT_LIST_HEAD(&md->uevent_list);
  	spin_lock_init(&md->uevent_lock);
  
@@ -1462,10 +1427,10 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm.c linux-3.4.11-vs2.3.3.8/driver
  	md->queue = blk_alloc_queue(GFP_KERNEL);
  	if (!md->queue)
  		goto bad_queue;
-diff -NurpP --minimal linux-3.4.11/drivers/md/dm.h linux-3.4.11-vs2.3.3.8/drivers/md/dm.h
---- linux-3.4.11/drivers/md/dm.h	2012-01-09 16:14:21.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/drivers/md/dm.h	2012-05-21 18:15:04.000000000 +0200
-@@ -41,6 +41,8 @@ struct dm_dev_internal {
+diff -NurpP --minimal linux-3.6/drivers/md/dm.h linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm.h
+--- linux-3.6/drivers/md/dm.h	2012-10-04 15:27:11.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm.h	2012-10-04 18:47:00.000000000 +0200
+@@ -46,6 +46,8 @@ struct dm_dev_internal {
  struct dm_table;
  struct dm_md_mempools;
  
@@ -1474,9 +1439,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/md/dm.h linux-3.4.11-vs2.3.3.8/driver
  /*-----------------------------------------------------------------
   * Internal table functions.
   *---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/drivers/net/tun.c
---- linux-3.4.11/drivers/net/tun.c	2012-09-16 20:46:12.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/drivers/net/tun.c	2012-09-01 10:50:48.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/net/tun.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/net/tun.c
+--- linux-3.6/drivers/net/tun.c	2012-10-04 15:27:20.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/net/tun.c	2012-10-04 18:47:00.000000000 +0200
 @@ -64,6 +64,7 @@
  #include <linux/nsproxy.h>
  #include <linux/virtio_net.h>
@@ -1485,7 +1450,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/driv
  #include <net/net_namespace.h>
  #include <net/netns/generic.h>
  #include <net/rtnetlink.h>
-@@ -120,6 +121,7 @@ struct tun_struct {
+@@ -122,6 +123,7 @@ struct tun_struct {
  	unsigned int 		flags;
  	uid_t			owner;
  	gid_t			group;
@@ -1493,7 +1458,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/driv
  
  	struct net_device	*dev;
  	netdev_features_t	set_features;
-@@ -910,6 +912,7 @@ static void tun_setup(struct net_device 
+@@ -1033,6 +1035,7 @@ static void tun_setup(struct net_device 
  
  	tun->owner = -1;
  	tun->group = -1;
@@ -1501,7 +1466,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/driv
  
  	dev->ethtool_ops = &tun_ethtool_ops;
  	dev->destructor = tun_free_netdev;
-@@ -1068,7 +1071,7 @@ static int tun_set_iff(struct net *net, 
+@@ -1191,7 +1194,7 @@ static int tun_set_iff(struct net *net, 
  
  		if (((tun->owner != -1 && cred->euid != tun->owner) ||
  		     (tun->group != -1 && !in_egroup_p(tun->group))) &&
@@ -1510,7 +1475,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/driv
  			return -EPERM;
  		err = security_tun_dev_attach(tun->socket.sk);
  		if (err < 0)
-@@ -1082,7 +1085,7 @@ static int tun_set_iff(struct net *net, 
+@@ -1205,7 +1208,7 @@ static int tun_set_iff(struct net *net, 
  		char *name;
  		unsigned long flags = 0;
  
@@ -1519,7 +1484,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/driv
  			return -EPERM;
  		err = security_tun_dev_create();
  		if (err < 0)
-@@ -1152,6 +1155,9 @@ static int tun_set_iff(struct net *net, 
+@@ -1276,6 +1279,9 @@ static int tun_set_iff(struct net *net, 
  
  		sk->sk_destruct = tun_sock_destruct;
  
@@ -1529,7 +1494,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/driv
  		err = tun_attach(tun, file);
  		if (err < 0)
  			goto failed;
-@@ -1335,6 +1341,16 @@ static long __tun_chr_ioctl(struct file 
+@@ -1459,6 +1465,16 @@ static long __tun_chr_ioctl(struct file 
  		tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
  		break;
  
@@ -1546,9 +1511,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/net/tun.c linux-3.4.11-vs2.3.3.8/driv
  	case TUNSETLINK:
  		/* Only allow setting the type when the interface is down */
  		if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.4.11/drivers/tty/sysrq.c linux-3.4.11-vs2.3.3.8/drivers/tty/sysrq.c
---- linux-3.4.11/drivers/tty/sysrq.c	2012-05-21 18:07:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/drivers/tty/sysrq.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/tty/sysrq.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/tty/sysrq.c
+--- linux-3.6/drivers/tty/sysrq.c	2012-05-21 18:07:16.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/tty/sysrq.c	2012-10-04 18:47:00.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/slab.h>
  #include <linux/input.h>
@@ -1600,9 +1565,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/tty/sysrq.c linux-3.4.11-vs2.3.3.8/dr
  	else
  		retval = -1;
  	return retval;
-diff -NurpP --minimal linux-3.4.11/drivers/tty/tty_io.c linux-3.4.11-vs2.3.3.8/drivers/tty/tty_io.c
---- linux-3.4.11/drivers/tty/tty_io.c	2012-05-21 18:07:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/drivers/tty/tty_io.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/tty/tty_io.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/tty/tty_io.c
+--- linux-3.6/drivers/tty/tty_io.c	2012-07-22 23:39:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/tty/tty_io.c	2012-10-04 18:47:00.000000000 +0200
 @@ -104,6 +104,7 @@
  
  #include <linux/kmod.h>
@@ -1611,7 +1576,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/tty/tty_io.c linux-3.4.11-vs2.3.3.8/d
  
  #undef TTY_DEBUG_HANGUP
  
-@@ -2118,7 +2119,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2123,7 +2124,8 @@ static int tiocsti(struct tty_struct *tt
  	char ch, mbz = 0;
  	struct tty_ldisc *ld;
  
@@ -1621,7 +1586,7 @@ diff -NurpP --minimal linux-3.4.11/drivers/tty/tty_io.c linux-3.4.11-vs2.3.3.8/d
  		return -EPERM;
  	if (get_user(ch, p))
  		return -EFAULT;
-@@ -2406,6 +2408,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2411,6 +2413,7 @@ static int tiocspgrp(struct tty_struct *
  		return -ENOTTY;
  	if (get_user(pgrp_nr, p))
  		return -EFAULT;
@@ -1629,9 +1594,9 @@ diff -NurpP --minimal linux-3.4.11/drivers/tty/tty_io.c linux-3.4.11-vs2.3.3.8/d
  	if (pgrp_nr < 0)
  		return -EINVAL;
  	rcu_read_lock();
-diff -NurpP --minimal linux-3.4.11/fs/attr.c linux-3.4.11-vs2.3.3.8/fs/attr.c
---- linux-3.4.11/fs/attr.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/attr.c	2012-06-28 16:45:07.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/attr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/attr.c
+--- linux-3.6/fs/attr.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/attr.c	2012-10-04 18:47:00.000000000 +0200
 @@ -14,6 +14,9 @@
  #include <linux/fcntl.h>
  #include <linux/security.h>
@@ -1662,9 +1627,9 @@ diff -NurpP --minimal linux-3.4.11/fs/attr.c linux-3.4.11-vs2.3.3.8/fs/attr.c
  	if (ia_valid & ATTR_ATIME)
  		inode->i_atime = timespec_trunc(attr->ia_atime,
  						inode->i_sb->s_time_gran);
-@@ -171,7 +180,8 @@ int notify_change(struct dentry * dentry
- 	struct timespec now;
- 	unsigned int ia_valid = attr->ia_valid;
+@@ -173,7 +182,8 @@ int notify_change(struct dentry * dentry
+ 
+ 	WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex));
  
 -	if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
 +	if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
@@ -1672,9 +1637,9 @@ diff -NurpP --minimal linux-3.4.11/fs/attr.c linux-3.4.11-vs2.3.3.8/fs/attr.c
  		if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  			return -EPERM;
  	}
-diff -NurpP --minimal linux-3.4.11/fs/block_dev.c linux-3.4.11-vs2.3.3.8/fs/block_dev.c
---- linux-3.4.11/fs/block_dev.c	2012-05-21 18:07:18.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/block_dev.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/block_dev.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/block_dev.c
+--- linux-3.6/fs/block_dev.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/block_dev.c	2012-10-04 18:47:00.000000000 +0200
 @@ -27,6 +27,7 @@
  #include <linux/namei.h>
  #include <linux/log2.h>
@@ -1712,10 +1677,10 @@ diff -NurpP --minimal linux-3.4.11/fs/block_dev.c linux-3.4.11-vs2.3.3.8/fs/bloc
  	if (bdev) {
  		spin_lock(&bdev_lock);
  		if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.4.11/fs/btrfs/ctree.h linux-3.4.11-vs2.3.3.8/fs/btrfs/ctree.h
---- linux-3.4.11/fs/btrfs/ctree.h	2012-05-21 18:07:18.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/btrfs/ctree.h	2012-05-21 18:15:04.000000000 +0200
-@@ -668,11 +668,14 @@ struct btrfs_inode_item {
+diff -NurpP --minimal linux-3.6/fs/btrfs/ctree.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/ctree.h
+--- linux-3.6/fs/btrfs/ctree.h	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/ctree.h	2012-10-04 18:47:00.000000000 +0200
+@@ -674,11 +674,14 @@ struct btrfs_inode_item {
  	/* modification sequence number for NFS */
  	__le64 sequence;
  
@@ -1731,7 +1696,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ctree.h linux-3.4.11-vs2.3.3.8/fs/bt
  	struct btrfs_timespec atime;
  	struct btrfs_timespec ctime;
  	struct btrfs_timespec mtime;
-@@ -1542,6 +1545,8 @@ struct btrfs_ioctl_defrag_range_args {
+@@ -1727,6 +1730,8 @@ struct btrfs_ioctl_defrag_range_args {
  #define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21)
  #define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	(1 << 22)
  
@@ -1740,7 +1705,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ctree.h linux-3.4.11-vs2.3.3.8/fs/bt
  #define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)
  #define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)
  #define btrfs_test_opt(root, opt)	((root)->fs_info->mount_opt & \
-@@ -1762,6 +1767,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+@@ -1988,6 +1993,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
  BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
  BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
  BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
@@ -1748,7 +1713,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ctree.h linux-3.4.11-vs2.3.3.8/fs/bt
  BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
  BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
  BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -1815,6 +1821,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct 
+@@ -2041,6 +2047,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct 
  
  BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
  
@@ -1759,7 +1724,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ctree.h linux-3.4.11-vs2.3.3.8/fs/bt
  
  BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
  
-@@ -2959,6 +2969,7 @@ extern const struct dentry_operations bt
+@@ -3305,6 +3315,7 @@ extern const struct dentry_operations bt
  long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
  void btrfs_update_iflags(struct inode *inode);
  void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
@@ -1767,10 +1732,10 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ctree.h linux-3.4.11-vs2.3.3.8/fs/bt
  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.4.11/fs/btrfs/disk-io.c linux-3.4.11-vs2.3.3.8/fs/btrfs/disk-io.c
---- linux-3.4.11/fs/btrfs/disk-io.c	2012-05-21 18:07:18.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/btrfs/disk-io.c	2012-05-21 18:15:04.000000000 +0200
-@@ -2083,6 +2083,9 @@ int open_ctree(struct super_block *sb,
+diff -NurpP --minimal linux-3.6/fs/btrfs/disk-io.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/disk-io.c
+--- linux-3.6/fs/btrfs/disk-io.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/disk-io.c	2012-10-04 18:47:00.000000000 +0200
+@@ -2187,6 +2187,9 @@ int open_ctree(struct super_block *sb,
  		goto fail_alloc;
  	}
  
@@ -1780,9 +1745,9 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/disk-io.c linux-3.4.11-vs2.3.3.8/fs/
  	features = btrfs_super_incompat_flags(disk_super) &
  		~BTRFS_FEATURE_INCOMPAT_SUPP;
  	if (features) {
-diff -NurpP --minimal linux-3.4.11/fs/btrfs/inode.c linux-3.4.11-vs2.3.3.8/fs/btrfs/inode.c
---- linux-3.4.11/fs/btrfs/inode.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/btrfs/inode.c	2012-06-28 16:45:07.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/btrfs/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/inode.c
+--- linux-3.6/fs/btrfs/inode.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -39,6 +39,7 @@
  #include <linux/slab.h>
  #include <linux/ratelimit.h>
@@ -1791,7 +1756,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/inode.c linux-3.4.11-vs2.3.3.8/fs/bt
  #include "compat.h"
  #include "ctree.h"
  #include "disk-io.h"
-@@ -2468,6 +2469,8 @@ static void btrfs_read_locked_inode(stru
+@@ -2545,6 +2546,8 @@ static void btrfs_read_locked_inode(stru
  	struct btrfs_key location;
  	int maybe_acls;
  	u32 rdev;
@@ -1800,7 +1765,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/inode.c linux-3.4.11-vs2.3.3.8/fs/bt
  	int ret;
  	bool filled = false;
  
-@@ -2495,8 +2498,13 @@ static void btrfs_read_locked_inode(stru
+@@ -2572,8 +2575,13 @@ static void btrfs_read_locked_inode(stru
  				    struct btrfs_inode_item);
  	inode->i_mode = btrfs_inode_mode(leaf, inode_item);
  	set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
@@ -1816,7 +1781,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/inode.c linux-3.4.11-vs2.3.3.8/fs/bt
  	btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
  
  	tspec = btrfs_inode_atime(inode_item);
-@@ -2574,8 +2582,14 @@ static void fill_inode_item(struct btrfs
+@@ -2651,8 +2659,14 @@ static void fill_inode_item(struct btrfs
  			    struct btrfs_inode_item *item,
  			    struct inode *inode)
  {
@@ -1833,7 +1798,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/inode.c linux-3.4.11-vs2.3.3.8/fs/bt
  	btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
  	btrfs_set_inode_mode(leaf, item, inode->i_mode);
  	btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
-@@ -7576,11 +7590,13 @@ static const struct inode_operations btr
+@@ -7636,11 +7650,13 @@ static const struct inode_operations btr
  	.listxattr	= btrfs_listxattr,
  	.removexattr	= btrfs_removexattr,
  	.permission	= btrfs_permission,
@@ -1847,10 +1812,10 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/inode.c linux-3.4.11-vs2.3.3.8/fs/bt
  	.get_acl	= btrfs_get_acl,
  };
  
-diff -NurpP --minimal linux-3.4.11/fs/btrfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/btrfs/ioctl.c
---- linux-3.4.11/fs/btrfs/ioctl.c	2012-05-21 18:07:19.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/btrfs/ioctl.c	2012-05-21 18:15:04.000000000 +0200
-@@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl
+diff -NurpP --minimal linux-3.6/fs/btrfs/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/ioctl.c
+--- linux-3.6/fs/btrfs/ioctl.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/ioctl.c	2012-10-04 18:47:00.000000000 +0200
+@@ -74,10 +74,13 @@ static unsigned int btrfs_flags_to_ioctl
  {
  	unsigned int iflags = 0;
  
@@ -1866,7 +1831,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/bt
  	if (flags & BTRFS_INODE_APPEND)
  		iflags |= FS_APPEND_FL;
  	if (flags & BTRFS_INODE_NODUMP)
-@@ -91,28 +94,78 @@ static unsigned int btrfs_flags_to_ioctl
+@@ -94,28 +97,78 @@ static unsigned int btrfs_flags_to_ioctl
  	else if (flags & BTRFS_INODE_NOCOMPRESS)
  		iflags |= FS_NOCOMP_FL;
  
@@ -1949,7 +1914,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/bt
  }
  
  /*
-@@ -128,6 +181,7 @@ void btrfs_inherit_iflags(struct inode *
+@@ -131,6 +184,7 @@ void btrfs_inherit_iflags(struct inode *
  		return;
  
  	flags = BTRFS_I(dir)->flags;
@@ -1957,7 +1922,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/bt
  
  	if (flags & BTRFS_INODE_NOCOMPRESS) {
  		BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
-@@ -143,6 +197,30 @@ void btrfs_inherit_iflags(struct inode *
+@@ -146,6 +200,30 @@ void btrfs_inherit_iflags(struct inode *
  	btrfs_update_iflags(inode);
  }
  
@@ -1988,7 +1953,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/bt
  static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
  {
  	struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
-@@ -199,7 +277,8 @@ static int btrfs_ioctl_setflags(struct f
+@@ -206,21 +284,27 @@ static int btrfs_ioctl_setflags(struct f
  
  	flags = btrfs_mask_flags(inode->i_mode, flags);
  	oldflags = btrfs_flags_to_ioctl(ip->flags);
@@ -1998,9 +1963,8 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/bt
  		if (!capable(CAP_LINUX_IMMUTABLE)) {
  			ret = -EPERM;
  			goto out_unlock;
-@@ -210,14 +289,19 @@ static int btrfs_ioctl_setflags(struct f
- 	if (ret)
- 		goto out_unlock;
+ 		}
+ 	}
  
 -	if (flags & FS_SYNC_FL)
 -		ip->flags |= BTRFS_INODE_SYNC;
@@ -2022,10 +1986,10 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/bt
  	if (flags & FS_APPEND_FL)
  		ip->flags |= BTRFS_INODE_APPEND;
  	else
-diff -NurpP --minimal linux-3.4.11/fs/btrfs/super.c linux-3.4.11-vs2.3.3.8/fs/btrfs/super.c
---- linux-3.4.11/fs/btrfs/super.c	2012-05-21 18:07:19.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/btrfs/super.c	2012-05-21 18:15:04.000000000 +0200
-@@ -279,7 +279,7 @@ enum {
+diff -NurpP --minimal linux-3.6/fs/btrfs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/super.c
+--- linux-3.6/fs/btrfs/super.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/super.c	2012-10-04 18:47:00.000000000 +0200
+@@ -306,7 +306,7 @@ enum {
  	Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
  	Opt_check_integrity, Opt_check_integrity_including_extent_data,
  	Opt_check_integrity_print_mask, Opt_fatal_errors,
@@ -2034,7 +1998,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/super.c linux-3.4.11-vs2.3.3.8/fs/bt
  };
  
  static match_table_t tokens = {
-@@ -319,6 +319,9 @@ static match_table_t tokens = {
+@@ -346,6 +346,9 @@ static match_table_t tokens = {
  	{Opt_check_integrity_including_extent_data, "check_int_data"},
  	{Opt_check_integrity_print_mask, "check_int_print_mask=%d"},
  	{Opt_fatal_errors, "fatal_errors=%s"},
@@ -2044,7 +2008,7 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/super.c linux-3.4.11-vs2.3.3.8/fs/bt
  	{Opt_err, NULL},
  };
  
-@@ -564,6 +567,22 @@ int btrfs_parse_options(struct btrfs_roo
+@@ -596,6 +599,22 @@ int btrfs_parse_options(struct btrfs_roo
  				goto out;
  			}
  			break;
@@ -2067,9 +2031,9 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/super.c linux-3.4.11-vs2.3.3.8/fs/bt
  		case Opt_err:
  			printk(KERN_INFO "btrfs: unrecognized mount option "
  			       "'%s'\n", p);
-@@ -1137,6 +1156,12 @@ static int btrfs_remount(struct super_bl
- 		goto restore;
- 	}
+@@ -1196,6 +1215,12 @@ static int btrfs_remount(struct super_bl
+ 	btrfs_resize_thread_pool(fs_info,
+ 		fs_info->thread_pool_size, old_thread_pool_size);
  
 +	if (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
 +		printk("btrfs: %s: tagging not permitted on remount.\n",
@@ -2080,9 +2044,9 @@ diff -NurpP --minimal linux-3.4.11/fs/btrfs/super.c linux-3.4.11-vs2.3.3.8/fs/bt
  	if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
  		return 0;
  
-diff -NurpP --minimal linux-3.4.11/fs/char_dev.c linux-3.4.11-vs2.3.3.8/fs/char_dev.c
---- linux-3.4.11/fs/char_dev.c	2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/char_dev.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/char_dev.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/char_dev.c
+--- linux-3.6/fs/char_dev.c	2012-03-19 19:47:25.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/char_dev.c	2012-10-04 18:47:00.000000000 +0200
 @@ -21,6 +21,8 @@
  #include <linux/mutex.h>
  #include <linux/backing-dev.h>
@@ -2115,9 +2079,9 @@ diff -NurpP --minimal linux-3.4.11/fs/char_dev.c linux-3.4.11-vs2.3.3.8/fs/char_
  		if (!kobj)
  			return -ENXIO;
  		new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache.c
---- linux-3.4.11/fs/dcache.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/dcache.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/dcache.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/dcache.c
+--- linux-3.6/fs/dcache.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/dcache.c	2012-10-04 18:47:00.000000000 +0200
 @@ -37,6 +37,7 @@
  #include <linux/rculist_bl.h>
  #include <linux/prefetch.h>
@@ -2126,7 +2090,7 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache.
  #include "internal.h"
  #include "mount.h"
  
-@@ -601,6 +602,8 @@ int d_invalidate(struct dentry * dentry)
+@@ -617,6 +618,8 @@ int d_invalidate(struct dentry * dentry)
  		spin_lock(&dentry->d_lock);
  	}
  
@@ -2135,7 +2099,7 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache.
  	/*
  	 * Somebody else still using it?
  	 *
-@@ -630,6 +633,7 @@ EXPORT_SYMBOL(d_invalidate);
+@@ -646,6 +649,7 @@ EXPORT_SYMBOL(d_invalidate);
  static inline void __dget_dlock(struct dentry *dentry)
  {
  	dentry->d_count++;
@@ -2143,7 +2107,7 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache.
  }
  
  static inline void __dget(struct dentry *dentry)
-@@ -1254,6 +1258,9 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1276,6 +1280,9 @@ struct dentry *__d_alloc(struct super_bl
  	struct dentry *dentry;
  	char *dname;
  
@@ -2153,7 +2117,7 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache.
  	dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
  	if (!dentry)
  		return NULL;
-@@ -1276,6 +1283,7 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1308,6 +1315,7 @@ struct dentry *__d_alloc(struct super_bl
  
  	dentry->d_count = 1;
  	dentry->d_flags = 0;
@@ -2161,7 +2125,7 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache.
  	spin_lock_init(&dentry->d_lock);
  	seqcount_init(&dentry->d_seq);
  	dentry->d_inode = NULL;
-@@ -1937,6 +1945,7 @@ struct dentry *__d_lookup(struct dentry 
+@@ -2012,6 +2020,7 @@ struct dentry *__d_lookup(struct dentry 
  		}
  
  		dentry->d_count++;
@@ -2169,9 +2133,9 @@ diff -NurpP --minimal linux-3.4.11/fs/dcache.c linux-3.4.11-vs2.3.3.8/fs/dcache.
  		found = dentry;
  		spin_unlock(&dentry->d_lock);
  		break;
-diff -NurpP --minimal linux-3.4.11/fs/devpts/inode.c linux-3.4.11-vs2.3.3.8/fs/devpts/inode.c
---- linux-3.4.11/fs/devpts/inode.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/devpts/inode.c	2012-05-21 18:15:04.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/devpts/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/devpts/inode.c
+--- linux-3.6/fs/devpts/inode.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/devpts/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/parser.h>
  #include <linux/fsnotify.h>
@@ -2202,7 +2166,7 @@ diff -NurpP --minimal linux-3.4.11/fs/devpts/inode.c linux-3.4.11-vs2.3.3.8/fs/d
  /*
   * sysctl support for setting limits on the number of Unix98 ptys allocated.
   * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
-@@ -328,6 +344,34 @@ static int devpts_show_options(struct se
+@@ -336,6 +352,34 @@ static int devpts_show_options(struct se
  	return 0;
  }
  
@@ -2237,7 +2201,7 @@ diff -NurpP --minimal linux-3.4.11/fs/devpts/inode.c linux-3.4.11-vs2.3.3.8/fs/d
  static const struct super_operations devpts_sops = {
  	.statfs		= simple_statfs,
  	.remount_fs	= devpts_remount,
-@@ -371,8 +415,10 @@ devpts_fill_super(struct super_block *s,
+@@ -379,8 +423,10 @@ devpts_fill_super(struct super_block *s,
  	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
  	inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
  	inode->i_op = &simple_dir_inode_operations;
@@ -2249,7 +2213,7 @@ diff -NurpP --minimal linux-3.4.11/fs/devpts/inode.c linux-3.4.11-vs2.3.3.8/fs/d
  
  	s->s_root = d_make_root(inode);
  	if (s->s_root)
-@@ -564,6 +610,9 @@ int devpts_pty_new(struct inode *ptmx_in
+@@ -572,6 +618,9 @@ int devpts_pty_new(struct inode *ptmx_in
  	inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
  	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
  	init_special_inode(inode, S_IFCHR|opts->mode, device);
@@ -2259,10 +2223,10 @@ diff -NurpP --minimal linux-3.4.11/fs/devpts/inode.c linux-3.4.11-vs2.3.3.8/fs/d
  	inode->i_private = tty;
  	tty->driver_data = inode;
  
-diff -NurpP --minimal linux-3.4.11/fs/ext2/balloc.c linux-3.4.11-vs2.3.3.8/fs/ext2/balloc.c
---- linux-3.4.11/fs/ext2/balloc.c	2012-01-09 16:14:54.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ext2/balloc.c	2012-05-21 18:15:04.000000000 +0200
-@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block 
+diff -NurpP --minimal linux-3.6/fs/ext2/balloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/balloc.c
+--- linux-3.6/fs/ext2/balloc.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/balloc.c	2012-10-04 18:47:00.000000000 +0200
+@@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block 
  			start = 0;
  		end = EXT2_BLOCKS_PER_GROUP(sb);
  	}
@@ -2270,9 +2234,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/balloc.c linux-3.4.11-vs2.3.3.8/fs/ex
  	BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
  
  repeat:
-diff -NurpP --minimal linux-3.4.11/fs/ext2/ext2.h linux-3.4.11-vs2.3.3.8/fs/ext2/ext2.h
---- linux-3.4.11/fs/ext2/ext2.h	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext2/ext2.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/ext2.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ext2.h
+--- linux-3.6/fs/ext2/ext2.h	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ext2.h	2012-10-04 18:47:00.000000000 +0200
 @@ -244,8 +244,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) */
@@ -2320,18 +2284,18 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/ext2.h linux-3.4.11-vs2.3.3.8/fs/ext2
  
  /* ioctl.c */
  extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.4.11/fs/ext2/file.c linux-3.4.11-vs2.3.3.8/fs/ext2/file.c
---- linux-3.4.11/fs/ext2/file.c	2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext2/file.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/file.c
+--- linux-3.6/fs/ext2/file.c	2011-10-24 18:45:27.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/file.c	2012-10-04 18:47:00.000000000 +0200
 @@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
  	.setattr	= ext2_setattr,
  	.get_acl	= ext2_get_acl,
  	.fiemap		= ext2_fiemap,
 +	.sync_flags	= ext2_sync_flags,
  };
-diff -NurpP --minimal linux-3.4.11/fs/ext2/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ext2/ialloc.c
---- linux-3.4.11/fs/ext2/ialloc.c	2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ext2/ialloc.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/ialloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ialloc.c
+--- linux-3.6/fs/ext2/ialloc.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ialloc.c	2012-10-04 18:47:00.000000000 +0200
 @@ -17,6 +17,7 @@
  #include <linux/backing-dev.h>
  #include <linux/buffer_head.h>
@@ -2340,7 +2304,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex
  #include "ext2.h"
  #include "xattr.h"
  #include "acl.h"
-@@ -549,6 +550,7 @@ got:
+@@ -547,6 +548,7 @@ got:
  		inode->i_mode = mode;
  		inode->i_uid = current_fsuid();
  		inode->i_gid = dir->i_gid;
@@ -2348,9 +2312,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex
  	} else
  		inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.4.11/fs/ext2/inode.c linux-3.4.11-vs2.3.3.8/fs/ext2/inode.c
---- linux-3.4.11/fs/ext2/inode.c	2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ext2/inode.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/inode.c
+--- linux-3.6/fs/ext2/inode.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -31,6 +31,7 @@
  #include <linux/mpage.h>
  #include <linux/fiemap.h>
@@ -2359,7 +2323,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  #include "ext2.h"
  #include "acl.h"
  #include "xip.h"
-@@ -1162,7 +1163,7 @@ static void ext2_truncate_blocks(struct 
+@@ -1165,7 +1166,7 @@ static void ext2_truncate_blocks(struct 
  		return;
  	if (ext2_inode_is_fast_symlink(inode))
  		return;
@@ -2368,7 +2332,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  		return;
  	__ext2_truncate_blocks(inode, offset);
  }
-@@ -1253,36 +1254,61 @@ void ext2_set_inode_flags(struct inode *
+@@ -1256,36 +1257,61 @@ void ext2_set_inode_flags(struct inode *
  {
  	unsigned int flags = EXT2_I(inode)->i_flags;
  
@@ -2437,48 +2401,31 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  }
  
  struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
-@@ -1292,6 +1318,8 @@ struct inode *ext2_iget (struct super_bl
- 	struct ext2_inode *raw_inode;
- 	struct inode *inode;
- 	long ret = -EIO;
-+	uid_t uid;
-+	gid_t gid;
- 	int n;
- 
- 	inode = iget_locked(sb, ino);
-@@ -1310,12 +1338,16 @@ struct inode *ext2_iget (struct super_bl
+@@ -1321,8 +1347,10 @@ struct inode *ext2_iget (struct super_bl
+ 		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ 		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
  	}
- 
- 	inode->i_mode = le16_to_cpu(raw_inode->i_mode);
--	inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
--	inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
-+	uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
-+	gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
- 	if (!(test_opt (inode->i_sb, NO_UID32))) {
--		inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
--		inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
-+		uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
-+		gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
- 	}
-+	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
-+	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
-+	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
+-	i_uid_write(inode, i_uid);
+-	i_gid_write(inode, i_gid);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
 +		le16_to_cpu(raw_inode->i_raw_tag));
  	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
  	inode->i_size = le32_to_cpu(raw_inode->i_size);
  	inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -1413,8 +1445,8 @@ static int __ext2_write_inode(struct ino
+@@ -1420,8 +1448,8 @@ static int __ext2_write_inode(struct ino
  	struct ext2_inode_info *ei = EXT2_I(inode);
  	struct super_block *sb = inode->i_sb;
  	ino_t ino = inode->i_ino;
--	uid_t uid = inode->i_uid;
--	gid_t gid = inode->i_gid;
-+	uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
-+	gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
+-	uid_t uid = i_uid_read(inode);
+-	gid_t gid = i_gid_read(inode);
++	uid_t uid = TAGINO_UID(DX_TAG(inode), i_uid_read(inode), inode->i_tag);
++	gid_t gid = TAGINO_GID(DX_TAG(inode), i_gid_read(inode), inode->i_tag);
  	struct buffer_head * bh;
  	struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
  	int n;
-@@ -1450,6 +1482,9 @@ static int __ext2_write_inode(struct ino
+@@ -1457,6 +1485,9 @@ static int __ext2_write_inode(struct ino
  		raw_inode->i_uid_high = 0;
  		raw_inode->i_gid_high = 0;
  	}
@@ -2488,19 +2435,19 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
  	raw_inode->i_size = cpu_to_le32(inode->i_size);
  	raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -1530,7 +1565,8 @@ int ext2_setattr(struct dentry *dentry, 
+@@ -1537,7 +1568,8 @@ int ext2_setattr(struct dentry *dentry, 
  	if (is_quota_modification(inode, iattr))
  		dquot_initialize(inode);
- 	if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
--	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
-+	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
+ 	if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
+-	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
++	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
 +	    (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
  		error = dquot_transfer(inode, iattr);
  		if (error)
  			return error;
-diff -NurpP --minimal linux-3.4.11/fs/ext2/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext2/ioctl.c
---- linux-3.4.11/fs/ext2/ioctl.c	2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ext2/ioctl.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ioctl.c
+--- linux-3.6/fs/ext2/ioctl.c	2012-03-19 19:47:25.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ioctl.c	2012-10-04 18:47:00.000000000 +0200
 @@ -17,6 +17,16 @@
  #include <asm/uaccess.h>
  
@@ -2550,9 +2497,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext
  		flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
  		ei->i_flags = flags;
  
-diff -NurpP --minimal linux-3.4.11/fs/ext2/namei.c linux-3.4.11-vs2.3.3.8/fs/ext2/namei.c
---- linux-3.4.11/fs/ext2/namei.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext2/namei.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/namei.c
+--- linux-3.6/fs/ext2/namei.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/namei.c	2012-10-04 18:47:00.000000000 +0200
 @@ -32,6 +32,7 @@
  
  #include <linux/pagemap.h>
@@ -2577,10 +2524,10 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/namei.c linux-3.4.11-vs2.3.3.8/fs/ext
  	.get_acl	= ext2_get_acl,
  };
  
-diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/fs/ext2/super.c
---- linux-3.4.11/fs/ext2/super.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext2/super.c	2012-05-21 18:15:05.000000000 +0200
-@@ -393,7 +393,8 @@ enum {
+diff -NurpP --minimal linux-3.6/fs/ext2/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/super.c
+--- linux-3.6/fs/ext2/super.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/super.c	2012-10-04 18:47:00.000000000 +0200
+@@ -390,7 +390,8 @@ enum {
  	Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
  	Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
  	Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
@@ -2590,7 +2537,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  };
  
  static const match_table_t tokens = {
-@@ -421,6 +422,9 @@ static const match_table_t tokens = {
+@@ -418,6 +419,9 @@ static const match_table_t tokens = {
  	{Opt_acl, "acl"},
  	{Opt_noacl, "noacl"},
  	{Opt_xip, "xip"},
@@ -2600,7 +2547,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	{Opt_grpquota, "grpquota"},
  	{Opt_ignore, "noquota"},
  	{Opt_quota, "quota"},
-@@ -491,6 +495,20 @@ static int parse_options(char *options, 
+@@ -501,6 +505,20 @@ static int parse_options(char *options, 
  		case Opt_nouid32:
  			set_opt (sbi->s_mount_opt, NO_UID32);
  			break;
@@ -2621,7 +2568,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  		case Opt_nocheck:
  			clear_opt (sbi->s_mount_opt, CHECK);
  			break;
-@@ -849,6 +867,8 @@ static int ext2_fill_super(struct super_
+@@ -859,6 +877,8 @@ static int ext2_fill_super(struct super_
  	if (!parse_options((char *) data, sb))
  		goto failed_mount;
  
@@ -2630,7 +2577,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
  		 MS_POSIXACL : 0);
-@@ -1223,6 +1243,14 @@ static int ext2_remount (struct super_bl
+@@ -1265,6 +1285,14 @@ static int ext2_remount (struct super_bl
  		goto restore_opts;
  	}
  
@@ -2645,9 +2592,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext2/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.4.11/fs/ext3/ext3.h linux-3.4.11-vs2.3.3.8/fs/ext3/ext3.h
---- linux-3.4.11/fs/ext3/ext3.h	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext3/ext3.h	2012-05-21 19:13:31.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/ext3.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ext3.h
+--- linux-3.6/fs/ext3/ext3.h	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ext3.h	2012-10-04 18:47:00.000000000 +0200
 @@ -151,10 +151,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) */
@@ -2691,7 +2638,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/ext3.h linux-3.4.11-vs2.3.3.8/fs/ext3
  
  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
  #ifndef _LINUX_EXT2_FS_H
-@@ -1057,6 +1064,7 @@ extern void ext3_get_inode_flags(struct 
+@@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct 
  extern void ext3_set_aops(struct inode *inode);
  extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
  		       u64 start, u64 len);
@@ -2699,9 +2646,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/ext3.h linux-3.4.11-vs2.3.3.8/fs/ext3
  
  /* ioctl.c */
  extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.4.11/fs/ext3/file.c linux-3.4.11-vs2.3.3.8/fs/ext3/file.c
---- linux-3.4.11/fs/ext3/file.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext3/file.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/file.c
+--- linux-3.6/fs/ext3/file.c	2012-05-21 18:07:20.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/file.c	2012-10-04 18:47:00.000000000 +0200
 @@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
  #endif
  	.get_acl	= ext3_get_acl,
@@ -2709,9 +2656,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/file.c linux-3.4.11-vs2.3.3.8/fs/ext3
 +	.sync_flags	= ext3_sync_flags,
  };
  
-diff -NurpP --minimal linux-3.4.11/fs/ext3/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ext3/ialloc.c
---- linux-3.4.11/fs/ext3/ialloc.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext3/ialloc.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/ialloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ialloc.c
+--- linux-3.6/fs/ext3/ialloc.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ialloc.c	2012-10-04 18:47:00.000000000 +0200
 @@ -14,6 +14,7 @@
  
  #include <linux/quotaops.h>
@@ -2720,7 +2667,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex
  
  #include "ext3.h"
  #include "xattr.h"
-@@ -485,6 +486,7 @@ got:
+@@ -469,6 +470,7 @@ got:
  		inode->i_mode = mode;
  		inode->i_uid = current_fsuid();
  		inode->i_gid = dir->i_gid;
@@ -2728,9 +2675,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex
  	} else
  		inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.4.11/fs/ext3/inode.c linux-3.4.11-vs2.3.3.8/fs/ext3/inode.c
---- linux-3.4.11/fs/ext3/inode.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext3/inode.c	2012-09-16 20:49:11.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/inode.c
+--- linux-3.6/fs/ext3/inode.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -27,6 +27,8 @@
  #include <linux/writeback.h>
  #include <linux/mpage.h>
@@ -2808,75 +2755,31 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  }
  
  struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
-@@ -2891,6 +2917,8 @@ struct inode *ext3_iget(struct super_blo
- 	transaction_t *transaction;
- 	long ret;
- 	int block;
-+	uid_t uid;
-+	gid_t gid;
- 
- 	inode = iget_locked(sb, ino);
- 	if (!inode)
-@@ -2907,12 +2935,16 @@ struct inode *ext3_iget(struct super_blo
- 	bh = iloc.bh;
- 	raw_inode = ext3_raw_inode(&iloc);
- 	inode->i_mode = le16_to_cpu(raw_inode->i_mode);
--	inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
--	inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
-+	uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
-+	gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
- 	if(!(test_opt (inode->i_sb, NO_UID32))) {
--		inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
--		inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
-+		uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
-+		gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+@@ -2915,8 +2941,10 @@ struct inode *ext3_iget(struct super_blo
+ 		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ 		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
  	}
-+	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
-+	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
-+	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
+-	i_uid_write(inode, i_uid);
+-	i_gid_write(inode, i_gid);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
 +		le16_to_cpu(raw_inode->i_raw_tag));
  	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
  	inode->i_size = le32_to_cpu(raw_inode->i_size);
  	inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -3067,6 +3099,8 @@ static int ext3_do_update_inode(handle_t
- 	struct ext3_inode *raw_inode = ext3_raw_inode(iloc);
- 	struct ext3_inode_info *ei = EXT3_I(inode);
- 	struct buffer_head *bh = iloc->bh;
-+	uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
-+	gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
- 	int err = 0, rc, block;
- 	int need_datasync = 0;
- 	__le32 disksize;
-@@ -3083,29 +3117,32 @@ again:
+@@ -3088,8 +3116,8 @@ again:
+ 
  	ext3_get_inode_flags(ei);
  	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
+-	i_uid = i_uid_read(inode);
+-	i_gid = i_gid_read(inode);
++	i_uid = TAGINO_UID(DX_TAG(inode), i_uid_read(inode), inode->i_tag);
++	i_gid = TAGINO_GID(DX_TAG(inode), i_gid_read(inode), inode->i_tag);
  	if(!(test_opt(inode->i_sb, NO_UID32))) {
--		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
--		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid));
-+		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid));
-+		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid));
- /*
-  * Fix up interoperability with old kernels. Otherwise, old inodes get
-  * re-used with the upper 16 bits of the uid/gid intact
-  */
- 		if(!ei->i_dtime) {
- 			raw_inode->i_uid_high =
--				cpu_to_le16(high_16_bits(inode->i_uid));
-+				cpu_to_le16(high_16_bits(uid));
- 			raw_inode->i_gid_high =
--				cpu_to_le16(high_16_bits(inode->i_gid));
-+				cpu_to_le16(high_16_bits(gid));
- 		} else {
- 			raw_inode->i_uid_high = 0;
- 			raw_inode->i_gid_high = 0;
- 		}
- 	} else {
- 		raw_inode->i_uid_low =
--			cpu_to_le16(fs_high2lowuid(inode->i_uid));
-+			cpu_to_le16(fs_high2lowuid(uid));
- 		raw_inode->i_gid_low =
--			cpu_to_le16(fs_high2lowgid(inode->i_gid));
-+			cpu_to_le16(fs_high2lowgid(gid));
+ 		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
+ 		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
+@@ -3114,6 +3142,9 @@ again:
  		raw_inode->i_uid_high = 0;
  		raw_inode->i_gid_high = 0;
  	}
@@ -2886,17 +2789,17 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
  	disksize = cpu_to_le32(ei->i_disksize);
  	if (disksize != raw_inode->i_size) {
-@@ -3274,7 +3311,8 @@ int ext3_setattr(struct dentry *dentry, 
+@@ -3282,7 +3313,8 @@ int ext3_setattr(struct dentry *dentry, 
  	if (is_quota_modification(inode, attr))
  		dquot_initialize(inode);
- 	if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
--		(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
-+		(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
-+		(ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
+ 	if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
+-	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
++	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
++	    (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
  		handle_t *handle;
  
  		/* (user+group)*(old+new) structure, inode write (sb,
-@@ -3296,6 +3334,8 @@ int ext3_setattr(struct dentry *dentry, 
+@@ -3304,6 +3336,8 @@ int ext3_setattr(struct dentry *dentry, 
  			inode->i_uid = attr->ia_uid;
  		if (attr->ia_valid & ATTR_GID)
  			inode->i_gid = attr->ia_gid;
@@ -2905,9 +2808,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  		error = ext3_mark_inode_dirty(handle, inode);
  		ext3_journal_stop(handle);
  	}
-diff -NurpP --minimal linux-3.4.11/fs/ext3/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext3/ioctl.c
---- linux-3.4.11/fs/ext3/ioctl.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext3/ioctl.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ioctl.c
+--- linux-3.6/fs/ext3/ioctl.c	2012-05-21 18:07:20.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ioctl.c	2012-10-04 18:47:00.000000000 +0200
 @@ -12,6 +12,34 @@
  #include <asm/uaccess.h>
  #include "ext3.h"
@@ -2975,9 +2878,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext
  		flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
  		ei->i_flags = flags;
  
-diff -NurpP --minimal linux-3.4.11/fs/ext3/namei.c linux-3.4.11-vs2.3.3.8/fs/ext3/namei.c
---- linux-3.4.11/fs/ext3/namei.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext3/namei.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/namei.c
+--- linux-3.6/fs/ext3/namei.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/namei.c	2012-10-04 18:47:00.000000000 +0200
 @@ -25,6 +25,8 @@
   */
  
@@ -3003,10 +2906,10 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/namei.c linux-3.4.11-vs2.3.3.8/fs/ext
  	.get_acl	= ext3_get_acl,
  };
  
-diff -NurpP --minimal linux-3.4.11/fs/ext3/super.c linux-3.4.11-vs2.3.3.8/fs/ext3/super.c
---- linux-3.4.11/fs/ext3/super.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext3/super.c	2012-05-21 18:15:05.000000000 +0200
-@@ -820,7 +820,8 @@ enum {
+diff -NurpP --minimal linux-3.6/fs/ext3/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/super.c
+--- linux-3.6/fs/ext3/super.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/super.c	2012-10-04 18:47:00.000000000 +0200
+@@ -811,7 +811,8 @@ enum {
  	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
  	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
  	Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
@@ -3016,7 +2919,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  };
  
  static const match_table_t tokens = {
-@@ -877,6 +878,9 @@ static const match_table_t tokens = {
+@@ -868,6 +869,9 @@ static const match_table_t tokens = {
  	{Opt_barrier, "barrier"},
  	{Opt_nobarrier, "nobarrier"},
  	{Opt_resize, "resize"},
@@ -3026,7 +2929,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	{Opt_err, NULL},
  };
  
-@@ -1029,6 +1033,20 @@ static int parse_options (char *options,
+@@ -1033,6 +1037,20 @@ static int parse_options (char *options,
  		case Opt_nouid32:
  			set_opt (sbi->s_mount_opt, NO_UID32);
  			break;
@@ -3047,7 +2950,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  		case Opt_nocheck:
  			clear_opt (sbi->s_mount_opt, CHECK);
  			break;
-@@ -1727,6 +1745,9 @@ static int ext3_fill_super (struct super
+@@ -1731,6 +1749,9 @@ static int ext3_fill_super (struct super
  			    NULL, 0))
  		goto failed_mount;
  
@@ -3057,7 +2960,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-@@ -2608,6 +2629,14 @@ static int ext3_remount (struct super_bl
+@@ -2618,6 +2639,14 @@ static int ext3_remount (struct super_bl
  	if (test_opt(sb, ABORT))
  		ext3_abort(sb, __func__, "Abort forced by user");
  
@@ -3072,10 +2975,10 @@ diff -NurpP --minimal linux-3.4.11/fs/ext3/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.4.11/fs/ext4/ext4.h linux-3.4.11-vs2.3.3.8/fs/ext4/ext4.h
---- linux-3.4.11/fs/ext4/ext4.h	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext4/ext4.h	2012-09-01 10:50:49.000000000 +0200
-@@ -380,8 +380,12 @@ struct flex_groups {
+diff -NurpP --minimal linux-3.6/fs/ext4/ext4.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ext4.h
+--- linux-3.6/fs/ext4/ext4.h	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ext4.h	2012-10-04 18:47:00.000000000 +0200
+@@ -393,8 +393,12 @@ struct flex_groups {
  #define EXT4_EXTENTS_FL			0x00080000 /* Inode uses extents */
  #define EXT4_EA_INODE_FL	        0x00200000 /* Inode used for large EA */
  #define EXT4_EOFBLOCKS_FL		0x00400000 /* Blocks allocated beyond EOF */
@@ -3088,25 +2991,24 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ext4.h linux-3.4.11-vs2.3.3.8/fs/ext4
  #define EXT4_FL_USER_VISIBLE		0x004BDFFF /* User visible flags */
  #define EXT4_FL_USER_MODIFIABLE		0x004B80FF /* User modifiable flags */
  
-@@ -650,7 +654,8 @@ struct ext4_inode {
- 			__le16	l_i_file_acl_high;
+@@ -666,7 +670,7 @@ struct ext4_inode {
  			__le16	l_i_uid_high;	/* these 2 fields */
  			__le16	l_i_gid_high;	/* were reserved2[0] */
--			__u32	l_i_reserved2;
+ 			__le16	l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
+-			__le16	l_i_reserved;
 +			__le16	l_i_tag;	/* Context Tag */
-+			__u16	l_i_reserved2;
  		} linux2;
  		struct {
  			__le16	h_i_reserved1;	/* Obsoleted fragment number/size which are removed in ext4 */
-@@ -768,6 +773,7 @@ do {									       \
+@@ -784,6 +788,7 @@ do {									       \
  #define i_gid_low	i_gid
  #define i_uid_high	osd2.linux2.l_i_uid_high
  #define i_gid_high	osd2.linux2.l_i_gid_high
 +#define i_raw_tag	osd2.linux2.l_i_tag
- #define i_reserved2	osd2.linux2.l_i_reserved2
+ #define i_checksum_lo	osd2.linux2.l_i_checksum_lo
  
  #elif defined(__GNU__)
-@@ -945,6 +951,7 @@ struct ext4_inode_info {
+@@ -964,6 +969,7 @@ struct ext4_inode_info {
  #define EXT4_MOUNT_POSIX_ACL		0x08000	/* POSIX Access Control Lists */
  #define EXT4_MOUNT_NO_AUTO_DA_ALLOC	0x10000	/* No auto delalloc mapping */
  #define EXT4_MOUNT_BARRIER		0x20000 /* Use block barriers */
@@ -3114,7 +3016,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ext4.h linux-3.4.11-vs2.3.3.8/fs/ext4
  #define EXT4_MOUNT_QUOTA		0x80000 /* Some quota option set */
  #define EXT4_MOUNT_USRQUOTA		0x100000 /* "old" user quota */
  #define EXT4_MOUNT_GRPQUOTA		0x200000 /* "old" group quota */
-@@ -2294,6 +2301,7 @@ extern int ext4_map_blocks(handle_t *han
+@@ -2393,6 +2399,7 @@ extern int ext4_map_blocks(handle_t *han
  			   struct ext4_map_blocks *map, int flags);
  extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
  			__u64 start, __u64 len);
@@ -3122,19 +3024,19 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ext4.h linux-3.4.11-vs2.3.3.8/fs/ext4
  /* 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.4.11/fs/ext4/file.c linux-3.4.11-vs2.3.3.8/fs/ext4/file.c
---- linux-3.4.11/fs/ext4/file.c	2012-01-09 16:14:54.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ext4/file.c	2012-05-21 18:15:05.000000000 +0200
-@@ -258,5 +258,6 @@ const struct inode_operations ext4_file_
+diff -NurpP --minimal linux-3.6/fs/ext4/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/file.c
+--- linux-3.6/fs/ext4/file.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/file.c	2012-10-04 18:47:00.000000000 +0200
+@@ -334,5 +334,6 @@ const struct inode_operations ext4_file_
  #endif
  	.get_acl	= ext4_get_acl,
  	.fiemap		= ext4_fiemap,
 +	.sync_flags	= ext4_sync_flags,
  };
  
-diff -NurpP --minimal linux-3.4.11/fs/ext4/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ext4/ialloc.c
---- linux-3.4.11/fs/ext4/ialloc.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext4/ialloc.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext4/ialloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ialloc.c
+--- linux-3.6/fs/ext4/ialloc.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ialloc.c	2012-10-04 18:47:00.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/random.h>
  #include <linux/bitops.h>
@@ -3143,7 +3045,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex
  #include <asm/byteorder.h>
  
  #include "ext4.h"
-@@ -816,6 +817,7 @@ got:
+@@ -842,6 +843,7 @@ got:
  		inode->i_mode = mode;
  		inode->i_uid = current_fsuid();
  		inode->i_gid = dir->i_gid;
@@ -3151,9 +3053,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ialloc.c linux-3.4.11-vs2.3.3.8/fs/ex
  	} else
  		inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext4/inode.c
---- linux-3.4.11/fs/ext4/inode.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext4/inode.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext4/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/inode.c
+--- linux-3.6/fs/ext4/inode.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -37,6 +37,7 @@
  #include <linux/printk.h>
  #include <linux/slab.h>
@@ -3162,7 +3064,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  
  #include "ext4_jbd2.h"
  #include "xattr.h"
-@@ -3579,41 +3580,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -3712,41 +3713,64 @@ void ext4_set_inode_flags(struct inode *
  {
  	unsigned int flags = EXT4_I(inode)->i_flags;
  
@@ -3234,75 +3136,31 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  	} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
  }
  
-@@ -3649,6 +3673,8 @@ struct inode *ext4_iget(struct super_blo
- 	journal_t *journal = EXT4_SB(sb)->s_journal;
- 	long ret;
- 	int block;
-+	uid_t uid;
-+	gid_t gid;
- 
- 	inode = iget_locked(sb, ino);
- 	if (!inode)
-@@ -3664,12 +3690,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);
--	inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
--	inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
-+	uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
-+	gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
- 	if (!(test_opt(inode->i_sb, NO_UID32))) {
--		inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
--		inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
-+		uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
-+		gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+@@ -3838,8 +3862,10 @@ struct inode *ext4_iget(struct super_blo
+ 		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ 		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
  	}
-+	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
-+	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
-+	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
+-	i_uid_write(inode, i_uid);
+-	i_gid_write(inode, i_gid);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
 +		le16_to_cpu(raw_inode->i_raw_tag));
  	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
  
  	ext4_clear_state_flags(ei);	/* Only relevant on 32-bit archs */
-@@ -3888,6 +3918,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;
-+	uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
-+	gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
- 	int err = 0, rc, block;
+@@ -4062,8 +4088,8 @@ static int ext4_do_update_inode(handle_t
  
- 	/* For fields not not tracking in the in-memory inode,
-@@ -3898,29 +3930,32 @@ static int ext4_do_update_inode(handle_t
  	ext4_get_inode_flags(ei);
  	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
+-	i_uid = i_uid_read(inode);
+-	i_gid = i_gid_read(inode);
++	i_uid = TAGINO_UID(DX_TAG(inode), i_uid_read(inode), inode->i_tag);
++	i_gid = TAGINO_GID(DX_TAG(inode), i_gid_read(inode), inode->i_tag);
  	if (!(test_opt(inode->i_sb, NO_UID32))) {
--		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
--		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid));
-+		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid));
-+		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid));
- /*
-  * Fix up interoperability with old kernels. Otherwise, old inodes get
-  * re-used with the upper 16 bits of the uid/gid intact
-  */
- 		if (!ei->i_dtime) {
- 			raw_inode->i_uid_high =
--				cpu_to_le16(high_16_bits(inode->i_uid));
-+				cpu_to_le16(high_16_bits(uid));
- 			raw_inode->i_gid_high =
--				cpu_to_le16(high_16_bits(inode->i_gid));
-+				cpu_to_le16(high_16_bits(gid));
- 		} else {
- 			raw_inode->i_uid_high = 0;
- 			raw_inode->i_gid_high = 0;
- 		}
- 	} else {
- 		raw_inode->i_uid_low =
--			cpu_to_le16(fs_high2lowuid(inode->i_uid));
-+			cpu_to_le16(fs_high2lowuid(uid));
- 		raw_inode->i_gid_low =
--			cpu_to_le16(fs_high2lowgid(inode->i_gid));
-+			cpu_to_le16(fs_high2lowgid(gid));
+ 		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
+ 		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
+@@ -4086,6 +4112,9 @@ static int ext4_do_update_inode(handle_t
  		raw_inode->i_uid_high = 0;
  		raw_inode->i_gid_high = 0;
  	}
@@ -3312,17 +3170,17 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
  
  	EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -4104,7 +4139,8 @@ int ext4_setattr(struct dentry *dentry, 
+@@ -4271,7 +4300,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) ||
--		(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
-+		(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
-+		(ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
+ 	if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
+-	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
++	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
++	    (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
  		handle_t *handle;
  
  		/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4126,6 +4162,8 @@ int ext4_setattr(struct dentry *dentry, 
+@@ -4293,6 +4323,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;
@@ -3331,9 +3189,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/inode.c linux-3.4.11-vs2.3.3.8/fs/ext
  		error = ext4_mark_inode_dirty(handle, inode);
  		ext4_journal_stop(handle);
  	}
-diff -NurpP --minimal linux-3.4.11/fs/ext4/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext4/ioctl.c
---- linux-3.4.11/fs/ext4/ioctl.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext4/ioctl.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext4/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ioctl.c
+--- linux-3.6/fs/ext4/ioctl.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ioctl.c	2012-10-04 18:47:00.000000000 +0200
 @@ -14,12 +14,40 @@
  #include <linux/compat.h>
  #include <linux/mount.h>
@@ -3398,9 +3256,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ext
  			if (!capable(CAP_LINUX_IMMUTABLE))
  				goto flags_out;
  		}
-diff -NurpP --minimal linux-3.4.11/fs/ext4/namei.c linux-3.4.11-vs2.3.3.8/fs/ext4/namei.c
---- linux-3.4.11/fs/ext4/namei.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext4/namei.c	2012-06-28 16:45:07.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext4/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/namei.c
+--- linux-3.6/fs/ext4/namei.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/namei.c	2012-10-04 18:47:00.000000000 +0200
 @@ -34,6 +34,7 @@
  #include <linux/quotaops.h>
  #include <linux/buffer_head.h>
@@ -3409,7 +3267,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/namei.c linux-3.4.11-vs2.3.3.8/fs/ext
  #include "ext4.h"
  #include "ext4_jbd2.h"
  
-@@ -925,6 +926,7 @@ restart:
+@@ -1199,6 +1200,7 @@ restart:
  					ll_rw_block(READ | REQ_META | REQ_PRIO,
  						    1, &bh);
  			}
@@ -3417,7 +3275,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/namei.c linux-3.4.11-vs2.3.3.8/fs/ext
  		}
  		if ((bh = bh_use[ra_ptr++]) == NULL)
  			goto next;
-@@ -2593,6 +2595,7 @@ const struct inode_operations ext4_dir_i
+@@ -2984,6 +2986,7 @@ const struct inode_operations ext4_dir_i
  #endif
  	.get_acl	= ext4_get_acl,
  	.fiemap         = ext4_fiemap,
@@ -3425,10 +3283,10 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/namei.c linux-3.4.11-vs2.3.3.8/fs/ext
  };
  
  const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.4.11/fs/ext4/super.c linux-3.4.11-vs2.3.3.8/fs/ext4/super.c
---- linux-3.4.11/fs/ext4/super.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ext4/super.c	2012-09-01 10:50:49.000000000 +0200
-@@ -1188,6 +1188,7 @@ enum {
+diff -NurpP --minimal linux-3.6/fs/ext4/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/super.c
+--- linux-3.6/fs/ext4/super.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/super.c	2012-10-04 18:47:00.000000000 +0200
+@@ -1219,6 +1219,7 @@ enum {
  	Opt_inode_readahead_blks, Opt_journal_ioprio,
  	Opt_dioread_nolock, Opt_dioread_lock,
  	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
@@ -3436,7 +3294,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  };
  
  static const match_table_t tokens = {
-@@ -1266,6 +1267,9 @@ static const match_table_t tokens = {
+@@ -1297,6 +1298,9 @@ static const match_table_t tokens = {
  	{Opt_removed, "reservation"},	/* mount option from ext2/3 */
  	{Opt_removed, "noreservation"}, /* mount option from ext2/3 */
  	{Opt_removed, "journal=%u"},	/* mount option from ext2/3 */
@@ -3446,7 +3304,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	{Opt_err, NULL},
  };
  
-@@ -1500,6 +1504,20 @@ static int handle_mount_opt(struct super
+@@ -1543,6 +1547,20 @@ static int handle_mount_opt(struct super
  			return -1;
  		*journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg);
  		return 1;
@@ -3467,7 +3325,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	}
  
  	for (m = ext4_mount_opts; m->token != Opt_err; m++) {
-@@ -3235,6 +3253,9 @@ static int ext4_fill_super(struct super_
+@@ -3417,6 +3435,9 @@ static int ext4_fill_super(struct super_
  		}
  	}
  
@@ -3477,7 +3335,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-@@ -4395,6 +4416,14 @@ static int ext4_remount(struct super_blo
+@@ -4582,6 +4603,14 @@ static int ext4_remount(struct super_blo
  	if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
  		ext4_abort(sb, "Abort forced by user");
  
@@ -3492,18 +3350,18 @@ diff -NurpP --minimal linux-3.4.11/fs/ext4/super.c linux-3.4.11-vs2.3.3.8/fs/ext
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.4.11/fs/fcntl.c linux-3.4.11-vs2.3.3.8/fs/fcntl.c
---- linux-3.4.11/fs/fcntl.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/fcntl.c	2012-05-21 18:15:05.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <linux/signal.h>
+diff -NurpP --minimal linux-3.6/fs/fcntl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/fcntl.c
+--- linux-3.6/fs/fcntl.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/fcntl.c	2012-10-04 19:05:02.000000000 +0200
+@@ -21,6 +21,7 @@
  #include <linux/rcupdate.h>
  #include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
 +#include <linux/vs_limit.h>
  
  #include <asm/poll.h>
  #include <asm/siginfo.h>
-@@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
+@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
  
  	if (tofree)
  		filp_close(tofree, files);
@@ -3512,18 +3370,18 @@ diff -NurpP --minimal linux-3.4.11/fs/fcntl.c linux-3.4.11-vs2.3.3.8/fs/fcntl.c
  
  	return newfd;
  
-@@ -447,6 +450,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
- 	filp = fget_raw(fd);
+@@ -477,6 +480,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
+ 	filp = fget_raw_light(fd, &fput_needed);
  	if (!filp)
  		goto out;
 +	if (!vx_files_avail(1))
 +		goto out;
  
  	if (unlikely(filp->f_mode & FMODE_PATH)) {
- 		if (!check_fcntl_cmd(cmd)) {
-diff -NurpP --minimal linux-3.4.11/fs/file.c linux-3.4.11-vs2.3.3.8/fs/file.c
---- linux-3.4.11/fs/file.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/file.c	2012-05-21 18:15:05.000000000 +0200
+ 		if (!check_fcntl_cmd(cmd))
+diff -NurpP --minimal linux-3.6/fs/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/file.c
+--- linux-3.6/fs/file.c	2012-05-21 18:07:20.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/file.c	2012-10-04 18:47:00.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/spinlock.h>
  #include <linux/rcupdate.h>
@@ -3549,19 +3407,19 @@ diff -NurpP --minimal linux-3.4.11/fs/file.c linux-3.4.11-vs2.3.3.8/fs/file.c
  #if 1
  	/* Sanity check */
  	if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.4.11/fs/file_table.c linux-3.4.11-vs2.3.3.8/fs/file_table.c
---- linux-3.4.11/fs/file_table.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/file_table.c	2012-05-21 18:15:05.000000000 +0200
-@@ -24,6 +24,8 @@
- #include <linux/percpu_counter.h>
- #include <linux/percpu.h>
+diff -NurpP --minimal linux-3.6/fs/file_table.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/file_table.c
+--- linux-3.6/fs/file_table.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/file_table.c	2012-10-04 19:10:21.000000000 +0200
+@@ -26,6 +26,8 @@
+ #include <linux/hardirq.h>
+ #include <linux/task_work.h>
  #include <linux/ima.h>
 +#include <linux/vs_limit.h>
 +#include <linux/vs_context.h>
  
  #include <linux/atomic.h>
  
-@@ -135,6 +137,8 @@ struct file *get_empty_filp(void)
+@@ -136,6 +138,8 @@ struct file *get_empty_filp(void)
  	spin_lock_init(&f->f_lock);
  	eventpoll_init_file(f);
  	/* f->f_version: 0 */
@@ -3570,16 +3428,16 @@ diff -NurpP --minimal linux-3.4.11/fs/file_table.c linux-3.4.11-vs2.3.3.8/fs/fil
  	return f;
  
  over:
-@@ -252,6 +256,8 @@ static void __fput(struct file *file)
- 	}
- 	fops_put(file->f_op);
- 	put_pid(file->f_owner.pid);
+@@ -257,6 +261,8 @@ static void __fput(struct file *file)
+ 		i_readcount_dec(inode);
+ 	if (file->f_mode & FMODE_WRITE)
+ 		drop_file_write_access(file);
 +	vx_files_dec(file);
 +	file->f_xid = 0;
- 	file_sb_list_del(file);
- 	if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
- 		i_readcount_dec(inode);
-@@ -382,6 +388,8 @@ void put_filp(struct file *file)
+ 	file->f_path.dentry = NULL;
+ 	file->f_path.mnt = NULL;
+ 	file_free(file);
+@@ -449,6 +455,8 @@ void put_filp(struct file *file)
  {
  	if (atomic_long_dec_and_test(&file->f_count)) {
  		security_file_free(file);
@@ -3588,9 +3446,9 @@ diff -NurpP --minimal linux-3.4.11/fs/file_table.c linux-3.4.11-vs2.3.3.8/fs/fil
  		file_sb_list_del(file);
  		file_free(file);
  	}
-diff -NurpP --minimal linux-3.4.11/fs/fs_struct.c linux-3.4.11-vs2.3.3.8/fs/fs_struct.c
---- linux-3.4.11/fs/fs_struct.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/fs_struct.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/fs_struct.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/fs_struct.c
+--- linux-3.6/fs/fs_struct.c	2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/fs_struct.c	2012-10-04 19:08:56.000000000 +0200
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -3598,39 +3456,39 @@ diff -NurpP --minimal linux-3.4.11/fs/fs_struct.c linux-3.4.11-vs2.3.3.8/fs/fs_s
 +#include <linux/vserver/global.h>
  #include "internal.h"
  
- static inline void path_get_longterm(struct path *path)
-@@ -99,6 +100,7 @@ void free_fs_struct(struct fs_struct *fs
+ /*
+@@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs
  {
- 	path_put_longterm(&fs->root);
- 	path_put_longterm(&fs->pwd);
+ 	path_put(&fs->root);
+ 	path_put(&fs->pwd);
 +	atomic_dec(&vs_global_fs);
  	kmem_cache_free(fs_cachep, fs);
  }
  
-@@ -136,6 +138,7 @@ struct fs_struct *copy_fs_struct(struct 
+@@ -124,6 +126,7 @@ struct fs_struct *copy_fs_struct(struct 
  		fs->pwd = old->pwd;
- 		path_get_longterm(&fs->pwd);
+ 		path_get(&fs->pwd);
  		spin_unlock(&old->lock);
 +		atomic_inc(&vs_global_fs);
  	}
  	return fs;
  }
-diff -NurpP --minimal linux-3.4.11/fs/gfs2/file.c linux-3.4.11-vs2.3.3.8/fs/gfs2/file.c
---- linux-3.4.11/fs/gfs2/file.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/gfs2/file.c	2012-05-21 18:15:05.000000000 +0200
-@@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = {
- 	[7] = GFS2_DIF_NOATIME,
+diff -NurpP --minimal linux-3.6/fs/gfs2/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/gfs2/file.c
+--- linux-3.6/fs/gfs2/file.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/gfs2/file.c	2012-10-04 19:05:34.000000000 +0200
+@@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = {
  	[12] = GFS2_DIF_EXHASH,
  	[14] = GFS2_DIF_INHERIT_JDATA,
+ 	[17] = GFS2_DIF_TOPDIR,
 +	[27] = GFS2_DIF_IXUNLINK,
 +	[26] = GFS2_DIF_BARRIER,
 +	[29] = GFS2_DIF_COW,
  };
  
  static const u32 gfs2_to_fsflags[32] = {
-@@ -151,6 +154,9 @@ static const u32 gfs2_to_fsflags[32] = {
- 	[gfs2fl_NoAtime] = FS_NOATIME_FL,
+@@ -153,6 +156,9 @@ static const u32 gfs2_to_fsflags[32] = {
  	[gfs2fl_ExHash] = FS_INDEX_FL,
+ 	[gfs2fl_TopLevel] = FS_TOPDIR_FL,
  	[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
 +	[gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
 +	[gfs2fl_Barrier] = FS_BARRIER_FL,
@@ -3638,7 +3496,7 @@ diff -NurpP --minimal linux-3.4.11/fs/gfs2/file.c linux-3.4.11-vs2.3.3.8/fs/gfs2
  };
  
  static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
-@@ -181,12 +187,18 @@ void gfs2_set_inode_flags(struct inode *
+@@ -183,12 +189,18 @@ void gfs2_set_inode_flags(struct inode *
  {
  	struct gfs2_inode *ip = GFS2_I(inode);
  	unsigned int flags = inode->i_flags;
@@ -3658,7 +3516,7 @@ diff -NurpP --minimal linux-3.4.11/fs/gfs2/file.c linux-3.4.11-vs2.3.3.8/fs/gfs2
  	if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
  		flags |= S_APPEND;
  	if (ip->i_diskflags & GFS2_DIF_NOATIME)
-@@ -194,6 +206,43 @@ void gfs2_set_inode_flags(struct inode *
+@@ -196,6 +208,43 @@ void gfs2_set_inode_flags(struct inode *
  	if (ip->i_diskflags & GFS2_DIF_SYNC)
  		flags |= S_SYNC;
  	inode->i_flags = flags;
@@ -3702,7 +3560,7 @@ diff -NurpP --minimal linux-3.4.11/fs/gfs2/file.c linux-3.4.11-vs2.3.3.8/fs/gfs2
  }
  
  /* Flags that can be set by user space */
-@@ -305,6 +354,37 @@ static int gfs2_set_flags(struct file *f
+@@ -309,6 +358,37 @@ static int gfs2_set_flags(struct file *f
  	return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
  }
  
@@ -3740,10 +3598,10 @@ diff -NurpP --minimal linux-3.4.11/fs/gfs2/file.c linux-3.4.11-vs2.3.3.8/fs/gfs2
  static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	switch(cmd) {
-diff -NurpP --minimal linux-3.4.11/fs/gfs2/inode.h linux-3.4.11-vs2.3.3.8/fs/gfs2/inode.h
---- linux-3.4.11/fs/gfs2/inode.h	2012-01-09 16:14:54.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/gfs2/inode.h	2012-05-21 18:15:05.000000000 +0200
-@@ -120,6 +120,7 @@ extern const struct file_operations gfs2
+diff -NurpP --minimal linux-3.6/fs/gfs2/inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/gfs2/inode.h
+--- linux-3.6/fs/gfs2/inode.h	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/gfs2/inode.h	2012-10-04 18:47:00.000000000 +0200
+@@ -117,6 +117,7 @@ extern const struct file_operations gfs2
  extern const struct file_operations gfs2_dir_fops_nolock;
  
  extern void gfs2_set_inode_flags(struct inode *inode);
@@ -3751,9 +3609,9 @@ diff -NurpP --minimal linux-3.4.11/fs/gfs2/inode.h linux-3.4.11-vs2.3.3.8/fs/gfs
   
  #ifdef CONFIG_GFS2_FS_LOCKING_DLM
  extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.4.11/fs/inode.c linux-3.4.11-vs2.3.3.8/fs/inode.c
---- linux-3.4.11/fs/inode.c	2012-05-21 18:07:24.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/inode.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/inode.c
+--- linux-3.6/fs/inode.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -17,6 +17,7 @@
  #include <linux/prefetch.h>
  #include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3789,7 +3647,7 @@ diff -NurpP --minimal linux-3.4.11/fs/inode.c linux-3.4.11-vs2.3.3.8/fs/inode.c
  /**
   *	__remove_inode_hash - remove an inode from the hash
   *	@inode: inode to unhash
-@@ -1689,9 +1696,11 @@ void init_special_inode(struct inode *in
+@@ -1792,9 +1799,11 @@ void init_special_inode(struct inode *in
  	if (S_ISCHR(mode)) {
  		inode->i_fop = &def_chr_fops;
  		inode->i_rdev = rdev;
@@ -3801,7 +3659,7 @@ diff -NurpP --minimal linux-3.4.11/fs/inode.c linux-3.4.11-vs2.3.3.8/fs/inode.c
  	} else if (S_ISFIFO(mode))
  		inode->i_fop = &def_fifo_fops;
  	else if (S_ISSOCK(mode))
-@@ -1720,6 +1729,7 @@ void inode_init_owner(struct inode *inod
+@@ -1823,6 +1832,7 @@ void inode_init_owner(struct inode *inod
  	} else
  		inode->i_gid = current_fsgid();
  	inode->i_mode = mode;
@@ -3809,9 +3667,9 @@ diff -NurpP --minimal linux-3.4.11/fs/inode.c linux-3.4.11-vs2.3.3.8/fs/inode.c
  }
  EXPORT_SYMBOL(inode_init_owner);
  
-diff -NurpP --minimal linux-3.4.11/fs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ioctl.c
---- linux-3.4.11/fs/ioctl.c	2012-05-21 18:07:24.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ioctl.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ioctl.c
+--- linux-3.6/fs/ioctl.c	2012-05-21 18:07:24.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ioctl.c	2012-10-04 18:47:00.000000000 +0200
 @@ -15,6 +15,9 @@
  #include <linux/writeback.h>
  #include <linux/buffer_head.h>
@@ -3822,9 +3680,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ioctl.c
  
  #include <asm/ioctls.h>
  
-diff -NurpP --minimal linux-3.4.11/fs/ioprio.c linux-3.4.11-vs2.3.3.8/fs/ioprio.c
---- linux-3.4.11/fs/ioprio.c	2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ioprio.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ioprio.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ioprio.c
+--- linux-3.6/fs/ioprio.c	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ioprio.c	2012-10-04 18:47:00.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <linux/syscalls.h>
  #include <linux/security.h>
@@ -3833,7 +3691,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ioprio.c linux-3.4.11-vs2.3.3.8/fs/ioprio.
  
  int set_task_ioprio(struct task_struct *task, int ioprio)
  {
-@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, 
+@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, 
  			else
  				pgrp = find_vpid(who);
  			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -3842,7 +3700,7 @@ diff -NurpP --minimal linux-3.4.11/fs/ioprio.c linux-3.4.11-vs2.3.3.8/fs/ioprio.
  				ret = set_task_ioprio(p, ioprio);
  				if (ret)
  					break;
-@@ -193,6 +196,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, 
+@@ -198,6 +201,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, 
  			else
  				pgrp = find_vpid(who);
  			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -3851,9 +3709,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ioprio.c linux-3.4.11-vs2.3.3.8/fs/ioprio.
  				tmpio = get_task_ioprio(p);
  				if (tmpio < 0)
  					continue;
-diff -NurpP --minimal linux-3.4.11/fs/jfs/file.c linux-3.4.11-vs2.3.3.8/fs/jfs/file.c
---- linux-3.4.11/fs/jfs/file.c	2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/jfs/file.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/file.c
+--- linux-3.6/fs/jfs/file.c	2011-10-24 18:45:27.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/file.c	2012-10-04 18:47:00.000000000 +0200
 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
  	if (is_quota_modification(inode, iattr))
  		dquot_initialize(inode);
@@ -3872,9 +3730,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/file.c linux-3.4.11-vs2.3.3.8/fs/jfs/f
  };
  
  const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.4.11/fs/jfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/jfs/ioctl.c
---- linux-3.4.11/fs/jfs/ioctl.c	2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/jfs/ioctl.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/ioctl.c
+--- linux-3.6/fs/jfs/ioctl.c	2012-03-19 19:47:25.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/ioctl.c	2012-10-04 18:47:00.000000000 +0200
 @@ -11,6 +11,7 @@
  #include <linux/mount.h>
  #include <linux/time.h>
@@ -3932,9 +3790,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/jfs/
  		flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
  		jfs_inode->mode2 = flags;
  
-diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_dinode.h linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_dinode.h
---- linux-3.4.11/fs/jfs/jfs_dinode.h	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_dinode.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_dinode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_dinode.h
+--- linux-3.6/fs/jfs/jfs_dinode.h	2008-12-25 00:26:37.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_dinode.h	2012-10-04 18:47:00.000000000 +0200
 @@ -161,9 +161,13 @@ struct dinode {
  
  #define JFS_APPEND_FL		0x01000000 /* writes to file may only append */
@@ -3951,9 +3809,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_dinode.h linux-3.4.11-vs2.3.3.8/fs
  #define JFS_FL_INHERIT		0x03C80000
  
  /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_filsys.h linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_filsys.h
---- linux-3.4.11/fs/jfs/jfs_filsys.h	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_filsys.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_filsys.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_filsys.h
+--- linux-3.6/fs/jfs/jfs_filsys.h	2008-12-25 00:26:37.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_filsys.h	2012-10-04 18:47:00.000000000 +0200
 @@ -263,6 +263,7 @@
  #define JFS_NAME_MAX	255
  #define JFS_PATH_MAX	BPSIZE
@@ -3962,9 +3820,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_filsys.h linux-3.4.11-vs2.3.3.8/fs
  
  /*
   *	file system state (superblock state)
-diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_imap.c linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_imap.c
---- linux-3.4.11/fs/jfs/jfs_imap.c	2012-01-09 16:14:54.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_imap.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_imap.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_imap.c
+--- linux-3.6/fs/jfs/jfs_imap.c	2012-01-09 16:14:54.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_imap.c	2012-10-04 18:47:00.000000000 +0200
 @@ -46,6 +46,7 @@
  #include <linux/pagemap.h>
  #include <linux/quotaops.h>
@@ -4024,9 +3882,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_imap.c linux-3.4.11-vs2.3.3.8/fs/j
  	jfs_get_inode_flags(jfs_ip);
  	/*
  	 * mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_inode.c linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_inode.c
---- linux-3.4.11/fs/jfs/jfs_inode.c	2012-01-09 16:14:54.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_inode.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_inode.c
+--- linux-3.6/fs/jfs/jfs_inode.c	2012-01-09 16:14:54.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -18,6 +18,7 @@
  
  #include <linux/fs.h>
@@ -4100,9 +3958,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_inode.c linux-3.4.11-vs2.3.3.8/fs/
  }
  
  /*
-diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_inode.h linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_inode.h
---- linux-3.4.11/fs/jfs/jfs_inode.h	2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/jfs/jfs_inode.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_inode.h
+--- linux-3.6/fs/jfs/jfs_inode.h	2011-10-24 18:45:27.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_inode.h	2012-10-04 18:47:00.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);
@@ -4111,9 +3969,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/jfs_inode.h linux-3.4.11-vs2.3.3.8/fs/
  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.4.11/fs/jfs/namei.c linux-3.4.11-vs2.3.3.8/fs/jfs/namei.c
---- linux-3.4.11/fs/jfs/namei.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/jfs/namei.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/namei.c
+--- linux-3.6/fs/jfs/namei.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/namei.c	2012-10-04 18:47:00.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/ctype.h>
  #include <linux/quotaops.h>
@@ -4138,9 +3996,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/namei.c linux-3.4.11-vs2.3.3.8/fs/jfs/
  };
  
  const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.4.11/fs/jfs/super.c linux-3.4.11-vs2.3.3.8/fs/jfs/super.c
---- linux-3.4.11/fs/jfs/super.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/jfs/super.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/super.c
+--- linux-3.6/fs/jfs/super.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/super.c	2012-10-04 18:47:00.000000000 +0200
 @@ -197,7 +197,8 @@ static void jfs_put_super(struct super_b
  enum {
  	Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -4206,9 +4064,9 @@ diff -NurpP --minimal linux-3.4.11/fs/jfs/super.c linux-3.4.11-vs2.3.3.8/fs/jfs/
  
  	if (newLVSize) {
  		printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.4.11/fs/libfs.c linux-3.4.11-vs2.3.3.8/fs/libfs.c
---- linux-3.4.11/fs/libfs.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/libfs.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/libfs.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/libfs.c
+--- linux-3.6/fs/libfs.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/libfs.c	2012-10-04 18:47:00.000000000 +0200
 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru
   * both impossible due to the lock on directory.
   */
@@ -4254,9 +4112,9 @@ diff -NurpP --minimal linux-3.4.11/fs/libfs.c linux-3.4.11-vs2.3.3.8/fs/libfs.c
  EXPORT_SYMBOL(generic_read_dir);
  EXPORT_SYMBOL(mount_pseudo);
  EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
---- linux-3.4.11/fs/locks.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/locks.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/locks.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/locks.c
+--- linux-3.6/fs/locks.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/locks.c	2012-10-04 18:47:00.000000000 +0200
 @@ -126,6 +126,8 @@
  #include <linux/time.h>
  #include <linux/rcupdate.h>
@@ -4287,7 +4145,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	return fl;
  }
  EXPORT_SYMBOL_GPL(locks_alloc_lock);
-@@ -216,6 +224,7 @@ void locks_free_lock(struct file_lock *f
+@@ -212,6 +220,7 @@ void locks_free_lock(struct file_lock *f
  	BUG_ON(!list_empty(&fl->fl_block));
  	BUG_ON(!list_empty(&fl->fl_link));
  
@@ -4295,7 +4153,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	locks_release_private(fl);
  	kmem_cache_free(filelock_cache, fl);
  }
-@@ -225,6 +234,7 @@ void locks_init_lock(struct file_lock *f
+@@ -221,6 +230,7 @@ void locks_init_lock(struct file_lock *f
  {
  	memset(fl, 0, sizeof(struct file_lock));
  	locks_init_lock_heads(fl);
@@ -4303,7 +4161,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  }
  
  EXPORT_SYMBOL(locks_init_lock);
-@@ -265,6 +275,7 @@ void locks_copy_lock(struct file_lock *n
+@@ -261,6 +271,7 @@ void locks_copy_lock(struct file_lock *n
  	new->fl_file = fl->fl_file;
  	new->fl_ops = fl->fl_ops;
  	new->fl_lmops = fl->fl_lmops;
@@ -4311,7 +4169,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  
  	locks_copy_private(new, fl);
  }
-@@ -303,6 +314,11 @@ static int flock_make_lock(struct file *
+@@ -299,6 +310,11 @@ static int flock_make_lock(struct file *
  	fl->fl_flags = FL_FLOCK;
  	fl->fl_type = type;
  	fl->fl_end = OFFSET_MAX;
@@ -4323,7 +4181,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	
  	*lock = fl;
  	return 0;
-@@ -452,6 +468,7 @@ static int lease_init(struct file *filp,
+@@ -438,6 +454,7 @@ static int lease_init(struct file *filp,
  
  	fl->fl_owner = current->files;
  	fl->fl_pid = current->tgid;
@@ -4331,7 +4189,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  
  	fl->fl_file = filp;
  	fl->fl_flags = FL_LEASE;
-@@ -471,6 +488,11 @@ static struct file_lock *lease_alloc(str
+@@ -457,6 +474,11 @@ static struct file_lock *lease_alloc(str
  	if (fl == NULL)
  		return ERR_PTR(error);
  
@@ -4343,7 +4201,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	error = lease_init(filp, type, fl);
  	if (error) {
  		locks_free_lock(fl);
-@@ -773,6 +795,7 @@ static int flock_lock_file(struct file *
+@@ -753,6 +775,7 @@ static int flock_lock_file(struct file *
  		lock_flocks();
  	}
  
@@ -4351,7 +4209,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  find_conflict:
  	for_each_lock(inode, before) {
  		struct file_lock *fl = *before;
-@@ -793,6 +816,7 @@ find_conflict:
+@@ -773,6 +796,7 @@ find_conflict:
  		goto out;
  	locks_copy_lock(new_fl, request);
  	locks_insert_lock(before, new_fl);
@@ -4359,7 +4217,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	new_fl = NULL;
  	error = 0;
  
-@@ -803,7 +827,8 @@ out:
+@@ -783,7 +807,8 @@ out:
  	return error;
  }
  
@@ -4369,7 +4227,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  {
  	struct file_lock *fl;
  	struct file_lock *new_fl = NULL;
-@@ -813,6 +838,8 @@ static int __posix_lock_file(struct inod
+@@ -793,6 +818,8 @@ static int __posix_lock_file(struct inod
  	struct file_lock **before;
  	int error, added = 0;
  
@@ -4378,7 +4236,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	/*
  	 * We may need two file_lock structures for this operation,
  	 * so we get them in advance to avoid races.
-@@ -823,7 +850,11 @@ static int __posix_lock_file(struct inod
+@@ -803,7 +830,11 @@ static int __posix_lock_file(struct inod
  	    (request->fl_type != F_UNLCK ||
  	     request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
  		new_fl = locks_alloc_lock();
@@ -4390,7 +4248,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	}
  
  	lock_flocks();
-@@ -1022,7 +1053,8 @@ static int __posix_lock_file(struct inod
+@@ -1002,7 +1033,8 @@ static int __posix_lock_file(struct inod
  int posix_lock_file(struct file *filp, struct file_lock *fl,
  			struct file_lock *conflock)
  {
@@ -4400,7 +4258,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  }
  EXPORT_SYMBOL(posix_lock_file);
  
-@@ -1112,7 +1144,7 @@ int locks_mandatory_area(int read_write,
+@@ -1092,7 +1124,7 @@ int locks_mandatory_area(int read_write,
  	fl.fl_end = offset + count - 1;
  
  	for (;;) {
@@ -4409,7 +4267,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  		if (error != FILE_LOCK_DEFERRED)
  			break;
  		error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
-@@ -1407,6 +1439,7 @@ int generic_add_lease(struct file *filp,
+@@ -1397,6 +1429,7 @@ int generic_add_lease(struct file *filp,
  		goto out;
  
  	locks_insert_lock(before, lease);
@@ -4417,7 +4275,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	return 0;
  
  out:
-@@ -1847,6 +1880,11 @@ int fcntl_setlk(unsigned int fd, struct 
+@@ -1838,6 +1871,11 @@ int fcntl_setlk(unsigned int fd, struct 
  	if (file_lock == NULL)
  		return -ENOLCK;
  
@@ -4429,7 +4287,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	/*
  	 * This might block, so we do it before checking the inode.
  	 */
-@@ -1965,6 +2003,11 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -1956,6 +1994,11 @@ int fcntl_setlk64(unsigned int fd, struc
  	if (file_lock == NULL)
  		return -ENOLCK;
  
@@ -4441,7 +4299,7 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  	/*
  	 * This might block, so we do it before checking the inode.
  	 */
-@@ -2230,8 +2273,11 @@ static int locks_show(struct seq_file *f
+@@ -2221,8 +2264,11 @@ static int locks_show(struct seq_file *f
  
  	lock_get_status(f, fl, *((loff_t *)f->private), "");
  
@@ -4454,21 +4312,21 @@ diff -NurpP --minimal linux-3.4.11/fs/locks.c linux-3.4.11-vs2.3.3.8/fs/locks.c
  
  	return 0;
  }
-diff -NurpP --minimal linux-3.4.11/fs/mount.h linux-3.4.11-vs2.3.3.8/fs/mount.h
---- linux-3.4.11/fs/mount.h	2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/mount.h	2012-05-21 18:15:05.000000000 +0200
-@@ -47,6 +47,7 @@ struct mount {
+diff -NurpP --minimal linux-3.6/fs/mount.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/mount.h
+--- linux-3.6/fs/mount.h	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/mount.h	2012-10-04 18:47:00.000000000 +0200
+@@ -46,6 +46,7 @@ struct mount {
  	int mnt_expiry_mark;		/* true if marked for expiry */
  	int mnt_pinned;
  	int mnt_ghosts;
 +	tag_t mnt_tag;			/* tagging used for vfsmount */
  };
  
- static inline struct mount *real_mount(struct vfsmount *mnt)
-diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
---- linux-3.4.11/fs/namei.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/namei.c	2012-05-21 18:15:05.000000000 +0200
-@@ -33,6 +33,14 @@
+ #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
+diff -NurpP --minimal linux-3.6/fs/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/namei.c
+--- linux-3.6/fs/namei.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/namei.c	2012-10-04 19:08:15.000000000 +0200
+@@ -34,6 +34,14 @@
  #include <linux/device_cgroup.h>
  #include <linux/fs_struct.h>
  #include <linux/posix_acl.h>
@@ -4483,7 +4341,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  #include <asm/uaccess.h>
  
  #include "internal.h"
-@@ -221,6 +229,89 @@ static int check_acl(struct inode *inode
+@@ -212,6 +220,89 @@ static int check_acl(struct inode *inode
  	return -EAGAIN;
  }
  
@@ -4573,7 +4431,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  /*
   * This does the basic permission checking
   */
-@@ -356,10 +447,14 @@ int inode_permission(struct inode *inode
+@@ -334,10 +425,14 @@ int __inode_permission(struct inode *ino
  		/*
  		 * Nobody gets write access to an immutable file.
  		 */
@@ -4589,7 +4447,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  	retval = do_inode_permission(inode, mask);
  	if (retval)
  		return retval;
-@@ -1038,7 +1133,8 @@ static void follow_dotdot(struct nameida
+@@ -1189,7 +1284,8 @@ static void follow_dotdot(struct nameida
  
  		if (nd->path.dentry == nd->root.dentry &&
  		    nd->path.mnt == nd->root.mnt) {
@@ -4599,7 +4457,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  		}
  		if (nd->path.dentry != nd->path.mnt->mnt_root) {
  			/* rare case of legitimate dget_parent()... */
-@@ -1174,6 +1270,9 @@ static int do_lookup(struct nameidata *n
+@@ -1338,6 +1434,9 @@ static int lookup_fast(struct nameidata 
  				goto unlazy;
  			}
  		}
@@ -4609,17 +4467,16 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  		path->mnt = mnt;
  		path->dentry = dentry;
  		if (unlikely(!__follow_mount_rcu(nd, path, inode)))
-@@ -1208,6 +1307,9 @@ unlazy:
- 			goto need_lookup;
+@@ -1373,6 +1472,8 @@ unlazy:
  		}
  	}
-+
+ 
 +	/* FIXME: check dx permission */
 +
- done:
  	path->mnt = mnt;
  	path->dentry = dentry;
-@@ -1981,7 +2083,7 @@ static int may_delete(struct inode *dir,
+ 	err = follow_managed(path, nd->flags);
+@@ -2192,7 +2293,7 @@ static int may_delete(struct inode *dir,
  	if (IS_APPEND(dir))
  		return -EPERM;
  	if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
@@ -4628,14 +4485,15 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  		return -EPERM;
  	if (isdir) {
  		if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -2061,19 +2163,25 @@ int vfs_create(struct inode *dir, struct
+@@ -2271,19 +2372,25 @@ int vfs_create(struct inode *dir, struct
+ 		bool want_excl)
  {
  	int error = may_create(dir, dentry);
- 
 -	if (error)
+-		return error;
 +	if (error) {
 +		vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
- 		return error;
++		return error;
 +	}
  
  	if (!dir->i_op->create)
@@ -4644,11 +4502,12 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  	mode |= S_IFREG;
  	error = security_inode_create(dir, dentry, mode);
 -	if (error)
+-		return error;
 +	if (error) {
 +		vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
- 		return error;
++		return error;
 +	}
- 	error = dir->i_op->create(dir, dentry, mode, nd);
+ 	error = dir->i_op->create(dir, dentry, mode, want_excl);
  	if (!error)
  		fsnotify_create(dir, dentry);
 +	else
@@ -4656,7 +4515,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  	return error;
  }
  
-@@ -2108,6 +2216,15 @@ static int may_open(struct path *path, i
+@@ -2318,6 +2425,15 @@ static int may_open(struct path *path, i
  		break;
  	}
  
@@ -4672,9 +4531,9 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  	error = inode_permission(inode, acc_mode);
  	if (error)
  		return error;
-@@ -2332,6 +2449,16 @@ ok:
+@@ -2820,6 +2936,16 @@ finish_open:
  	}
- common:
+ finish_open_created:
  	error = may_open(&nd->path, acc_mode, open_flag);
 +#ifdef	CONFIG_VSERVER_COWBL
 +	if (error == -EMLINK) {
@@ -4687,18 +4546,18 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
 +	}
 +#endif
  	if (error)
- 		goto exit;
- 	filp = nameidata_to_filp(nd);
-@@ -2374,6 +2501,7 @@ static struct file *path_openat(int dfd,
- 	struct path path;
+ 		goto out;
+ 	file->f_path.mnt = nd->path.mnt;
+@@ -2884,6 +3010,7 @@ static struct file *path_openat(int dfd,
+ 	int opened = 0;
  	int error;
  
 +restart:
- 	filp = get_empty_filp();
- 	if (!filp)
+ 	file = get_empty_filp();
+ 	if (!file)
  		return ERR_PTR(-ENFILE);
-@@ -2411,6 +2539,17 @@ static struct file *path_openat(int dfd,
- 			filp = do_last(nd, &path, op, pathname);
+@@ -2920,6 +3047,17 @@ static struct file *path_openat(int dfd,
+ 		error = do_last(nd, &path, file, op, &opened, pathname);
  		put_link(nd, &link, cookie);
  	}
 +
@@ -4715,7 +4574,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  out:
  	if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
  		path_put(&nd->root);
-@@ -2500,6 +2639,11 @@ struct dentry *kern_path_create(int dfd,
+@@ -3023,6 +3161,11 @@ struct dentry *kern_path_create(int dfd,
  		goto fail;
  	}
  	*path = nd.path;
@@ -4725,9 +4584,9 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
 +		dentry->d_name.len, dentry->d_name.name,
 +		path->dentry->d_inode);
  	return dentry;
- eexist:
+ fail:
  	dput(dentry);
-@@ -2986,7 +3130,7 @@ int vfs_link(struct dentry *old_dentry, 
+@@ -3489,7 +3632,7 @@ int vfs_link(struct dentry *old_dentry, 
  	/*
  	 * A link to an append-only or immutable file cannot be created.
  	 */
@@ -4736,7 +4595,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  		return -EPERM;
  	if (!dir->i_op->link)
  		return -EPERM;
-@@ -3375,6 +3519,253 @@ int vfs_follow_link(struct nameidata *nd
+@@ -3874,6 +4017,253 @@ int vfs_follow_link(struct nameidata *nd
  	return __vfs_follow_link(nd, link);
  }
  
@@ -4990,14 +4849,14 @@ diff -NurpP --minimal linux-3.4.11/fs/namei.c linux-3.4.11-vs2.3.3.8/fs/namei.c
  /* get the link contents into pagecache */
  static char *page_getlink(struct dentry * dentry, struct page **ppage)
  {
-@@ -3499,3 +3890,4 @@ EXPORT_SYMBOL(vfs_symlink);
+@@ -3998,3 +4388,4 @@ EXPORT_SYMBOL(vfs_symlink);
  EXPORT_SYMBOL(vfs_unlink);
  EXPORT_SYMBOL(dentry_unhash);
  EXPORT_SYMBOL(generic_readlink);
 +EXPORT_SYMBOL(vx_info_mnt_namespace);
-diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/namespace.c
---- linux-3.4.11/fs/namespace.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/namespace.c	2012-06-28 16:45:07.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/namespace.c
+--- linux-3.6/fs/namespace.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/namespace.c	2012-10-04 18:47:00.000000000 +0200
 @@ -20,6 +20,11 @@
  #include <linux/fs_struct.h>	/* get_fs_root et.al. */
  #include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */
@@ -5010,7 +4869,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  #include "pnode.h"
  #include "internal.h"
  
-@@ -697,6 +702,10 @@ vfs_kern_mount(struct file_system_type *
+@@ -749,6 +754,10 @@ vfs_kern_mount(struct file_system_type *
  	if (!type)
  		return ERR_PTR(-ENODEV);
  
@@ -5021,15 +4880,15 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  	mnt = alloc_vfsmnt(name);
  	if (!mnt)
  		return ERR_PTR(-ENOMEM);
-@@ -745,6 +754,7 @@ static struct mount *clone_mnt(struct mo
- 		mnt->mnt.mnt_root = dget(root);
- 		mnt->mnt_mountpoint = mnt->mnt.mnt_root;
- 		mnt->mnt_parent = mnt;
+@@ -801,6 +810,7 @@ static struct mount *clone_mnt(struct mo
+ 	mnt->mnt.mnt_root = dget(root);
+ 	mnt->mnt_mountpoint = mnt->mnt.mnt_root;
+ 	mnt->mnt_parent = mnt;
 +		mnt->mnt_tag = old->mnt_tag;
- 		br_write_lock(vfsmount_lock);
- 		list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
- 		br_write_unlock(vfsmount_lock);
-@@ -1210,7 +1220,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
+ 	br_write_lock(&vfsmount_lock);
+ 	list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
+ 	br_write_unlock(&vfsmount_lock);
+@@ -1266,7 +1276,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
  		goto dput_and_out;
  
  	retval = -EPERM;
@@ -5038,7 +4897,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  		goto dput_and_out;
  
  	retval = do_umount(mnt, flags);
-@@ -1236,7 +1246,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
+@@ -1292,7 +1302,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
  
  static int mount_is_safe(struct path *path)
  {
@@ -5047,7 +4906,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  		return 0;
  	return -EPERM;
  #ifdef notyet
-@@ -1549,7 +1559,7 @@ static int do_change_type(struct path *p
+@@ -1610,7 +1620,7 @@ static int do_change_type(struct path *p
  	int type;
  	int err = 0;
  
@@ -5056,15 +4915,15 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  		return -EPERM;
  
  	if (path->dentry != path->mnt->mnt_root)
-@@ -1565,6 +1575,7 @@ static int do_change_type(struct path *p
+@@ -1626,6 +1636,7 @@ static int do_change_type(struct path *p
  		if (err)
  			goto out_unlock;
  	}
 +	// mnt->mnt_flags = mnt_flags;
  
- 	br_write_lock(vfsmount_lock);
+ 	br_write_lock(&vfsmount_lock);
  	for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -1580,12 +1591,14 @@ static int do_change_type(struct path *p
+@@ -1641,12 +1652,14 @@ static int do_change_type(struct path *p
   * do loopback mount.
   */
  static int do_loopback(struct path *path, char *old_name,
@@ -5080,7 +4939,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  	if (err)
  		return err;
  	if (!old_name || !*old_name)
-@@ -1653,13 +1666,13 @@ static int change_mount_flags(struct vfs
+@@ -1715,13 +1728,13 @@ static int change_mount_flags(struct vfs
   * on it - tough luck.
   */
  static int do_remount(struct path *path, int flags, int mnt_flags,
@@ -5096,7 +4955,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  		return -EPERM;
  
  	if (!check_mnt(mnt))
-@@ -1708,7 +1721,7 @@ static int do_move_mount(struct path *pa
+@@ -1770,7 +1783,7 @@ static int do_move_mount(struct path *pa
  	struct mount *p;
  	struct mount *old;
  	int err = 0;
@@ -5105,7 +4964,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  		return -EPERM;
  	if (!old_name || !*old_name)
  		return -EINVAL;
-@@ -1859,7 +1872,7 @@ static int do_new_mount(struct path *pat
+@@ -1927,7 +1940,7 @@ static int do_new_mount(struct path *pat
  		return -EINVAL;
  
  	/* we need capabilities... */
@@ -5114,7 +4973,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  		return -EPERM;
  
  	mnt = do_kern_mount(type, flags, name, data);
-@@ -2129,6 +2142,7 @@ long do_mount(char *dev_name, char *dir_
+@@ -2197,6 +2210,7 @@ long do_mount(char *dev_name, char *dir_
  	struct path path;
  	int retval = 0;
  	int mnt_flags = 0;
@@ -5122,7 +4981,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  
  	/* Discard magic */
  	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2156,6 +2170,12 @@ long do_mount(char *dev_name, char *dir_
+@@ -2224,6 +2238,12 @@ long do_mount(char *dev_name, char *dir_
  	if (!(flags & MS_NOATIME))
  		mnt_flags |= MNT_RELATIME;
  
@@ -5135,7 +4994,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  	/* Separate the per-mountpoint flags */
  	if (flags & MS_NOSUID)
  		mnt_flags |= MNT_NOSUID;
-@@ -2172,15 +2192,17 @@ long do_mount(char *dev_name, char *dir_
+@@ -2240,15 +2260,17 @@ long do_mount(char *dev_name, char *dir_
  	if (flags & MS_RDONLY)
  		mnt_flags |= MNT_READONLY;
  
@@ -5155,7 +5014,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  	else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
  		retval = do_change_type(&path, flags);
  	else if (flags & MS_MOVE)
-@@ -2283,6 +2305,7 @@ static struct mnt_namespace *dup_mnt_ns(
+@@ -2329,6 +2351,7 @@ static struct mnt_namespace *dup_mnt_ns(
  		q = next_mnt(q, new);
  	}
  	up_write(&namespace_sem);
@@ -5163,7 +5022,7 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  
  	if (rootmnt)
  		mntput(rootmnt);
-@@ -2479,9 +2502,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2524,9 +2547,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
  	error = -EINVAL;
  	new_mnt = real_mount(new.mnt);
  	root_mnt = real_mount(root.mnt);
@@ -5176,18 +5035,18 @@ diff -NurpP --minimal linux-3.4.11/fs/namespace.c linux-3.4.11-vs2.3.3.8/fs/name
  		goto out4;
  	if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
  		goto out4;
-@@ -2602,6 +2626,7 @@ void put_mnt_ns(struct mnt_namespace *ns
- 	br_write_unlock(vfsmount_lock);
+@@ -2647,6 +2671,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+ 	br_write_unlock(&vfsmount_lock);
  	up_write(&namespace_sem);
  	release_mounts(&umount_list);
 +	atomic_dec(&vs_global_mnt_ns);
  	kfree(ns);
  }
  
-diff -NurpP --minimal linux-3.4.11/fs/nfs/client.c linux-3.4.11-vs2.3.3.8/fs/nfs/client.c
---- linux-3.4.11/fs/nfs/client.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/nfs/client.c	2012-05-21 18:15:05.000000000 +0200
-@@ -802,6 +802,9 @@ static int nfs_init_server_rpcclient(str
+diff -NurpP --minimal linux-3.6/fs/nfs/client.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/client.c
+--- linux-3.6/fs/nfs/client.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/client.c	2012-10-04 18:47:00.000000000 +0200
+@@ -692,6 +692,9 @@ int nfs_init_server_rpcclient(struct nfs
  	if (server->flags & NFS_MOUNT_SOFT)
  		server->client->cl_softrtry = 1;
  
@@ -5196,8 +5055,8 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/client.c linux-3.4.11-vs2.3.3.8/fs/nfs
 +		server->client->cl_tag = 1;
  	return 0;
  }
- 
-@@ -977,6 +980,10 @@ static void nfs_server_set_fsinfo(struct
+ EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
+@@ -870,6 +873,10 @@ static void nfs_server_set_fsinfo(struct
  		server->acdirmin = server->acdirmax = 0;
  	}
  
@@ -5208,10 +5067,10 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/client.c linux-3.4.11-vs2.3.3.8/fs/nfs
  	server->maxfilesize = fsinfo->maxfilesize;
  
  	server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.4.11/fs/nfs/dir.c linux-3.4.11-vs2.3.3.8/fs/nfs/dir.c
---- linux-3.4.11/fs/nfs/dir.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/nfs/dir.c	2012-05-21 18:15:05.000000000 +0200
-@@ -35,6 +35,7 @@
+diff -NurpP --minimal linux-3.6/fs/nfs/dir.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/dir.c
+--- linux-3.6/fs/nfs/dir.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/dir.c	2012-10-04 18:47:00.000000000 +0200
+@@ -36,6 +36,7 @@
  #include <linux/sched.h>
  #include <linux/kmemleak.h>
  #include <linux/xattr.h>
@@ -5219,18 +5078,18 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/dir.c linux-3.4.11-vs2.3.3.8/fs/nfs/di
  
  #include "delegation.h"
  #include "iostat.h"
-@@ -1311,6 +1312,7 @@ static struct dentry *nfs_lookup(struct 
- 	if (IS_ERR(res))
- 		goto out_unblock_sillyrename;
+@@ -1251,6 +1252,7 @@ struct dentry *nfs_lookup(struct inode *
+ 	/* Success: notify readdir to use READDIRPLUS */
+ 	nfs_advise_use_readdirplus(dir);
  
 +	dx_propagate_tag(nd, inode);
  no_entry:
  	res = d_materialise_unique(dentry, inode);
  	if (res != NULL) {
-diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/inode.c
---- linux-3.4.11/fs/nfs/inode.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/nfs/inode.c	2012-05-21 18:15:05.000000000 +0200
-@@ -40,6 +40,7 @@
+diff -NurpP --minimal linux-3.6/fs/nfs/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/inode.c
+--- linux-3.6/fs/nfs/inode.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/inode.c	2012-10-04 18:47:00.000000000 +0200
+@@ -39,6 +39,7 @@
  #include <linux/compat.h>
  #include <linux/freezer.h>
  #include <linux/crc32.h>
@@ -5238,7 +5097,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  
  #include <asm/uaccess.h>
  
-@@ -275,6 +276,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -279,6 +280,8 @@ nfs_fhget(struct super_block *sb, struct
  	if (inode->i_state & I_NEW) {
  		struct nfs_inode *nfsi = NFS_I(inode);
  		unsigned long now = jiffies;
@@ -5257,24 +5116,22 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
 +		gid = -2;
  		inode->i_blocks = 0;
  		memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
- 
-@@ -361,13 +364,13 @@ nfs_fhget(struct super_block *sb, struct
+ 		nfsi->write_io = 0;
+@@ -358,11 +361,11 @@ nfs_fhget(struct super_block *sb, struct
  		else if (nfs_server_capable(inode, NFS_CAP_NLINK))
  			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
  		if (fattr->valid & NFS_ATTR_FATTR_OWNER)
 -			inode->i_uid = fattr->uid;
 +			uid = fattr->uid;
  		else if (nfs_server_capable(inode, NFS_CAP_OWNER))
- 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR
- 				| NFS_INO_INVALID_ACCESS
- 				| NFS_INO_INVALID_ACL;
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
  		if (fattr->valid & NFS_ATTR_FATTR_GROUP)
 -			inode->i_gid = fattr->gid;
 +			gid = fattr->gid;
  		else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
- 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR
- 				| NFS_INO_INVALID_ACCESS
-@@ -380,6 +383,11 @@ nfs_fhget(struct super_block *sb, struct
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ 		if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
+@@ -373,6 +376,11 @@ nfs_fhget(struct super_block *sb, struct
  			 */
  			inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
  		}
@@ -5286,7 +5143,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
  		nfsi->attrtimeo_timestamp = now;
  		nfsi->access_cache = RB_ROOT;
-@@ -497,6 +505,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -494,6 +502,8 @@ void nfs_setattr_update_inode(struct ino
  			inode->i_uid = attr->ia_uid;
  		if ((attr->ia_valid & ATTR_GID) != 0)
  			inode->i_gid = attr->ia_gid;
@@ -5295,7 +5152,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  		NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
  		spin_unlock(&inode->i_lock);
  	}
-@@ -946,6 +956,9 @@ static int nfs_check_inode_attributes(st
+@@ -965,6 +975,9 @@ static int nfs_check_inode_attributes(st
  	struct nfs_inode *nfsi = NFS_I(inode);
  	loff_t cur_size, new_isize;
  	unsigned long invalid = 0;
@@ -5304,8 +5161,8 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
 +	tag_t tag;
  
  
- 	/* Has the inode gone and changed behind our back? */
-@@ -969,13 +982,18 @@ static int nfs_check_inode_attributes(st
+ 	if (nfs_have_delegated_attributes(inode))
+@@ -990,13 +1003,18 @@ static int nfs_check_inode_attributes(st
  			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
  	}
  
@@ -5326,7 +5183,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  
  	/* Has the link count changed? */
  	if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1273,6 +1291,9 @@ static int nfs_update_inode(struct inode
+@@ -1300,6 +1318,9 @@ static int nfs_update_inode(struct inode
  	unsigned long invalid = 0;
  	unsigned long now = jiffies;
  	unsigned long save_cache_validity;
@@ -5336,7 +5193,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  
  	dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
  			__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1381,6 +1402,9 @@ static int nfs_update_inode(struct inode
+@@ -1401,6 +1422,9 @@ static int nfs_update_inode(struct inode
  				| NFS_INO_REVAL_PAGECACHE
  				| NFS_INO_REVAL_FORCED);
  
@@ -5346,7 +5203,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  
  	if (fattr->valid & NFS_ATTR_FATTR_ATIME)
  		memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1402,9 +1426,9 @@ static int nfs_update_inode(struct inode
+@@ -1422,9 +1446,9 @@ static int nfs_update_inode(struct inode
  				| NFS_INO_REVAL_FORCED);
  
  	if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
@@ -5358,7 +5215,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  		}
  	} else if (server->caps & NFS_CAP_OWNER)
  		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1413,9 +1437,9 @@ static int nfs_update_inode(struct inode
+@@ -1433,9 +1457,9 @@ static int nfs_update_inode(struct inode
  				| NFS_INO_REVAL_FORCED);
  
  	if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
@@ -5370,7 +5227,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  		}
  	} else if (server->caps & NFS_CAP_OWNER_GROUP)
  		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1423,6 +1447,10 @@ static int nfs_update_inode(struct inode
+@@ -1443,6 +1467,10 @@ static int nfs_update_inode(struct inode
  				| NFS_INO_INVALID_ACL
  				| NFS_INO_REVAL_FORCED);
  
@@ -5381,9 +5238,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/inode.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  	if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
  		if (inode->i_nlink != fattr->nlink) {
  			invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nfs/nfs3xdr.c
---- linux-3.4.11/fs/nfs/nfs3xdr.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/nfs/nfs3xdr.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfs/nfs3xdr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/nfs3xdr.c
+--- linux-3.6/fs/nfs/nfs3xdr.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/nfs3xdr.c	2012-10-04 18:47:00.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/nfs3.h>
  #include <linux/nfs_fs.h>
@@ -5392,7 +5249,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  #include "internal.h"
  
  #define NFSDBG_FACILITY		NFSDBG_XDR
-@@ -562,7 +563,8 @@ static __be32 *xdr_decode_nfstime3(__be3
+@@ -560,7 +561,8 @@ static __be32 *xdr_decode_nfstime3(__be3
   *		set_mtime	mtime;
   *	};
   */
@@ -5402,7 +5259,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  {
  	u32 nbytes;
  	__be32 *p;
-@@ -594,15 +596,19 @@ static void encode_sattr3(struct xdr_str
+@@ -592,15 +594,19 @@ static void encode_sattr3(struct xdr_str
  	} else
  		*p++ = xdr_zero;
  
@@ -5426,7 +5283,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  	} else
  		*p++ = xdr_zero;
  
-@@ -878,7 +884,7 @@ static void nfs3_xdr_enc_setattr3args(st
+@@ -879,7 +885,7 @@ static void nfs3_xdr_enc_setattr3args(st
  				      const struct nfs3_sattrargs *args)
  {
  	encode_nfs_fh3(xdr, args->fh);
@@ -5435,7 +5292,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  	encode_sattrguard3(xdr, args);
  }
  
-@@ -1028,13 +1034,13 @@ static void nfs3_xdr_enc_write3args(stru
+@@ -1029,13 +1035,13 @@ static void nfs3_xdr_enc_write3args(stru
   *	};
   */
  static void encode_createhow3(struct xdr_stream *xdr,
@@ -5451,7 +5308,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  		break;
  	case NFS3_CREATE_EXCLUSIVE:
  		encode_createverf3(xdr, args->verifier);
-@@ -1049,7 +1055,7 @@ static void nfs3_xdr_enc_create3args(str
+@@ -1050,7 +1056,7 @@ static void nfs3_xdr_enc_create3args(str
  				     const struct nfs3_createargs *args)
  {
  	encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -5460,7 +5317,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  }
  
  /*
-@@ -1065,7 +1071,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1066,7 +1072,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
  				    const struct nfs3_mkdirargs *args)
  {
  	encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -5469,7 +5326,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  }
  
  /*
-@@ -1082,9 +1088,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1083,9 +1089,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
   *	};
   */
  static void encode_symlinkdata3(struct xdr_stream *xdr,
@@ -5481,7 +5338,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  	encode_nfspath3(xdr, args->pages, args->pathlen);
  }
  
-@@ -1093,7 +1099,7 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1094,7 +1100,7 @@ static void nfs3_xdr_enc_symlink3args(st
  				      const struct nfs3_symlinkargs *args)
  {
  	encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
@@ -5490,7 +5347,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  }
  
  /*
-@@ -1121,24 +1127,24 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1122,24 +1128,24 @@ static void nfs3_xdr_enc_symlink3args(st
   *	};
   */
  static void encode_devicedata3(struct xdr_stream *xdr,
@@ -5520,7 +5377,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  		break;
  	case NF3REG:
  	case NF3DIR:
-@@ -1153,7 +1159,7 @@ static void nfs3_xdr_enc_mknod3args(stru
+@@ -1154,7 +1160,7 @@ static void nfs3_xdr_enc_mknod3args(stru
  				    const struct nfs3_mknodargs *args)
  {
  	encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -5529,9 +5386,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  }
  
  /*
-diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/super.c
---- linux-3.4.11/fs/nfs/super.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/nfs/super.c	2012-09-16 20:49:11.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/super.c
+--- linux-3.6/fs/nfs/super.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/super.c	2012-10-04 18:47:00.000000000 +0200
 @@ -54,6 +54,7 @@
  #include <linux/parser.h>
  #include <linux/nsproxy.h>
@@ -5540,7 +5397,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  
  #include <asm/uaccess.h>
  
-@@ -86,6 +87,7 @@ enum {
+@@ -88,6 +89,7 @@ enum {
  	Opt_sharecache, Opt_nosharecache,
  	Opt_resvport, Opt_noresvport,
  	Opt_fscache, Opt_nofscache,
@@ -5548,7 +5405,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  
  	/* Mount options that take integer arguments */
  	Opt_port,
-@@ -98,6 +100,7 @@ enum {
+@@ -100,6 +102,7 @@ enum {
  	Opt_mountport,
  	Opt_mountvers,
  	Opt_minorversion,
@@ -5556,7 +5413,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  
  	/* Mount options that take string arguments */
  	Opt_nfsvers,
-@@ -180,6 +183,10 @@ static const match_table_t nfs_mount_opt
+@@ -182,6 +185,10 @@ static const match_table_t nfs_mount_opt
  	/* The following needs to be listed after all other options */
  	{ Opt_nfsvers, "v%s" },
  
@@ -5567,7 +5424,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  	{ Opt_err, NULL }
  };
  
-@@ -674,6 +681,7 @@ static void nfs_show_mount_options(struc
+@@ -626,6 +633,7 @@ static void nfs_show_mount_options(struc
  		{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
  		{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
  		{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
@@ -5575,7 +5432,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  		{ 0, NULL, NULL }
  	};
  	const struct proc_nfs_info *nfs_infop;
-@@ -1286,6 +1294,14 @@ static int nfs_parse_mount_options(char 
+@@ -1243,6 +1251,14 @@ static int nfs_parse_mount_options(char 
  			kfree(mnt->fscache_uniq);
  			mnt->fscache_uniq = NULL;
  			break;
@@ -5590,7 +5447,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  
  		/*
  		 * options that take numeric values
-@@ -1372,6 +1388,12 @@ static int nfs_parse_mount_options(char 
+@@ -1329,6 +1345,12 @@ static int nfs_parse_mount_options(char 
  				goto out_invalid_value;
  			mnt->minorversion = option;
  			break;
@@ -5603,18 +5460,18 @@ diff -NurpP --minimal linux-3.4.11/fs/nfs/super.c linux-3.4.11-vs2.3.3.8/fs/nfs/
  
  		/*
  		 * options that take text values
-diff -NurpP --minimal linux-3.4.11/fs/nfsd/auth.c linux-3.4.11-vs2.3.3.8/fs/nfsd/auth.c
---- linux-3.4.11/fs/nfsd/auth.c	2010-02-25 11:52:05.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/nfsd/auth.c	2012-05-21 18:15:05.000000000 +0200
-@@ -1,6 +1,7 @@
- /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
+diff -NurpP --minimal linux-3.6/fs/nfsd/auth.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/auth.c
+--- linux-3.6/fs/nfsd/auth.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/auth.c	2012-10-04 18:47:00.000000000 +0200
+@@ -2,6 +2,7 @@
  
  #include <linux/sched.h>
+ #include <linux/user_namespace.h>
 +#include <linux/vs_tag.h>
  #include "nfsd.h"
  #include "auth.h"
  
-@@ -36,6 +37,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+@@ -37,6 +38,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
  
  	new->fsuid = rqstp->rq_cred.cr_uid;
  	new->fsgid = rqstp->rq_cred.cr_gid;
@@ -5624,9 +5481,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfsd/auth.c linux-3.4.11-vs2.3.3.8/fs/nfsd
  
  	rqgi = rqstp->rq_cred.cr_group_info;
  
-diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/nfsd/nfs3xdr.c
---- linux-3.4.11/fs/nfsd/nfs3xdr.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/nfsd/nfs3xdr.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfsd/nfs3xdr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfs3xdr.c
+--- linux-3.6/fs/nfsd/nfs3xdr.c	2012-05-21 18:07:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfs3xdr.c	2012-10-04 18:47:00.000000000 +0200
 @@ -7,6 +7,7 @@
   */
  
@@ -5677,9 +5534,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfs3xdr.c linux-3.4.11-vs2.3.3.8/fs/n
  	if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
  		p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
  	} else {
-diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfs4xdr.c linux-3.4.11-vs2.3.3.8/fs/nfsd/nfs4xdr.c
---- linux-3.4.11/fs/nfsd/nfs4xdr.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/nfsd/nfs4xdr.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfsd/nfs4xdr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfs4xdr.c
+--- linux-3.6/fs/nfsd/nfs4xdr.c	2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfs4xdr.c	2012-10-04 18:47:00.000000000 +0200
 @@ -46,6 +46,7 @@
  #include <linux/utsname.h>
  #include <linux/pagemap.h>
@@ -5688,7 +5545,7 @@ diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfs4xdr.c linux-3.4.11-vs2.3.3.8/fs/n
  
  #include "idmap.h"
  #include "acl.h"
-@@ -2325,14 +2326,18 @@ out_acl:
+@@ -2351,14 +2352,18 @@ out_acl:
  		WRITE32(stat.nlink);
  	}
  	if (bmval1 & FATTR4_WORD1_OWNER) {
@@ -5709,9 +5566,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfs4xdr.c linux-3.4.11-vs2.3.3.8/fs/n
  		if (status == nfserr_resource)
  			goto out_resource;
  		if (status)
-diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfsxdr.c linux-3.4.11-vs2.3.3.8/fs/nfsd/nfsxdr.c
---- linux-3.4.11/fs/nfsd/nfsxdr.c	2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/nfsd/nfsxdr.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfsd/nfsxdr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfsxdr.c
+--- linux-3.6/fs/nfsd/nfsxdr.c	2011-05-22 16:17:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfsxdr.c	2012-10-04 18:47:00.000000000 +0200
 @@ -6,6 +6,7 @@
  
  #include "xdr.h"
@@ -5760,9 +5617,9 @@ diff -NurpP --minimal linux-3.4.11/fs/nfsd/nfsxdr.c linux-3.4.11-vs2.3.3.8/fs/nf
  
  	if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
  		*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.4.11/fs/ocfs2/dlmglue.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/dlmglue.c
---- linux-3.4.11/fs/ocfs2/dlmglue.c	2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/dlmglue.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/dlmglue.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/dlmglue.c
+--- linux-3.6/fs/ocfs2/dlmglue.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/dlmglue.c	2012-10-04 18:47:00.000000000 +0200
 @@ -2047,6 +2047,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);
@@ -5779,9 +5636,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/dlmglue.c linux-3.4.11-vs2.3.3.8/fs/
  	inode->i_mode    = be16_to_cpu(lvb->lvb_imode);
  	set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
  	ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.4.11/fs/ocfs2/dlmglue.h linux-3.4.11-vs2.3.3.8/fs/ocfs2/dlmglue.h
---- linux-3.4.11/fs/ocfs2/dlmglue.h	2010-10-21 13:07:50.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/dlmglue.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/dlmglue.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/dlmglue.h
+--- linux-3.6/fs/ocfs2/dlmglue.h	2010-10-21 13:07:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/dlmglue.h	2012-10-04 18:47:00.000000000 +0200
 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
  	__be16       lvb_inlink;
  	__be32       lvb_iattr;
@@ -5792,9 +5649,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/dlmglue.h linux-3.4.11-vs2.3.3.8/fs/
  };
  
  #define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.4.11/fs/ocfs2/file.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/file.c
---- linux-3.4.11/fs/ocfs2/file.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/file.c	2012-07-18 00:29:43.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/file.c
+--- linux-3.6/fs/ocfs2/file.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/file.c	2012-10-04 18:47:00.000000000 +0200
 @@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
  		attr->ia_valid &= ~ATTR_SIZE;
  
@@ -5804,9 +5661,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/file.c linux-3.4.11-vs2.3.3.8/fs/ocf
  	if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
  		return 0;
  
-diff -NurpP --minimal linux-3.4.11/fs/ocfs2/inode.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/inode.c
---- linux-3.4.11/fs/ocfs2/inode.c	2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/inode.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/inode.c
+--- linux-3.6/fs/ocfs2/inode.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <linux/highmem.h>
  #include <linux/pagemap.h>
@@ -5902,10 +5759,10 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/inode.c linux-3.4.11-vs2.3.3.8/fs/oc
 +		/* le16_to_cpu(raw_inode->i_raw_tag)i */ 0);
  
  	/* Fast symlinks will have i_size but no allocated clusters. */
- 	if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-3.4.11/fs/ocfs2/inode.h linux-3.4.11-vs2.3.3.8/fs/ocfs2/inode.h
---- linux-3.4.11/fs/ocfs2/inode.h	2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/inode.h	2012-05-21 18:15:05.000000000 +0200
+ 	if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
+diff -NurpP --minimal linux-3.6/fs/ocfs2/inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/inode.h
+--- linux-3.6/fs/ocfs2/inode.h	2012-01-09 16:14:55.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/inode.h	2012-10-04 18:47:00.000000000 +0200
 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i
  
  void ocfs2_set_inode_flags(struct inode *inode);
@@ -5914,9 +5771,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/inode.h linux-3.4.11-vs2.3.3.8/fs/oc
  
  static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
  {
-diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ioctl.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/ioctl.c
---- linux-3.4.11/fs/ocfs2/ioctl.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/ioctl.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/ioctl.c
+--- linux-3.6/fs/ocfs2/ioctl.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/ioctl.c	2012-10-04 18:47:00.000000000 +0200
 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
  	return status;
  }
@@ -5980,9 +5837,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ioctl.c linux-3.4.11-vs2.3.3.8/fs/oc
  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.4.11/fs/ocfs2/namei.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/namei.c
---- linux-3.4.11/fs/ocfs2/namei.c	2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/namei.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/namei.c
+--- linux-3.6/fs/ocfs2/namei.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/namei.c	2012-10-04 18:47:00.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/slab.h>
  #include <linux/highmem.h>
@@ -6013,9 +5870,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/namei.c linux-3.4.11-vs2.3.3.8/fs/oc
  	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.4.11/fs/ocfs2/ocfs2.h linux-3.4.11-vs2.3.3.8/fs/ocfs2/ocfs2.h
---- linux-3.4.11/fs/ocfs2/ocfs2.h	2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/ocfs2.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/ocfs2.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/ocfs2.h
+--- linux-3.6/fs/ocfs2/ocfs2.h	2012-01-09 16:14:55.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/ocfs2.h	2012-10-04 18:47:00.000000000 +0200
 @@ -272,6 +272,7 @@ enum ocfs2_mount_options
  						     writes */
  	OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -6024,9 +5881,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ocfs2.h linux-3.4.11-vs2.3.3.8/fs/oc
  };
  
  #define OCFS2_OSB_SOFT_RO			0x0001
-diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ocfs2_fs.h linux-3.4.11-vs2.3.3.8/fs/ocfs2/ocfs2_fs.h
---- linux-3.4.11/fs/ocfs2/ocfs2_fs.h	2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/ocfs2_fs.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/ocfs2_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/ocfs2_fs.h
+--- linux-3.6/fs/ocfs2/ocfs2_fs.h	2011-05-22 16:17:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/ocfs2_fs.h	2012-10-04 18:47:00.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 */
@@ -6039,9 +5896,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/ocfs2_fs.h linux-3.4.11-vs2.3.3.8/fs
  #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.4.11/fs/ocfs2/super.c linux-3.4.11-vs2.3.3.8/fs/ocfs2/super.c
---- linux-3.4.11/fs/ocfs2/super.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/ocfs2/super.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/super.c
+--- linux-3.6/fs/ocfs2/super.c	2012-05-21 18:07:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/super.c	2012-10-04 18:47:00.000000000 +0200
 @@ -185,6 +185,7 @@ enum {
  	Opt_coherency_full,
  	Opt_resv_level,
@@ -6105,9 +5962,9 @@ diff -NurpP --minimal linux-3.4.11/fs/ocfs2/super.c linux-3.4.11-vs2.3.3.8/fs/oc
  		default:
  			mlog(ML_ERROR,
  			     "Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.4.11/fs/open.c linux-3.4.11-vs2.3.3.8/fs/open.c
---- linux-3.4.11/fs/open.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/open.c	2012-09-16 20:49:11.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/open.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/open.c
+--- linux-3.6/fs/open.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/open.c	2012-10-04 18:47:00.000000000 +0200
 @@ -30,6 +30,11 @@
  #include <linux/fs_struct.h>
  #include <linux/ima.h>
@@ -6133,7 +5990,7 @@ diff -NurpP --minimal linux-3.4.11/fs/open.c linux-3.4.11-vs2.3.3.8/fs/open.c
  	inode = path.dentry->d_inode;
  
  	/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
-@@ -489,6 +500,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -495,6 +506,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
  
  	error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
  	if (!error) {
@@ -6144,21 +6001,23 @@ diff -NurpP --minimal linux-3.4.11/fs/open.c linux-3.4.11-vs2.3.3.8/fs/open.c
  		error = chmod_common(&path, mode);
  		path_put(&path);
  	}
-@@ -509,11 +524,11 @@ static int chown_common(struct path *pat
- 	newattrs.ia_valid =  ATTR_CTIME;
- 	if (user != (uid_t) -1) {
+@@ -522,13 +537,13 @@ static int chown_common(struct path *pat
+ 		if (!uid_valid(uid))
+ 			return -EINVAL;
  		newattrs.ia_valid |= ATTR_UID;
--		newattrs.ia_uid = user;
+-		newattrs.ia_uid = uid;
 +		newattrs.ia_uid = dx_map_uid(user);
  	}
  	if (group != (gid_t) -1) {
+ 		if (!gid_valid(gid))
+ 			return -EINVAL;
  		newattrs.ia_valid |= ATTR_GID;
--		newattrs.ia_gid = group;
+-		newattrs.ia_gid = gid;
 +		newattrs.ia_gid = dx_map_gid(group);
  	}
  	if (!S_ISDIR(inode->i_mode))
  		newattrs.ia_valid |=
-@@ -538,6 +553,10 @@ SYSCALL_DEFINE3(chown, const char __user
+@@ -561,6 +576,18 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
  	error = mnt_want_write(path.mnt);
  	if (error)
  		goto out_release;
@@ -6166,24 +6025,10 @@ diff -NurpP --minimal linux-3.4.11/fs/open.c linux-3.4.11-vs2.3.3.8/fs/open.c
 +	error = cow_check_and_break(&path);
 +	if (!error)
 +#endif
- 	error = chown_common(&path, user, group);
- 	mnt_drop_write(path.mnt);
- out_release:
-@@ -565,6 +584,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
- 	error = mnt_want_write(path.mnt);
- 	if (error)
- 		goto out_release;
 +#ifdef CONFIG_VSERVER_COWBL
 +	error = cow_check_and_break(&path);
 +	if (!error)
 +#endif
- 	error = chown_common(&path, user, group);
- 	mnt_drop_write(path.mnt);
- out_release:
-@@ -584,6 +607,10 @@ SYSCALL_DEFINE3(lchown, const char __use
- 	error = mnt_want_write(path.mnt);
- 	if (error)
- 		goto out_release;
 +#ifdef CONFIG_VSERVER_COWBL
 +	error = cow_check_and_break(&path);
 +	if (!error)
@@ -6191,7 +6036,7 @@ diff -NurpP --minimal linux-3.4.11/fs/open.c linux-3.4.11-vs2.3.3.8/fs/open.c
  	error = chown_common(&path, user, group);
  	mnt_drop_write(path.mnt);
  out_release:
-@@ -839,6 +866,7 @@ static void __put_unused_fd(struct files
+@@ -809,6 +836,7 @@ static void __put_unused_fd(struct files
  	__clear_open_fd(fd, fdt);
  	if (fd < files->next_fd)
  		files->next_fd = fd;
@@ -6199,19 +6044,19 @@ diff -NurpP --minimal linux-3.4.11/fs/open.c linux-3.4.11-vs2.3.3.8/fs/open.c
  }
  
  void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/fs/proc/array.c
---- linux-3.4.11/fs/proc/array.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/array.c	2012-05-21 18:15:05.000000000 +0200
-@@ -81,6 +81,8 @@
- #include <linux/pid_namespace.h>
+diff -NurpP --minimal linux-3.6/fs/proc/array.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/array.c
+--- linux-3.6/fs/proc/array.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/array.c	2012-10-04 18:47:00.000000000 +0200
+@@ -82,6 +82,8 @@
  #include <linux/ptrace.h>
  #include <linux/tracehook.h>
+ #include <linux/user_namespace.h>
 +#include <linux/vs_context.h>
 +#include <linux/vs_network.h>
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-@@ -170,6 +172,9 @@ static inline void task_state(struct seq
+@@ -172,6 +174,9 @@ static inline void task_state(struct seq
  	rcu_read_lock();
  	ppid = pid_alive(p) ?
  		task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
@@ -6221,7 +6066,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/fs/pro
  	tpid = 0;
  	if (pid_alive(p)) {
  		struct task_struct *tracer = ptrace_parent(p);
-@@ -287,7 +292,7 @@ static inline void task_sig(struct seq_f
+@@ -296,7 +301,7 @@ static inline void task_sig(struct seq_f
  }
  
  static void render_cap_t(struct seq_file *m, const char *header,
@@ -6230,7 +6075,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/fs/pro
  {
  	unsigned __capi;
  
-@@ -312,10 +317,11 @@ static inline void task_cap(struct seq_f
+@@ -321,10 +326,11 @@ static inline void task_cap(struct seq_f
  	cap_bset	= cred->cap_bset;
  	rcu_read_unlock();
  
@@ -6246,7 +6091,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/fs/pro
  }
  
  static inline void task_context_switch_counts(struct seq_file *m,
-@@ -337,6 +343,42 @@ static void task_cpus_allowed(struct seq
+@@ -346,6 +352,42 @@ static void task_cpus_allowed(struct seq
  	seq_putc(m, '\n');
  }
  
@@ -6289,7 +6134,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/fs/pro
  int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task)
  {
-@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m, 
+@@ -362,6 +404,7 @@ int proc_pid_status(struct seq_file *m, 
  	task_cap(m, task);
  	task_cpus_allowed(m, task);
  	cpuset_task_status_allowed(m, task);
@@ -6297,7 +6142,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/fs/pro
  	task_context_switch_counts(m, task);
  	return 0;
  }
-@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file 
+@@ -471,6 +514,17 @@ static int do_task_stat(struct seq_file 
  	/* convert nsec -> ticks */
  	start_time = nsec_to_clock_t(start_time);
  
@@ -6315,10 +6160,10 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/array.c linux-3.4.11-vs2.3.3.8/fs/pro
  	seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
  	seq_put_decimal_ll(m, ' ', ppid);
  	seq_put_decimal_ll(m, ' ', pgid);
-diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc/base.c
---- linux-3.4.11/fs/proc/base.c	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/base.c	2012-06-28 16:45:07.000000000 +0200
-@@ -84,6 +84,8 @@
+diff -NurpP --minimal linux-3.6/fs/proc/base.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/base.c
+--- linux-3.6/fs/proc/base.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/base.c	2012-10-04 18:47:00.000000000 +0200
+@@ -85,6 +85,8 @@
  #include <linux/fs_struct.h>
  #include <linux/slab.h>
  #include <linux/flex_array.h>
@@ -6327,7 +6172,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  #ifdef CONFIG_HARDWALL
  #include <asm/hardwall.h>
  #endif
-@@ -937,11 +939,16 @@ static ssize_t oom_adjust_write(struct f
+@@ -941,11 +943,16 @@ static ssize_t oom_adjust_write(struct f
  		goto err_task_lock;
  	}
  
@@ -6345,7 +6190,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  	/*
  	 * Warn that /proc/pid/oom_adj is deprecated, see
  	 * Documentation/feature-removal-schedule.txt.
-@@ -1541,6 +1548,8 @@ struct inode *proc_pid_make_inode(struct
+@@ -1548,6 +1555,8 @@ struct inode *proc_pid_make_inode(struct
  		inode->i_gid = cred->egid;
  		rcu_read_unlock();
  	}
@@ -6354,7 +6199,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  	security_task_to_inode(task, inode);
  
  out:
-@@ -1586,6 +1595,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1593,6 +1602,8 @@ int pid_getattr(struct vfsmount *mnt, st
  
  /* dentry stuff */
  
@@ -6363,7 +6208,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  /*
   *	Exceptional case: normally we are not allowed to unhash a busy
   * directory. In this case, however, we can do it - no aliasing problems
-@@ -1614,6 +1625,12 @@ int pid_revalidate(struct dentry *dentry
+@@ -1621,6 +1632,12 @@ int pid_revalidate(struct dentry *dentry
  	task = get_proc_task(inode);
  
  	if (task) {
@@ -6376,7 +6221,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  		if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
  		    task_dumpable(task)) {
  			rcu_read_lock();
-@@ -1630,6 +1647,7 @@ int pid_revalidate(struct dentry *dentry
+@@ -1637,6 +1654,7 @@ int pid_revalidate(struct dentry *dentry
  		put_task_struct(task);
  		return 1;
  	}
@@ -6384,7 +6229,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  	d_drop(dentry);
  	return 0;
  }
-@@ -2452,6 +2470,13 @@ static struct dentry *proc_pident_lookup
+@@ -2457,6 +2475,13 @@ static struct dentry *proc_pident_lookup
  	if (!task)
  		goto out_no_task;
  
@@ -6398,7 +6243,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  	/*
  	 * Yes, it does not scale. And it should not. Don't add
  	 * new entries into /proc/<tgid>/ without very good reasons.
-@@ -2837,7 +2862,7 @@ out_iput:
+@@ -2842,7 +2867,7 @@ out_iput:
  static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
  {
  	struct dentry *error;
@@ -6407,7 +6252,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  	const struct pid_entry *p, *last;
  
  	error = ERR_PTR(-ENOENT);
-@@ -2944,6 +2969,9 @@ static int proc_pid_personality(struct s
+@@ -3017,6 +3042,9 @@ static int proc_pid_personality(struct s
  static const struct file_operations proc_task_operations;
  static const struct inode_operations proc_task_inode_operations;
  
@@ -6417,7 +6262,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  static const struct pid_entry tgid_base_stuff[] = {
  	DIR("task",       S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
  	DIR("fd",         S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -3010,6 +3038,8 @@ static const struct pid_entry tgid_base_
+@@ -3083,6 +3111,8 @@ static const struct pid_entry tgid_base_
  #ifdef CONFIG_CGROUPS
  	REG("cgroup",  S_IRUGO, proc_cgroup_operations),
  #endif
@@ -6426,15 +6271,15 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  	INF("oom_score",  S_IRUGO, proc_oom_score),
  	REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
  	REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -3029,6 +3059,7 @@ static const struct pid_entry tgid_base_
- #ifdef CONFIG_HARDWALL
- 	INF("hardwall",   S_IRUGO, proc_pid_hardwall),
+@@ -3106,6 +3136,7 @@ static const struct pid_entry tgid_base_
+ 	REG("uid_map",    S_IRUGO|S_IWUSR, proc_uid_map_operations),
+ 	REG("gid_map",    S_IRUGO|S_IWUSR, proc_gid_map_operations),
  #endif
 +	ONE("nsproxy",	S_IRUGO, proc_pid_nsproxy),
  };
  
  static int proc_tgid_base_readdir(struct file * filp,
-@@ -3222,7 +3253,7 @@ retry:
+@@ -3300,7 +3331,7 @@ retry:
  	iter.task = NULL;
  	pid = find_ge_pid(iter.tgid, ns);
  	if (pid) {
@@ -6443,7 +6288,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  		iter.task = pid_task(pid, PIDTYPE_PID);
  		/* What we to know is if the pid we have find is the
  		 * pid of a thread_group_leader.  Testing for task
-@@ -3252,7 +3283,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -3330,7 +3361,7 @@ static int proc_pid_fill_cache(struct fi
  	struct tgid_iter iter)
  {
  	char name[PROC_NUMBUF];
@@ -6452,7 +6297,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  	return proc_fill_cache(filp, dirent, filldir, name, len,
  				proc_pid_instantiate, iter.task, NULL);
  }
-@@ -3276,7 +3307,7 @@ int proc_pid_readdir(struct file * filp,
+@@ -3354,7 +3385,7 @@ int proc_pid_readdir(struct file * filp,
  		goto out_no_task;
  	nr = filp->f_pos - FIRST_PROCESS_ENTRY;
  
@@ -6461,7 +6306,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  	if (!reaper)
  		goto out_no_task;
  
-@@ -3298,6 +3329,8 @@ int proc_pid_readdir(struct file * filp,
+@@ -3376,6 +3407,8 @@ int proc_pid_readdir(struct file * filp,
  			__filldir = fake_filldir;
  
  		filp->f_pos = iter.tgid + TGID_OFFSET;
@@ -6470,7 +6315,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  		if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
  			put_task_struct(iter.task);
  			goto out;
-@@ -3451,6 +3484,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3537,6 +3570,8 @@ static struct dentry *proc_task_lookup(s
  	tid = name_to_int(dentry);
  	if (tid == ~0U)
  		goto out;
@@ -6479,9 +6324,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/base.c linux-3.4.11-vs2.3.3.8/fs/proc
  
  	ns = dentry->d_sb->s_fs_info;
  	rcu_read_lock();
-diff -NurpP --minimal linux-3.4.11/fs/proc/generic.c linux-3.4.11-vs2.3.3.8/fs/proc/generic.c
---- linux-3.4.11/fs/proc/generic.c	2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/generic.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/generic.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/generic.c
+--- linux-3.6/fs/proc/generic.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/generic.c	2012-10-04 18:47:00.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/bitops.h>
  #include <linux/spinlock.h>
@@ -6541,9 +6386,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/generic.c linux-3.4.11-vs2.3.3.8/fs/p
  		} else {
  			kfree(ent);
  			ent = NULL;
-diff -NurpP --minimal linux-3.4.11/fs/proc/inode.c linux-3.4.11-vs2.3.3.8/fs/proc/inode.c
---- linux-3.4.11/fs/proc/inode.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/inode.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/inode.c
+--- linux-3.6/fs/proc/inode.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe
  			inode->i_uid = de->uid;
  			inode->i_gid = de->gid;
@@ -6553,9 +6398,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/inode.c linux-3.4.11-vs2.3.3.8/fs/pro
  		if (de->size)
  			inode->i_size = de->size;
  		if (de->nlink)
-diff -NurpP --minimal linux-3.4.11/fs/proc/internal.h linux-3.4.11-vs2.3.3.8/fs/proc/internal.h
---- linux-3.4.11/fs/proc/internal.h	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/internal.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/internal.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/internal.h
+--- linux-3.6/fs/proc/internal.h	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/internal.h	2012-10-04 18:47:00.000000000 +0200
 @@ -10,6 +10,8 @@
   */
  
@@ -6565,7 +6410,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/internal.h linux-3.4.11-vs2.3.3.8/fs/
  struct  ctl_table_header;
  
  extern struct proc_dir_entry proc_root;
-@@ -54,6 +56,9 @@ extern int proc_pid_status(struct seq_fi
+@@ -52,6 +54,9 @@ extern int proc_pid_status(struct seq_fi
  				struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
  				struct pid *pid, struct task_struct *task);
@@ -6574,8 +6419,8 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/internal.h linux-3.4.11-vs2.3.3.8/fs/
 +
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
- extern const struct file_operations proc_pid_maps_operations;
-@@ -82,11 +87,16 @@ static inline struct pid *proc_pid(struc
+ extern const struct file_operations proc_tid_children_operations;
+@@ -81,11 +86,16 @@ static inline struct pid *proc_pid(struc
  	return PROC_I(inode)->pid;
  }
  
@@ -6593,9 +6438,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/internal.h linux-3.4.11-vs2.3.3.8/fs/
  static inline int proc_fd(struct inode *inode)
  {
  	return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.4.11/fs/proc/loadavg.c linux-3.4.11-vs2.3.3.8/fs/proc/loadavg.c
---- linux-3.4.11/fs/proc/loadavg.c	2009-09-10 15:26:23.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/loadavg.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/loadavg.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/loadavg.c
+--- linux-3.6/fs/proc/loadavg.c	2009-09-10 15:26:23.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/loadavg.c	2012-10-04 18:47:00.000000000 +0200
 @@ -12,15 +12,27 @@
  
  static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6625,9 +6470,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/loadavg.c linux-3.4.11-vs2.3.3.8/fs/p
  		task_active_pid_ns(current)->last_pid);
  	return 0;
  }
-diff -NurpP --minimal linux-3.4.11/fs/proc/meminfo.c linux-3.4.11-vs2.3.3.8/fs/proc/meminfo.c
---- linux-3.4.11/fs/proc/meminfo.c	2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/meminfo.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/meminfo.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/meminfo.c
+--- linux-3.6/fs/proc/meminfo.c	2012-01-09 16:14:55.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/meminfo.c	2012-10-04 18:47:00.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;
@@ -6638,9 +6483,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/meminfo.c linux-3.4.11-vs2.3.3.8/fs/p
  			total_swapcache_pages - i.bufferram;
  	if (cached < 0)
  		cached = 0;
-diff -NurpP --minimal linux-3.4.11/fs/proc/root.c linux-3.4.11-vs2.3.3.8/fs/proc/root.c
---- linux-3.4.11/fs/proc/root.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/root.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/root.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/root.c
+--- linux-3.6/fs/proc/root.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/root.c	2012-10-04 18:47:00.000000000 +0200
 @@ -19,9 +19,14 @@
  #include <linux/mount.h>
  #include <linux/pid_namespace.h>
@@ -6656,7 +6501,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/root.c linux-3.4.11-vs2.3.3.8/fs/proc
  static int proc_test_super(struct super_block *sb, void *data)
  {
  	return sb->s_fs_info == data;
-@@ -190,6 +195,7 @@ void __init proc_root_init(void)
+@@ -189,6 +194,7 @@ void __init proc_root_init(void)
  #endif
  	proc_mkdir("bus", NULL);
  	proc_sys_init();
@@ -6664,7 +6509,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/root.c linux-3.4.11-vs2.3.3.8/fs/proc
  }
  
  static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-@@ -257,6 +263,7 @@ struct proc_dir_entry proc_root = {
+@@ -255,6 +261,7 @@ struct proc_dir_entry proc_root = {
  	.proc_iops	= &proc_root_inode_operations, 
  	.proc_fops	= &proc_root_operations,
  	.parent		= &proc_root,
@@ -6672,9 +6517,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/root.c linux-3.4.11-vs2.3.3.8/fs/proc
  	.name		= "/proc",
  };
  
-diff -NurpP --minimal linux-3.4.11/fs/proc/stat.c linux-3.4.11-vs2.3.3.8/fs/proc/stat.c
---- linux-3.4.11/fs/proc/stat.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/stat.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/stat.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/stat.c
+--- linux-3.6/fs/proc/stat.c	2012-05-21 18:07:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/stat.c	2012-10-04 18:47:00.000000000 +0200
 @@ -9,6 +9,7 @@
  #include <linux/slab.h>
  #include <linux/time.h>
@@ -6694,9 +6539,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/stat.c linux-3.4.11-vs2.3.3.8/fs/proc
  	jif = boottime.tv_sec;
  
  	for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-3.4.11/fs/proc/uptime.c linux-3.4.11-vs2.3.3.8/fs/proc/uptime.c
---- linux-3.4.11/fs/proc/uptime.c	2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/proc/uptime.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/uptime.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/uptime.c
+--- linux-3.6/fs/proc/uptime.c	2012-03-19 19:47:26.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/uptime.c	2012-10-04 18:47:00.000000000 +0200
 @@ -5,6 +5,7 @@
  #include <linux/seq_file.h>
  #include <linux/time.h>
@@ -6716,9 +6561,9 @@ diff -NurpP --minimal linux-3.4.11/fs/proc/uptime.c linux-3.4.11-vs2.3.3.8/fs/pr
  	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.4.11/fs/proc_namespace.c linux-3.4.11-vs2.3.3.8/fs/proc_namespace.c
---- linux-3.4.11/fs/proc_namespace.c	2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/proc_namespace.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc_namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc_namespace.c
+--- linux-3.6/fs/proc_namespace.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc_namespace.c	2012-10-04 18:47:00.000000000 +0200
 @@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file 
  		{ MS_SYNCHRONOUS, ",sync" },
  		{ MS_DIRSYNC, ",dirsync" },
@@ -6743,7 +6588,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc_namespace.c linux-3.4.11-vs2.3.3.8/fs
 +	if (mnt == mnt->mnt_ns->root)
 +		return 1;
 +
-+	br_read_lock(vfsmount_lock);
++	br_read_lock(&vfsmount_lock);
 +	root = current->fs->root;
 +	root_mnt = real_mount(root.mnt);
 +	point = root.dentry;
@@ -6755,7 +6600,7 @@ diff -NurpP --minimal linux-3.4.11/fs/proc_namespace.c linux-3.4.11-vs2.3.3.8/fs
 +
 +	ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
 +
-+	br_read_unlock(vfsmount_lock);
++	br_read_unlock(&vfsmount_lock);
 +
 +	return ret;
 +}
@@ -6828,10 +6673,10 @@ diff -NurpP --minimal linux-3.4.11/fs/proc_namespace.c linux-3.4.11-vs2.3.3.8/fs
  	/* file system type */
  	seq_puts(m, "with fstype ");
  	show_type(m, sb);
-diff -NurpP --minimal linux-3.4.11/fs/quota/dquot.c linux-3.4.11-vs2.3.3.8/fs/quota/dquot.c
---- linux-3.4.11/fs/quota/dquot.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/quota/dquot.c	2012-05-21 18:15:05.000000000 +0200
-@@ -1563,6 +1563,9 @@ int __dquot_alloc_space(struct inode *in
+diff -NurpP --minimal linux-3.6/fs/quota/dquot.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/quota/dquot.c
+--- linux-3.6/fs/quota/dquot.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/quota/dquot.c	2012-10-04 18:47:00.000000000 +0200
+@@ -1580,6 +1580,9 @@ int __dquot_alloc_space(struct inode *in
  	struct dquot **dquots = inode->i_dquot;
  	int reserve = flags & DQUOT_SPACE_RESERVE;
  
@@ -6841,7 +6686,7 @@ diff -NurpP --minimal linux-3.4.11/fs/quota/dquot.c linux-3.4.11-vs2.3.3.8/fs/qu
  	/*
  	 * First test before acquiring mutex - solves deadlocks when we
  	 * re-enter the quota code and are already holding the mutex
-@@ -1618,6 +1621,9 @@ int dquot_alloc_inode(const struct inode
+@@ -1635,6 +1638,9 @@ int dquot_alloc_inode(const struct inode
  	struct dquot_warn warn[MAXQUOTAS];
  	struct dquot * const *dquots = inode->i_dquot;
  
@@ -6851,7 +6696,7 @@ diff -NurpP --minimal linux-3.4.11/fs/quota/dquot.c linux-3.4.11-vs2.3.3.8/fs/qu
  	/* First test before acquiring mutex - solves deadlocks when we
           * re-enter the quota code and are already holding the mutex */
  	if (!dquot_active(inode))
-@@ -1689,6 +1695,8 @@ void __dquot_free_space(struct inode *in
+@@ -1706,6 +1712,8 @@ void __dquot_free_space(struct inode *in
  	struct dquot **dquots = inode->i_dquot;
  	int reserve = flags & DQUOT_SPACE_RESERVE;
  
@@ -6860,7 +6705,7 @@ diff -NurpP --minimal linux-3.4.11/fs/quota/dquot.c linux-3.4.11-vs2.3.3.8/fs/qu
  	/* First test before acquiring mutex - solves deadlocks when we
           * re-enter the quota code and are already holding the mutex */
  	if (!dquot_active(inode)) {
-@@ -1733,6 +1741,8 @@ void dquot_free_inode(const struct inode
+@@ -1750,6 +1758,8 @@ void dquot_free_inode(const struct inode
  	struct dquot_warn warn[MAXQUOTAS];
  	struct dquot * const *dquots = inode->i_dquot;
  
@@ -6869,16 +6714,16 @@ diff -NurpP --minimal linux-3.4.11/fs/quota/dquot.c linux-3.4.11-vs2.3.3.8/fs/qu
  	/* 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.4.11/fs/quota/quota.c linux-3.4.11-vs2.3.3.8/fs/quota/quota.c
---- linux-3.4.11/fs/quota/quota.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/quota/quota.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/quota/quota.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/quota/quota.c
+--- linux-3.6/fs/quota/quota.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/quota/quota.c	2012-10-04 18:47:00.000000000 +0200
 @@ -8,6 +8,7 @@
  #include <linux/fs.h>
  #include <linux/namei.h>
  #include <linux/slab.h>
 +#include <linux/vs_context.h>
  #include <asm/current.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
  #include <linux/kernel.h>
 @@ -37,7 +38,7 @@ static int check_quotactl_permission(str
  			break;
@@ -6959,9 +6804,9 @@ diff -NurpP --minimal linux-3.4.11/fs/quota/quota.c linux-3.4.11-vs2.3.3.8/fs/qu
  	if (quotactl_cmd_write(cmd))
  		sb = get_super_thawed(bdev);
  	else
-diff -NurpP --minimal linux-3.4.11/fs/reiserfs/file.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/file.c
---- linux-3.4.11/fs/reiserfs/file.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/reiserfs/file.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/file.c
+--- linux-3.6/fs/reiserfs/file.c	2012-05-21 18:07:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/file.c	2012-10-04 18:47:00.000000000 +0200
 @@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f
  	.listxattr = reiserfs_listxattr,
  	.removexattr = reiserfs_removexattr,
@@ -6969,9 +6814,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/file.c linux-3.4.11-vs2.3.3.8/fs/
 +	.sync_flags = reiserfs_sync_flags,
  	.get_acl = reiserfs_get_acl,
  };
-diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/inode.c
---- linux-3.4.11/fs/reiserfs/inode.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/reiserfs/inode.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/inode.c
+--- linux-3.6/fs/reiserfs/inode.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/writeback.h>
  #include <linux/quotaops.h>
@@ -7049,7 +6894,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs
  	set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec);
  	set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec);
  	set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec);
-@@ -2868,14 +2879,19 @@ int reiserfs_commit_write(struct file *f
+@@ -2862,14 +2873,19 @@ int reiserfs_commit_write(struct file *f
  void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
  {
  	if (reiserfs_attrs(inode->i_sb)) {
@@ -7073,7 +6918,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs
  		if (sd_attrs & REISERFS_APPEND_FL)
  			inode->i_flags |= S_APPEND;
  		else
-@@ -2888,6 +2904,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
+@@ -2882,6 +2898,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
  			REISERFS_I(inode)->i_flags |= i_nopack_mask;
  		else
  			REISERFS_I(inode)->i_flags &= ~i_nopack_mask;
@@ -7089,7 +6934,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs
  	}
  }
  
-@@ -2898,6 +2923,11 @@ void i_attrs_to_sd_attrs(struct inode *i
+@@ -2892,6 +2917,11 @@ void i_attrs_to_sd_attrs(struct inode *i
  			*sd_attrs |= REISERFS_IMMUTABLE_FL;
  		else
  			*sd_attrs &= ~REISERFS_IMMUTABLE_FL;
@@ -7101,7 +6946,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs
  		if (inode->i_flags & S_SYNC)
  			*sd_attrs |= REISERFS_SYNC_FL;
  		else
-@@ -2910,6 +2940,15 @@ void i_attrs_to_sd_attrs(struct inode *i
+@@ -2904,6 +2934,15 @@ void i_attrs_to_sd_attrs(struct inode *i
  			*sd_attrs |= REISERFS_NOTAIL_FL;
  		else
  			*sd_attrs &= ~REISERFS_NOTAIL_FL;
@@ -7117,7 +6962,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs
  	}
  }
  
-@@ -3155,7 +3194,8 @@ int reiserfs_setattr(struct dentry *dent
+@@ -3149,7 +3188,8 @@ int reiserfs_setattr(struct dentry *dent
  	}
  
  	if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -7127,7 +6972,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs
  		struct reiserfs_transaction_handle th;
  		int jbegin_count =
  		    2 *
-@@ -3184,6 +3224,9 @@ int reiserfs_setattr(struct dentry *dent
+@@ -3178,6 +3218,9 @@ int reiserfs_setattr(struct dentry *dent
  			inode->i_uid = attr->ia_uid;
  		if (attr->ia_valid & ATTR_GID)
  			inode->i_gid = attr->ia_gid;
@@ -7137,9 +6982,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/inode.c linux-3.4.11-vs2.3.3.8/fs
  		mark_inode_dirty(inode);
  		error = journal_end(&th, inode->i_sb, jbegin_count);
  		if (error)
-diff -NurpP --minimal linux-3.4.11/fs/reiserfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/ioctl.c
---- linux-3.4.11/fs/reiserfs/ioctl.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/reiserfs/ioctl.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/ioctl.c
+--- linux-3.6/fs/reiserfs/ioctl.c	2012-05-21 18:07:27.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/ioctl.c	2012-10-04 18:47:00.000000000 +0200
 @@ -11,6 +11,21 @@
  #include <linux/pagemap.h>
  #include <linux/compat.h>
@@ -7201,9 +7046,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/ioctl.c linux-3.4.11-vs2.3.3.8/fs
  			sd_attrs_to_i_attrs(flags, inode);
  			REISERFS_I(inode)->i_attrs = flags;
  			inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.4.11/fs/reiserfs/namei.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/namei.c
---- linux-3.4.11/fs/reiserfs/namei.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/reiserfs/namei.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/namei.c
+--- linux-3.6/fs/reiserfs/namei.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/namei.c	2012-10-04 18:47:00.000000000 +0200
 @@ -18,6 +18,7 @@
  #include "acl.h"
  #include "xattr.h"
@@ -7220,10 +7065,10 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/namei.c linux-3.4.11-vs2.3.3.8/fs
  
  	return d_splice_alias(inode, dentry);
  }
-diff -NurpP --minimal linux-3.4.11/fs/reiserfs/reiserfs.h linux-3.4.11-vs2.3.3.8/fs/reiserfs/reiserfs.h
---- linux-3.4.11/fs/reiserfs/reiserfs.h	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/reiserfs/reiserfs.h	2012-05-21 19:19:33.000000000 +0200
-@@ -544,6 +544,7 @@ enum reiserfs_mount_options {
+diff -NurpP --minimal linux-3.6/fs/reiserfs/reiserfs.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/reiserfs.h
+--- linux-3.6/fs/reiserfs/reiserfs.h	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/reiserfs.h	2012-10-04 18:47:00.000000000 +0200
+@@ -549,6 +549,7 @@ enum reiserfs_mount_options {
  	REISERFS_EXPOSE_PRIVROOT,
  	REISERFS_BARRIER_NONE,
  	REISERFS_BARRIER_FLUSH,
@@ -7231,7 +7076,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/reiserfs.h linux-3.4.11-vs2.3.3.8
  
  	/* Actions on error */
  	REISERFS_ERROR_PANIC,
-@@ -1543,6 +1544,11 @@ struct stat_data_v1 {
+@@ -1548,6 +1549,11 @@ struct stat_data_v1 {
  #define REISERFS_COMPR_FL     FS_COMPR_FL
  #define REISERFS_NOTAIL_FL    FS_NOTAIL_FL
  
@@ -7243,7 +7088,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/reiserfs.h linux-3.4.11-vs2.3.3.8
  /* persistent flags that file inherits from the parent directory */
  #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL |	\
  				REISERFS_SYNC_FL |	\
-@@ -1552,6 +1558,9 @@ struct stat_data_v1 {
+@@ -1557,6 +1563,9 @@ struct stat_data_v1 {
  				REISERFS_COMPR_FL |	\
  				REISERFS_NOTAIL_FL )
  
@@ -7253,7 +7098,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/reiserfs.h linux-3.4.11-vs2.3.3.8
  /* Stat Data on disk (reiserfs version of UFS disk inode minus the
     address blocks) */
  struct stat_data {
-@@ -2641,6 +2650,7 @@ static inline void reiserfs_update_sd(st
+@@ -2647,6 +2656,7 @@ static inline void reiserfs_update_sd(st
  void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
  void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
  int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
@@ -7261,10 +7106,10 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/reiserfs.h linux-3.4.11-vs2.3.3.8
  
  int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
  
-diff -NurpP --minimal linux-3.4.11/fs/reiserfs/super.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/super.c
---- linux-3.4.11/fs/reiserfs/super.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/reiserfs/super.c	2012-05-21 18:15:05.000000000 +0200
-@@ -980,6 +980,14 @@ static int reiserfs_parse_options(struct
+diff -NurpP --minimal linux-3.6/fs/reiserfs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/super.c
+--- linux-3.6/fs/reiserfs/super.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/super.c	2012-10-04 18:47:00.000000000 +0200
+@@ -1018,6 +1018,14 @@ static int reiserfs_parse_options(struct
  		{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
  		{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
  #endif
@@ -7279,7 +7124,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/super.c linux-3.4.11-vs2.3.3.8/fs
  #ifdef CONFIG_REISERFS_FS_POSIX_ACL
  		{"acl",.setmask = 1 << REISERFS_POSIXACL},
  		{"noacl",.clrmask = 1 << REISERFS_POSIXACL},
-@@ -1298,6 +1306,14 @@ static int reiserfs_remount(struct super
+@@ -1336,6 +1344,14 @@ static int reiserfs_remount(struct super
  	handle_quota_files(s, qf_names, &qfmt);
  #endif
  
@@ -7294,7 +7139,7 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/super.c linux-3.4.11-vs2.3.3.8/fs
  	handle_attrs(s);
  
  	/* Add options that are safe here */
-@@ -1777,6 +1793,10 @@ static int reiserfs_fill_super(struct su
+@@ -1816,6 +1832,10 @@ static int reiserfs_fill_super(struct su
  		goto error_unlocked;
  	}
  
@@ -7305,9 +7150,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/super.c linux-3.4.11-vs2.3.3.8/fs
  	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.4.11/fs/reiserfs/xattr.c linux-3.4.11-vs2.3.3.8/fs/reiserfs/xattr.c
---- linux-3.4.11/fs/reiserfs/xattr.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/reiserfs/xattr.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/xattr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/xattr.c
+--- linux-3.6/fs/reiserfs/xattr.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/xattr.c	2012-10-04 18:47:00.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <linux/errno.h>
  #include <linux/gfp.h>
@@ -7316,9 +7161,9 @@ diff -NurpP --minimal linux-3.4.11/fs/reiserfs/xattr.c linux-3.4.11-vs2.3.3.8/fs
  #include <linux/file.h>
  #include <linux/pagemap.h>
  #include <linux/xattr.h>
-diff -NurpP --minimal linux-3.4.11/fs/stat.c linux-3.4.11-vs2.3.3.8/fs/stat.c
---- linux-3.4.11/fs/stat.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/stat.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/stat.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/stat.c
+--- linux-3.6/fs/stat.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/stat.c	2012-10-04 18:47:00.000000000 +0200
 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
  	stat->nlink = inode->i_nlink;
  	stat->uid = inode->i_uid;
@@ -7327,9 +7172,9 @@ diff -NurpP --minimal linux-3.4.11/fs/stat.c linux-3.4.11-vs2.3.3.8/fs/stat.c
  	stat->rdev = inode->i_rdev;
  	stat->size = i_size_read(inode);
  	stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.4.11/fs/statfs.c linux-3.4.11-vs2.3.3.8/fs/statfs.c
---- linux-3.4.11/fs/statfs.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/statfs.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/statfs.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/statfs.c
+--- linux-3.6/fs/statfs.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/statfs.c	2012-10-04 18:47:00.000000000 +0200
 @@ -7,6 +7,8 @@
  #include <linux/statfs.h>
  #include <linux/security.h>
@@ -7348,19 +7193,19 @@ diff -NurpP --minimal linux-3.4.11/fs/statfs.c linux-3.4.11-vs2.3.3.8/fs/statfs.
  	return retval;
  }
  
-diff -NurpP --minimal linux-3.4.11/fs/super.c linux-3.4.11-vs2.3.3.8/fs/super.c
---- linux-3.4.11/fs/super.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/super.c	2012-05-21 18:59:38.000000000 +0200
-@@ -33,6 +33,8 @@
- #include <linux/rculist_bl.h>
+diff -NurpP --minimal linux-3.6/fs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/super.c
+--- linux-3.6/fs/super.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/super.c	2012-10-04 19:06:05.000000000 +0200
+@@ -34,6 +34,8 @@
  #include <linux/cleancache.h>
  #include <linux/fsnotify.h>
+ #include <linux/lockdep.h>
 +#include <linux/magic.h>
 +#include <linux/vs_context.h>
  #include "internal.h"
  
  
-@@ -1138,6 +1140,13 @@ mount_fs(struct file_system_type *type, 
+@@ -1148,6 +1150,13 @@ mount_fs(struct file_system_type *type, 
  	WARN_ON(sb->s_bdi == &default_backing_dev_info);
  	sb->s_flags |= MS_BORN;
  
@@ -7374,9 +7219,9 @@ diff -NurpP --minimal linux-3.4.11/fs/super.c linux-3.4.11-vs2.3.3.8/fs/super.c
  	error = security_sb_kern_mount(sb, flags, secdata);
  	if (error)
  		goto out_sb;
-diff -NurpP --minimal linux-3.4.11/fs/sysfs/mount.c linux-3.4.11-vs2.3.3.8/fs/sysfs/mount.c
---- linux-3.4.11/fs/sysfs/mount.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/sysfs/mount.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/sysfs/mount.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/sysfs/mount.c
+--- linux-3.6/fs/sysfs/mount.c	2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/sysfs/mount.c	2012-10-04 18:47:00.000000000 +0200
 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
  
  	sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -7386,9 +7231,9 @@ diff -NurpP --minimal linux-3.4.11/fs/sysfs/mount.c linux-3.4.11-vs2.3.3.8/fs/sy
  	sb->s_op = &sysfs_ops;
  	sb->s_time_gran = 1;
  
-diff -NurpP --minimal linux-3.4.11/fs/utimes.c linux-3.4.11-vs2.3.3.8/fs/utimes.c
---- linux-3.4.11/fs/utimes.c	2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/utimes.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/utimes.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/utimes.c
+--- linux-3.6/fs/utimes.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/utimes.c	2012-10-04 18:47:00.000000000 +0200
 @@ -8,6 +8,8 @@
  #include <linux/stat.h>
  #include <linux/utime.h>
@@ -7418,9 +7263,9 @@ diff -NurpP --minimal linux-3.4.11/fs/utimes.c linux-3.4.11-vs2.3.3.8/fs/utimes.
  	if (times && times[0].tv_nsec == UTIME_NOW &&
  		     times[1].tv_nsec == UTIME_NOW)
  		times = NULL;
-diff -NurpP --minimal linux-3.4.11/fs/xattr.c linux-3.4.11-vs2.3.3.8/fs/xattr.c
---- linux-3.4.11/fs/xattr.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xattr.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xattr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xattr.c
+--- linux-3.6/fs/xattr.c	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xattr.c	2012-10-04 18:47:00.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/fsnotify.h>
  #include <linux/audit.h>
@@ -7438,9 +7283,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xattr.c linux-3.4.11-vs2.3.3.8/fs/xattr.c
  			return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
  		return 0;
  	}
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_dinode.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_dinode.h
---- linux-3.4.11/fs/xfs/xfs_dinode.h	2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_dinode.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_dinode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_dinode.h
+--- linux-3.6/fs/xfs/xfs_dinode.h	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_dinode.h	2012-10-04 18:47:00.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 */
@@ -7481,9 +7326,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_dinode.h linux-3.4.11-vs2.3.3.8/fs
 +#define XFS_DIVFLAG_COW		0x02
  
  #endif	/* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_fs.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_fs.h
---- linux-3.4.11/fs/xfs/xfs_fs.h	2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_fs.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_fs.h
+--- linux-3.6/fs/xfs/xfs_fs.h	2011-10-24 18:45:31.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_fs.h	2012-10-04 18:47:00.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 */
@@ -7504,9 +7349,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_fs.h linux-3.4.11-vs2.3.3.8/fs/xfs
  	__u32		bs_dmevmask;	/* DMIG event mask		*/
  	__u16		bs_dmstate;	/* DMIG state info		*/
  	__u16		bs_aextents;	/* attribute number of extents	*/
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ialloc.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_ialloc.c
---- linux-3.4.11/fs/xfs/xfs_ialloc.c	2012-03-19 19:47:27.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_ialloc.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_ialloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_ialloc.c
+--- linux-3.6/fs/xfs/xfs_ialloc.c	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_ialloc.c	2012-10-04 18:47:00.000000000 +0200
 @@ -37,7 +37,6 @@
  #include "xfs_error.h"
  #include "xfs_bmap.h"
@@ -7515,174 +7360,18 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ialloc.c linux-3.4.11-vs2.3.3.8/fs
  /*
   * Allocation group level functions.
   */
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_inode.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_inode.c
---- linux-3.4.11/fs/xfs/xfs_inode.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_inode.c	2012-05-21 18:15:05.000000000 +0200
-@@ -236,6 +236,7 @@ xfs_inotobp(
- 	return 0;
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_inode.c
+--- linux-3.6/fs/xfs/xfs_inode.c	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_inode.c	2012-10-04 18:47:00.000000000 +0200
+@@ -1833,6 +1833,7 @@ xfs_iroot_realloc(
+ 	return;
  }
  
 +#include <linux/vs_tag.h>
  
  /*
-  * This routine is called to map an inode to the buffer containing
-@@ -631,15 +632,25 @@ xfs_iformat_btree(
- STATIC void
- xfs_dinode_from_disk(
- 	xfs_icdinode_t		*to,
--	xfs_dinode_t		*from)
-+	xfs_dinode_t		*from,
-+	int tagged)
- {
-+	uint32_t uid, gid, tag;
-+
- 	to->di_magic = be16_to_cpu(from->di_magic);
- 	to->di_mode = be16_to_cpu(from->di_mode);
- 	to->di_version = from ->di_version;
- 	to->di_format = from->di_format;
- 	to->di_onlink = be16_to_cpu(from->di_onlink);
--	to->di_uid = be32_to_cpu(from->di_uid);
--	to->di_gid = be32_to_cpu(from->di_gid);
-+
-+	uid = be32_to_cpu(from->di_uid);
-+	gid = be32_to_cpu(from->di_gid);
-+	tag = be16_to_cpu(from->di_tag);
-+
-+	to->di_uid = INOTAG_UID(tagged, uid, gid);
-+	to->di_gid = INOTAG_GID(tagged, uid, gid);
-+	to->di_tag = INOTAG_TAG(tagged, uid, gid, tag);
-+
- 	to->di_nlink = be32_to_cpu(from->di_nlink);
- 	to->di_projid_lo = be16_to_cpu(from->di_projid_lo);
- 	to->di_projid_hi = be16_to_cpu(from->di_projid_hi);
-@@ -661,21 +672,26 @@ xfs_dinode_from_disk(
- 	to->di_dmevmask	= be32_to_cpu(from->di_dmevmask);
- 	to->di_dmstate	= be16_to_cpu(from->di_dmstate);
- 	to->di_flags	= be16_to_cpu(from->di_flags);
-+	to->di_vflags	= be16_to_cpu(from->di_vflags);
- 	to->di_gen	= be32_to_cpu(from->di_gen);
- }
- 
- void
- xfs_dinode_to_disk(
- 	xfs_dinode_t		*to,
--	xfs_icdinode_t		*from)
-+	xfs_icdinode_t		*from,
-+	int tagged)
- {
- 	to->di_magic = cpu_to_be16(from->di_magic);
- 	to->di_mode = cpu_to_be16(from->di_mode);
- 	to->di_version = from ->di_version;
- 	to->di_format = from->di_format;
- 	to->di_onlink = cpu_to_be16(from->di_onlink);
--	to->di_uid = cpu_to_be32(from->di_uid);
--	to->di_gid = cpu_to_be32(from->di_gid);
-+
-+	to->di_uid = cpu_to_be32(TAGINO_UID(tagged, from->di_uid, from->di_tag));
-+	to->di_gid = cpu_to_be32(TAGINO_GID(tagged, from->di_gid, from->di_tag));
-+	to->di_tag = cpu_to_be16(TAGINO_TAG(tagged, from->di_tag));
-+
- 	to->di_nlink = cpu_to_be32(from->di_nlink);
- 	to->di_projid_lo = cpu_to_be16(from->di_projid_lo);
- 	to->di_projid_hi = cpu_to_be16(from->di_projid_hi);
-@@ -697,12 +713,14 @@ xfs_dinode_to_disk(
- 	to->di_dmevmask = cpu_to_be32(from->di_dmevmask);
- 	to->di_dmstate = cpu_to_be16(from->di_dmstate);
- 	to->di_flags = cpu_to_be16(from->di_flags);
-+	to->di_vflags = cpu_to_be16(from->di_vflags);
- 	to->di_gen = cpu_to_be32(from->di_gen);
- }
- 
- STATIC uint
- _xfs_dic2xflags(
--	__uint16_t		di_flags)
-+	__uint16_t		di_flags,
-+	__uint16_t		di_vflags)
- {
- 	uint			flags = 0;
- 
-@@ -713,6 +731,8 @@ _xfs_dic2xflags(
- 			flags |= XFS_XFLAG_PREALLOC;
- 		if (di_flags & XFS_DIFLAG_IMMUTABLE)
- 			flags |= XFS_XFLAG_IMMUTABLE;
-+		if (di_flags & XFS_DIFLAG_IXUNLINK)
-+			flags |= XFS_XFLAG_IXUNLINK;
- 		if (di_flags & XFS_DIFLAG_APPEND)
- 			flags |= XFS_XFLAG_APPEND;
- 		if (di_flags & XFS_DIFLAG_SYNC)
-@@ -737,6 +757,10 @@ _xfs_dic2xflags(
- 			flags |= XFS_XFLAG_FILESTREAM;
- 	}
- 
-+	if (di_vflags & XFS_DIVFLAG_BARRIER)
-+		flags |= FS_BARRIER_FL;
-+	if (di_vflags & XFS_DIVFLAG_COW)
-+		flags |= FS_COW_FL;
- 	return flags;
- }
- 
-@@ -746,7 +770,7 @@ xfs_ip2xflags(
- {
- 	xfs_icdinode_t		*dic = &ip->i_d;
- 
--	return _xfs_dic2xflags(dic->di_flags) |
-+	return _xfs_dic2xflags(dic->di_flags, dic->di_vflags) |
- 				(XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0);
- }
- 
-@@ -754,7 +778,8 @@ uint
- xfs_dic2xflags(
- 	xfs_dinode_t		*dip)
- {
--	return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) |
-+	return _xfs_dic2xflags(be16_to_cpu(dip->di_flags),
-+				be16_to_cpu(dip->di_vflags)) |
- 				(XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
- }
- 
-@@ -787,7 +812,6 @@ xfs_iread(
- 	if (error)
- 		return error;
- 	dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset);
--
- 	/*
- 	 * If we got something that isn't an inode it means someone
- 	 * (nfs or dmi) has a stale handle.
-@@ -810,7 +834,8 @@ xfs_iread(
- 	 * Otherwise, just get the truly permanent information.
- 	 */
- 	if (dip->di_mode) {
--		xfs_dinode_from_disk(&ip->i_d, dip);
-+		xfs_dinode_from_disk(&ip->i_d, dip,
-+			mp->m_flags & XFS_MOUNT_TAGGED);
- 		error = xfs_iformat(ip, dip);
- 		if (error)  {
- #ifdef DEBUG
-@@ -998,6 +1023,7 @@ xfs_ialloc(
- 	ASSERT(ip->i_d.di_nlink == nlink);
- 	ip->i_d.di_uid = current_fsuid();
- 	ip->i_d.di_gid = current_fsgid();
-+	ip->i_d.di_tag = current_fstag(&ip->i_vnode);
- 	xfs_set_projid(ip, prid);
- 	memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
- 
-@@ -1057,6 +1083,7 @@ xfs_ialloc(
- 	ip->i_d.di_dmevmask = 0;
- 	ip->i_d.di_dmstate = 0;
- 	ip->i_d.di_flags = 0;
-+	ip->i_d.di_vflags = 0;
- 	flags = XFS_ILOG_CORE;
- 	switch (mode & S_IFMT) {
- 	case S_IFIFO:
-@@ -1725,6 +1752,7 @@ xfs_ifree(
- 	}
- 	ip->i_d.di_mode = 0;		/* mark incore inode as free */
- 	ip->i_d.di_flags = 0;
-+	ip->i_d.di_vflags = 0;
- 	ip->i_d.di_dmevmask = 0;
- 	ip->i_d.di_forkoff = 0;		/* mark the attr fork not in use */
- 	ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS;
-@@ -2598,7 +2626,8 @@ xfs_iflush_int(
+  * This is called when the amount of space needed for if_data
+@@ -2521,7 +2522,8 @@ xfs_iflush_int(
  	 * because if the inode is dirty at all the core must
  	 * be.
  	 */
@@ -7692,9 +7381,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_inode.c linux-3.4.11-vs2.3.3.8/fs/
  
  	/* 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.4.11/fs/xfs/xfs_inode.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_inode.h
---- linux-3.4.11/fs/xfs/xfs_inode.h	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_inode.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_inode.h
+--- linux-3.6/fs/xfs/xfs_inode.h	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_inode.h	2012-10-04 18:47:00.000000000 +0200
 @@ -134,7 +134,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 */
@@ -7706,7 +7395,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_inode.h linux-3.4.11-vs2.3.3.8/fs/
  	__uint16_t	di_flushiter;	/* incremented on flush */
  	xfs_ictimestamp_t di_atime;	/* time last accessed */
  	xfs_ictimestamp_t di_mtime;	/* time last modified */
-@@ -565,7 +567,7 @@ int		xfs_itobp(struct xfs_mount *, struc
+@@ -561,7 +563,7 @@ int		xfs_imap_to_bp(struct xfs_mount *, 
  int		xfs_iread(struct xfs_mount *, struct xfs_trans *,
  			  struct xfs_inode *, uint);
  void		xfs_dinode_to_disk(struct xfs_dinode *,
@@ -7715,10 +7404,10 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_inode.h linux-3.4.11-vs2.3.3.8/fs/
  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.4.11/fs/xfs/xfs_ioctl.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_ioctl.c
---- linux-3.4.11/fs/xfs/xfs_ioctl.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_ioctl.c	2012-05-21 18:15:05.000000000 +0200
-@@ -28,7 +28,7 @@
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_ioctl.c
+--- linux-3.6/fs/xfs/xfs_ioctl.c	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_ioctl.c	2012-10-04 18:47:00.000000000 +0200
+@@ -26,7 +26,7 @@
  #include "xfs_bmap_btree.h"
  #include "xfs_dinode.h"
  #include "xfs_inode.h"
@@ -7727,7 +7416,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.c linux-3.4.11-vs2.3.3.8/fs/
  #include "xfs_rtalloc.h"
  #include "xfs_itable.h"
  #include "xfs_error.h"
-@@ -750,6 +750,10 @@ xfs_merge_ioc_xflags(
+@@ -762,6 +762,10 @@ xfs_merge_ioc_xflags(
  		xflags |= XFS_XFLAG_IMMUTABLE;
  	else
  		xflags &= ~XFS_XFLAG_IMMUTABLE;
@@ -7738,7 +7427,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.c linux-3.4.11-vs2.3.3.8/fs/
  	if (flags & FS_APPEND_FL)
  		xflags |= XFS_XFLAG_APPEND;
  	else
-@@ -778,6 +782,8 @@ xfs_di2lxflags(
+@@ -790,6 +794,8 @@ xfs_di2lxflags(
  
  	if (di_flags & XFS_DIFLAG_IMMUTABLE)
  		flags |= FS_IMMUTABLE_FL;
@@ -7747,7 +7436,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.c linux-3.4.11-vs2.3.3.8/fs/
  	if (di_flags & XFS_DIFLAG_APPEND)
  		flags |= FS_APPEND_FL;
  	if (di_flags & XFS_DIFLAG_SYNC)
-@@ -838,6 +844,8 @@ xfs_set_diflags(
+@@ -850,6 +856,8 @@ xfs_set_diflags(
  	di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
  	if (xflags & XFS_XFLAG_IMMUTABLE)
  		di_flags |= XFS_DIFLAG_IMMUTABLE;
@@ -7756,7 +7445,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.c linux-3.4.11-vs2.3.3.8/fs/
  	if (xflags & XFS_XFLAG_APPEND)
  		di_flags |= XFS_DIFLAG_APPEND;
  	if (xflags & XFS_XFLAG_SYNC)
-@@ -880,6 +888,10 @@ xfs_diflags_to_linux(
+@@ -892,6 +900,10 @@ xfs_diflags_to_linux(
  		inode->i_flags |= S_IMMUTABLE;
  	else
  		inode->i_flags &= ~S_IMMUTABLE;
@@ -7767,7 +7456,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.c linux-3.4.11-vs2.3.3.8/fs/
  	if (xflags & XFS_XFLAG_APPEND)
  		inode->i_flags |= S_APPEND;
  	else
-@@ -1372,10 +1384,18 @@ xfs_file_ioctl(
+@@ -1396,10 +1408,18 @@ xfs_file_ioctl(
  	case XFS_IOC_FSGETXATTRA:
  		return xfs_ioc_fsgetxattr(ip, 1, arg);
  	case XFS_IOC_FSSETXATTR:
@@ -7786,9 +7475,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.c linux-3.4.11-vs2.3.3.8/fs/
  		return xfs_ioc_setxflags(ip, filp, arg);
  
  	case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_ioctl.h
---- linux-3.4.11/fs/xfs/xfs_ioctl.h	2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_ioctl.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_ioctl.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_ioctl.h
+--- linux-3.6/fs/xfs/xfs_ioctl.h	2011-10-24 18:45:31.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_ioctl.h	2012-10-04 18:47:00.000000000 +0200
 @@ -70,6 +70,12 @@ xfs_handle_to_dentry(
  	void __user		*uhandle,
  	u32			hlen);
@@ -7802,10 +7491,10 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_ioctl.h linux-3.4.11-vs2.3.3.8/fs/
  extern long
  xfs_file_ioctl(
  	struct file		*filp,
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_iops.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_iops.c
---- linux-3.4.11/fs/xfs/xfs_iops.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_iops.c	2012-05-21 18:15:05.000000000 +0200
-@@ -30,6 +30,7 @@
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_iops.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_iops.c
+--- linux-3.6/fs/xfs/xfs_iops.c	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_iops.c	2012-10-04 18:47:00.000000000 +0200
+@@ -28,6 +28,7 @@
  #include "xfs_bmap_btree.h"
  #include "xfs_dinode.h"
  #include "xfs_inode.h"
@@ -7813,7 +7502,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_iops.c linux-3.4.11-vs2.3.3.8/fs/x
  #include "xfs_bmap.h"
  #include "xfs_rtalloc.h"
  #include "xfs_error.h"
-@@ -49,6 +50,7 @@
+@@ -46,6 +47,7 @@
  #include <linux/security.h>
  #include <linux/fiemap.h>
  #include <linux/slab.h>
@@ -7821,7 +7510,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_iops.c linux-3.4.11-vs2.3.3.8/fs/x
  
  static int
  xfs_initxattrs(
-@@ -424,6 +426,7 @@ xfs_vn_getattr(
+@@ -421,6 +423,7 @@ xfs_vn_getattr(
  	stat->nlink = ip->i_d.di_nlink;
  	stat->uid = ip->i_d.di_uid;
  	stat->gid = ip->i_d.di_gid;
@@ -7829,23 +7518,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_iops.c linux-3.4.11-vs2.3.3.8/fs/x
  	stat->ino = ip->i_ino;
  	stat->atime = inode->i_atime;
  	stat->mtime = inode->i_mtime;
-@@ -996,6 +999,7 @@ static const struct inode_operations xfs
- 	.removexattr		= generic_removexattr,
- 	.listxattr		= xfs_vn_listxattr,
- 	.fiemap			= xfs_vn_fiemap,
-+	.sync_flags		= xfs_sync_flags,
- };
- 
- static const struct inode_operations xfs_dir_inode_operations = {
-@@ -1021,6 +1025,7 @@ static const struct inode_operations xfs
- 	.getxattr		= generic_getxattr,
- 	.removexattr		= generic_removexattr,
- 	.listxattr		= xfs_vn_listxattr,
-+	.sync_flags		= xfs_sync_flags,
- };
- 
- static const struct inode_operations xfs_dir_ci_inode_operations = {
-@@ -1070,6 +1075,10 @@ xfs_diflags_to_iflags(
+@@ -1110,6 +1113,10 @@ xfs_diflags_to_iflags(
  		inode->i_flags |= S_IMMUTABLE;
  	else
  		inode->i_flags &= ~S_IMMUTABLE;
@@ -7856,7 +7529,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_iops.c linux-3.4.11-vs2.3.3.8/fs/x
  	if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
  		inode->i_flags |= S_APPEND;
  	else
-@@ -1082,6 +1091,15 @@ xfs_diflags_to_iflags(
+@@ -1122,6 +1129,15 @@ xfs_diflags_to_iflags(
  		inode->i_flags |= S_NOATIME;
  	else
  		inode->i_flags &= ~S_NOATIME;
@@ -7872,7 +7545,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_iops.c linux-3.4.11-vs2.3.3.8/fs/x
  }
  
  /*
-@@ -1113,6 +1131,7 @@ xfs_setup_inode(
+@@ -1153,6 +1169,7 @@ xfs_setup_inode(
  	set_nlink(inode, ip->i_d.di_nlink);
  	inode->i_uid	= ip->i_d.di_uid;
  	inode->i_gid	= ip->i_d.di_gid;
@@ -7880,10 +7553,10 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_iops.c linux-3.4.11-vs2.3.3.8/fs/x
  
  	switch (inode->i_mode & S_IFMT) {
  	case S_IFBLK:
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_itable.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_itable.c
---- linux-3.4.11/fs/xfs/xfs_itable.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_itable.c	2012-05-21 18:15:05.000000000 +0200
-@@ -97,6 +97,7 @@ xfs_bulkstat_one_int(
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_itable.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_itable.c
+--- linux-3.6/fs/xfs/xfs_itable.c	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_itable.c	2012-10-04 18:47:00.000000000 +0200
+@@ -96,6 +96,7 @@ xfs_bulkstat_one_int(
  	buf->bs_mode = dic->di_mode;
  	buf->bs_uid = dic->di_uid;
  	buf->bs_gid = dic->di_gid;
@@ -7891,9 +7564,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_itable.c linux-3.4.11-vs2.3.3.8/fs
  	buf->bs_size = dic->di_size;
  	buf->bs_atime.tv_sec = dic->di_atime.t_sec;
  	buf->bs_atime.tv_nsec = dic->di_atime.t_nsec;
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_linux.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_linux.h
---- linux-3.4.11/fs/xfs/xfs_linux.h	2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_linux.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_linux.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_linux.h
+--- linux-3.6/fs/xfs/xfs_linux.h	2011-10-24 18:45:31.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_linux.h	2012-10-04 18:47:00.000000000 +0200
 @@ -121,6 +121,7 @@
  
  #define current_cpu()		(raw_smp_processor_id())
@@ -7902,10 +7575,10 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_linux.h linux-3.4.11-vs2.3.3.8/fs/
  #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.4.11/fs/xfs/xfs_log_recover.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_log_recover.c
---- linux-3.4.11/fs/xfs/xfs_log_recover.c	2012-05-21 18:07:28.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_log_recover.c	2012-05-21 18:15:05.000000000 +0200
-@@ -2344,7 +2344,8 @@ xlog_recover_inode_pass2(
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_log_recover.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_log_recover.c
+--- linux-3.6/fs/xfs/xfs_log_recover.c	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_log_recover.c	2012-10-04 18:47:00.000000000 +0200
+@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2(
  	}
  
  	/* The core is in in-core format */
@@ -7915,9 +7588,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_log_recover.c linux-3.4.11-vs2.3.3
  
  	/* the rest is in on-disk format */
  	if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_mount.h linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_mount.h
---- linux-3.4.11/fs/xfs/xfs_mount.h	2012-05-21 18:07:28.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_mount.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_mount.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_mount.h
+--- linux-3.6/fs/xfs/xfs_mount.h	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_mount.h	2012-10-04 18:47:00.000000000 +0200
 @@ -251,6 +251,7 @@ typedef struct xfs_mount {
  						   allocator */
  #define XFS_MOUNT_NOATTR2	(1ULL << 25)	/* disable use of attr2 format */
@@ -7926,10 +7599,10 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_mount.h linux-3.4.11-vs2.3.3.8/fs/
  
  /*
   * Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_super.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_super.c
---- linux-3.4.11/fs/xfs/xfs_super.c	2012-05-21 18:07:28.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_super.c	2012-05-21 18:15:05.000000000 +0200
-@@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool;
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_super.c
+--- linux-3.6/fs/xfs/xfs_super.c	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_super.c	2012-10-04 18:47:00.000000000 +0200
+@@ -112,6 +112,9 @@ mempool_t *xfs_ioend_pool;
  #define MNTOPT_NODELAYLOG  "nodelaylog"	/* Delayed logging disabled */
  #define MNTOPT_DISCARD	   "discard"	/* Discard unused blocks */
  #define MNTOPT_NODISCARD   "nodiscard"	/* Do not discard unused blocks */
@@ -7939,7 +7612,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_super.c linux-3.4.11-vs2.3.3.8/fs/
  
  /*
   * Table driven mount option parser.
-@@ -121,10 +124,14 @@ mempool_t *xfs_ioend_pool;
+@@ -120,10 +123,14 @@ mempool_t *xfs_ioend_pool;
   * in the future, too.
   */
  enum {
@@ -7954,7 +7627,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_super.c linux-3.4.11-vs2.3.3.8/fs/
  	{Opt_barrier, "barrier"},
  	{Opt_nobarrier, "nobarrier"},
  	{Opt_err, NULL}
-@@ -372,6 +379,19 @@ xfs_parseargs(
+@@ -371,6 +378,19 @@ xfs_parseargs(
  		} else if (!strcmp(this_char, "irixsgid")) {
  			xfs_warn(mp,
  	"irixsgid is now a sysctl(2) variable, option is deprecated.");
@@ -7974,7 +7647,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_super.c linux-3.4.11-vs2.3.3.8/fs/
  		} else {
  			xfs_warn(mp, "unknown mount option [%s].", this_char);
  			return EINVAL;
-@@ -1127,6 +1147,16 @@ xfs_fs_remount(
+@@ -1056,6 +1076,16 @@ xfs_fs_remount(
  		case Opt_nobarrier:
  			mp->m_flags &= ~XFS_MOUNT_BARRIER;
  			break;
@@ -7991,7 +7664,7 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_super.c linux-3.4.11-vs2.3.3.8/fs/
  		default:
  			/*
  			 * Logically we would return an error here to prevent
-@@ -1346,6 +1376,9 @@ xfs_fs_fill_super(
+@@ -1275,6 +1305,9 @@ xfs_fs_fill_super(
  	if (error)
  		goto out_free_sb;
  
@@ -8001,10 +7674,10 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_super.c linux-3.4.11-vs2.3.3.8/fs/
  	/*
  	 * 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.4.11/fs/xfs/xfs_vnodeops.c linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_vnodeops.c
---- linux-3.4.11/fs/xfs/xfs_vnodeops.c	2012-05-21 18:07:28.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/fs/xfs/xfs_vnodeops.c	2012-05-21 18:15:05.000000000 +0200
-@@ -106,6 +106,77 @@ xfs_readlink_bmap(
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_vnodeops.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_vnodeops.c
+--- linux-3.6/fs/xfs/xfs_vnodeops.c	2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_vnodeops.c	2012-10-04 18:47:00.000000000 +0200
+@@ -103,6 +103,77 @@ xfs_readlink_bmap(
  	return error;
  }
  
@@ -8082,9 +7755,9 @@ diff -NurpP --minimal linux-3.4.11/fs/xfs/xfs_vnodeops.c linux-3.4.11-vs2.3.3.8/
  int
  xfs_readlink(
  	xfs_inode_t     *ip,
-diff -NurpP --minimal linux-3.4.11/include/linux/Kbuild linux-3.4.11-vs2.3.3.8/include/linux/Kbuild
---- linux-3.4.11/include/linux/Kbuild	2012-09-16 20:46:16.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/Kbuild	2012-07-24 11:52:30.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/Kbuild linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/Kbuild
+--- linux-3.6/include/linux/Kbuild	2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/Kbuild	2012-10-04 18:47:00.000000000 +0200
 @@ -18,6 +18,7 @@ header-y += netfilter_bridge/
  header-y += netfilter_ipv4/
  header-y += netfilter_ipv6/
@@ -8093,9 +7766,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/Kbuild linux-3.4.11-vs2.3.3.8/i
  header-y += wimax/
  
  objhdr-y += version.h
-diff -NurpP --minimal linux-3.4.11/include/linux/capability.h linux-3.4.11-vs2.3.3.8/include/linux/capability.h
---- linux-3.4.11/include/linux/capability.h	2012-03-19 19:47:27.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/capability.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/capability.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/capability.h
+--- linux-3.6/include/linux/capability.h	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/capability.h	2012-10-04 18:47:00.000000000 +0200
 @@ -280,6 +280,7 @@ struct cpu_vfs_cap_data {
     arbitrary SCSI commands */
  /* Allow setting encryption key on loopback filesystem */
@@ -8104,9 +7777,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/capability.h linux-3.4.11-vs2.3
  
  #define CAP_SYS_ADMIN        21
  
-@@ -363,7 +364,12 @@ struct cpu_vfs_cap_data {
+@@ -366,7 +367,12 @@ struct cpu_vfs_cap_data {
  
- #define CAP_LAST_CAP         CAP_WAKE_ALARM
+ #define CAP_LAST_CAP         CAP_BLOCK_SUSPEND
  
 -#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
 +/* Allow context manipulations */
@@ -8118,10 +7791,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/capability.h linux-3.4.11-vs2.3
  
  /*
   * Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.4.11/include/linux/cred.h linux-3.4.11-vs2.3.3.8/include/linux/cred.h
---- linux-3.4.11/include/linux/cred.h	2012-03-19 19:47:27.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/cred.h	2012-05-21 18:15:05.000000000 +0200
-@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
+diff -NurpP --minimal linux-3.6/include/linux/cred.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/cred.h
+--- linux-3.6/include/linux/cred.h	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/cred.h	2012-10-04 18:47:00.000000000 +0200
+@@ -157,6 +157,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 *);
  extern struct cred *cred_alloc_blank(void);
@@ -8129,7 +7802,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/cred.h linux-3.4.11-vs2.3.3.8/i
  extern struct cred *prepare_creds(void);
  extern struct cred *prepare_exec_creds(void);
  extern int commit_creds(struct cred *);
-@@ -209,6 +210,31 @@ static inline void validate_process_cred
+@@ -210,6 +211,31 @@ static inline void validate_process_cred
  }
  #endif
  
@@ -8161,19 +7834,19 @@ diff -NurpP --minimal linux-3.4.11/include/linux/cred.h linux-3.4.11-vs2.3.3.8/i
  /**
   * get_new_cred - Get a reference on a new set of credentials
   * @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.4.11/include/linux/devpts_fs.h linux-3.4.11-vs2.3.3.8/include/linux/devpts_fs.h
---- linux-3.4.11/include/linux/devpts_fs.h	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/devpts_fs.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/devpts_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/devpts_fs.h
+--- linux-3.6/include/linux/devpts_fs.h	2008-12-25 00:26:37.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/devpts_fs.h	2012-10-04 18:47:00.000000000 +0200
 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
  
  #endif
  
 -
  #endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/include/linux/fs.h
---- linux-3.4.11/include/linux/fs.h	2012-05-21 18:07:29.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/fs.h	2012-05-21 18:15:05.000000000 +0200
-@@ -214,6 +214,9 @@ struct inodes_stat_t {
+diff -NurpP --minimal linux-3.6/include/linux/fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/fs.h
+--- linux-3.6/include/linux/fs.h	2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/fs.h	2012-10-04 18:47:00.000000000 +0200
+@@ -225,6 +225,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 */
  #define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
@@ -8183,7 +7856,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  #define MS_NOSEC	(1<<28)
  #define MS_BORN		(1<<29)
  #define MS_ACTIVE	(1<<30)
-@@ -245,6 +248,14 @@ struct inodes_stat_t {
+@@ -256,6 +259,14 @@ struct inodes_stat_t {
  #define S_IMA		1024	/* Inode has an associated IMA struct */
  #define S_AUTOMOUNT	2048	/* Automount/referral quasi-directory */
  #define S_NOSEC		4096	/* no suid or xattr security attributes */
@@ -8198,7 +7871,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  
  /*
   * Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -267,12 +278,15 @@ struct inodes_stat_t {
+@@ -278,12 +289,15 @@ struct inodes_stat_t {
  #define IS_DIRSYNC(inode)	(__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
  					((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
  #define IS_MANDLOCK(inode)	__IS_FLG(inode, MS_MANDLOCK)
@@ -8216,7 +7889,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  #define IS_POSIXACL(inode)	__IS_FLG(inode, MS_POSIXACL)
  
  #define IS_DEADDIR(inode)	((inode)->i_flags & S_DEAD)
-@@ -283,6 +297,16 @@ struct inodes_stat_t {
+@@ -294,6 +308,16 @@ struct inodes_stat_t {
  #define IS_AUTOMOUNT(inode)	((inode)->i_flags & S_AUTOMOUNT)
  #define IS_NOSEC(inode)		((inode)->i_flags & S_NOSEC)
  
@@ -8233,7 +7906,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  /* the read-only stuff doesn't really belong here, but any other place is
     probably as bad and I don't want to create yet another include file. */
  
-@@ -369,11 +393,14 @@ struct inodes_stat_t {
+@@ -380,11 +404,14 @@ struct inodes_stat_t {
  #define FS_EXTENT_FL			0x00080000 /* Extents */
  #define FS_DIRECTIO_FL			0x00100000 /* Use direct i/o */
  #define FS_NOCOW_FL			0x00800000 /* Do not cow file */
@@ -8250,7 +7923,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  
  #define SYNC_FILE_RANGE_WAIT_BEFORE	1
  #define SYNC_FILE_RANGE_WRITE		2
-@@ -456,6 +483,7 @@ typedef void (dio_iodone_t)(struct kiocb
+@@ -472,6 +499,7 @@ typedef void (dio_iodone_t)(struct kiocb
  #define ATTR_KILL_PRIV	(1 << 14)
  #define ATTR_OPEN	(1 << 15) /* Truncating from open(O_TRUNC) */
  #define ATTR_TIMES_SET	(1 << 16)
@@ -8258,15 +7931,15 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
-@@ -471,6 +499,7 @@ struct iattr {
+@@ -487,6 +515,7 @@ struct iattr {
  	umode_t		ia_mode;
- 	uid_t		ia_uid;
- 	gid_t		ia_gid;
+ 	kuid_t		ia_uid;
+ 	kgid_t		ia_gid;
 +	tag_t		ia_tag;
  	loff_t		ia_size;
  	struct timespec	ia_atime;
  	struct timespec	ia_mtime;
-@@ -484,6 +513,9 @@ struct iattr {
+@@ -500,6 +529,9 @@ struct iattr {
  	struct file	*ia_file;
  };
  
@@ -8276,10 +7949,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  /*
   * Includes for diskquotas.
   */
-@@ -763,7 +795,9 @@ struct inode {
+@@ -784,7 +816,9 @@ struct inode {
  	unsigned short		i_opflags;
- 	uid_t			i_uid;
- 	gid_t			i_gid;
+ 	kuid_t			i_uid;
+ 	kgid_t			i_gid;
 -	unsigned int		i_flags;
 +	tag_t			i_tag;
 +	unsigned short		i_flags;
@@ -8287,15 +7960,15 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  
  #ifdef CONFIG_FS_POSIX_ACL
  	struct posix_acl	*i_acl;
-@@ -792,6 +826,7 @@ struct inode {
+@@ -813,6 +847,7 @@ struct inode {
  		unsigned int __i_nlink;
  	};
  	dev_t			i_rdev;
 +	dev_t			i_mdev;
+ 	loff_t			i_size;
  	struct timespec		i_atime;
  	struct timespec		i_mtime;
- 	struct timespec		i_ctime;
-@@ -929,12 +964,12 @@ static inline void i_size_write(struct i
+@@ -975,12 +1010,12 @@ static inline void i_gid_write(struct in
  
  static inline unsigned iminor(const struct inode *inode)
  {
@@ -8310,7 +7983,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  }
  
  extern struct block_device *I_BDEV(struct inode *inode);
-@@ -1001,6 +1036,7 @@ struct file {
+@@ -1047,6 +1082,7 @@ struct file {
  	loff_t			f_pos;
  	struct fown_struct	f_owner;
  	const struct cred	*f_cred;
@@ -8318,7 +7991,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  	struct file_ra_state	f_ra;
  
  	u64			f_version;
-@@ -1148,6 +1184,7 @@ struct file_lock {
+@@ -1194,6 +1230,7 @@ struct file_lock {
  	struct file *fl_file;
  	loff_t fl_start;
  	loff_t fl_end;
@@ -8326,15 +7999,15 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  
  	struct fasync_struct *	fl_fasync; /* for lease break notifications */
  	/* for lease breaks: */
-@@ -1661,6 +1698,7 @@ struct inode_operations {
+@@ -1829,6 +1866,7 @@ struct inode_operations {
  	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
  	ssize_t (*listxattr) (struct dentry *, char *, size_t);
  	int (*removexattr) (struct dentry *, const char *);
 +	int (*sync_flags) (struct inode *, int, int);
- 	void (*truncate_range)(struct inode *, loff_t, loff_t);
  	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
  		      u64 len);
-@@ -1680,6 +1718,7 @@ extern ssize_t vfs_readv(struct file *, 
+ 	int (*update_time)(struct inode *, struct timespec *, int);
+@@ -1850,6 +1888,7 @@ extern ssize_t vfs_readv(struct file *, 
  		unsigned long, loff_t *);
  extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
  		unsigned long, loff_t *);
@@ -8342,7 +8015,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  
  struct super_operations {
     	struct inode *(*alloc_inode)(struct super_block *sb);
-@@ -2509,6 +2548,7 @@ extern int dcache_dir_open(struct inode 
+@@ -2692,6 +2731,7 @@ extern int dcache_dir_open(struct inode 
  extern int dcache_dir_close(struct inode *, struct file *);
  extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
  extern int dcache_readdir(struct file *, void *, filldir_t);
@@ -8350,32 +8023,32 @@ diff -NurpP --minimal linux-3.4.11/include/linux/fs.h linux-3.4.11-vs2.3.3.8/inc
  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.4.11/include/linux/gfs2_ondisk.h linux-3.4.11-vs2.3.3.8/include/linux/gfs2_ondisk.h
---- linux-3.4.11/include/linux/gfs2_ondisk.h	2012-05-21 18:07:29.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/gfs2_ondisk.h	2012-05-21 18:15:05.000000000 +0200
-@@ -214,6 +214,9 @@ enum {
- 	gfs2fl_NoAtime		= 7,
+diff -NurpP --minimal linux-3.6/include/linux/gfs2_ondisk.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/gfs2_ondisk.h
+--- linux-3.6/include/linux/gfs2_ondisk.h	2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/gfs2_ondisk.h	2012-10-04 18:54:29.000000000 +0200
+@@ -225,6 +225,9 @@ enum {
  	gfs2fl_Sync		= 8,
  	gfs2fl_System		= 9,
+ 	gfs2fl_TopLevel		= 10,
 +	gfs2fl_IXUnlink		= 16,
 +	gfs2fl_Barrier		= 17,
 +	gfs2fl_Cow		= 18,
  	gfs2fl_TruncInProg	= 29,
  	gfs2fl_InheritDirectio	= 30,
  	gfs2fl_InheritJdata	= 31,
-@@ -230,6 +233,9 @@ enum {
- #define GFS2_DIF_NOATIME		0x00000080
+@@ -242,6 +245,9 @@ enum {
  #define GFS2_DIF_SYNC			0x00000100
  #define GFS2_DIF_SYSTEM			0x00000200 /* New in gfs2 */
+ #define GFS2_DIF_TOPDIR			0x00000400 /* New in gfs2 */
 +#define GFS2_DIF_IXUNLINK		0x00010000
 +#define GFS2_DIF_BARRIER		0x00020000
 +#define GFS2_DIF_COW			0x00040000
  #define GFS2_DIF_TRUNC_IN_PROG		0x20000000 /* New in gfs2 */
- #define GFS2_DIF_INHERIT_DIRECTIO	0x40000000
+ #define GFS2_DIF_INHERIT_DIRECTIO	0x40000000 /* only in gfs1 */
  #define GFS2_DIF_INHERIT_JDATA		0x80000000
-diff -NurpP --minimal linux-3.4.11/include/linux/if_tun.h linux-3.4.11-vs2.3.3.8/include/linux/if_tun.h
---- linux-3.4.11/include/linux/if_tun.h	2010-08-02 16:52:54.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/if_tun.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/if_tun.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/if_tun.h
+--- linux-3.6/include/linux/if_tun.h	2010-08-02 16:52:54.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/if_tun.h	2012-10-04 18:47:00.000000000 +0200
 @@ -53,6 +53,7 @@
  #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
  #define TUNGETVNETHDRSZ _IOR('T', 215, int)
@@ -8384,10 +8057,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/if_tun.h linux-3.4.11-vs2.3.3.8
  
  /* TUNSETIFF ifr flags */
  #define IFF_TUN		0x0001
-diff -NurpP --minimal linux-3.4.11/include/linux/init_task.h linux-3.4.11-vs2.3.3.8/include/linux/init_task.h
---- linux-3.4.11/include/linux/init_task.h	2012-05-21 18:07:29.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/init_task.h	2012-05-21 18:15:05.000000000 +0200
-@@ -200,6 +200,10 @@ extern struct cred init_cred;
+diff -NurpP --minimal linux-3.6/include/linux/init_task.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/init_task.h
+--- linux-3.6/include/linux/init_task.h	2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/init_task.h	2012-10-04 18:47:00.000000000 +0200
+@@ -210,6 +210,10 @@ extern struct task_group root_task_group
  	INIT_TRACE_RECURSION						\
  	INIT_TASK_RCU_PREEMPT(tsk)					\
  	INIT_CPUSET_SEQ							\
@@ -8398,9 +8071,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/init_task.h linux-3.4.11-vs2.3.
  }
  
  
-diff -NurpP --minimal linux-3.4.11/include/linux/ipc.h linux-3.4.11-vs2.3.3.8/include/linux/ipc.h
---- linux-3.4.11/include/linux/ipc.h	2012-03-19 19:47:28.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/ipc.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/ipc.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/ipc.h
+--- linux-3.6/include/linux/ipc.h	2012-03-19 19:47:28.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/ipc.h	2012-10-04 18:47:00.000000000 +0200
 @@ -91,6 +91,7 @@ struct kern_ipc_perm
  	key_t		key;
  	uid_t		uid;
@@ -8409,10 +8082,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/ipc.h linux-3.4.11-vs2.3.3.8/in
  	uid_t		cuid;
  	gid_t		cgid;
  	umode_t		mode; 
-diff -NurpP --minimal linux-3.4.11/include/linux/ipc_namespace.h linux-3.4.11-vs2.3.3.8/include/linux/ipc_namespace.h
---- linux-3.4.11/include/linux/ipc_namespace.h	2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/ipc_namespace.h	2012-05-21 18:15:05.000000000 +0200
-@@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_
+diff -NurpP --minimal linux-3.6/include/linux/ipc_namespace.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/ipc_namespace.h
+--- linux-3.6/include/linux/ipc_namespace.h	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/ipc_namespace.h	2012-10-04 18:47:00.000000000 +0200
+@@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_
  
  #if defined(CONFIG_IPC_NS)
  extern struct ipc_namespace *copy_ipcs(unsigned long flags,
@@ -8422,7 +8095,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/ipc_namespace.h linux-3.4.11-vs
  static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
  {
  	if (ns)
-@@ -112,12 +113,13 @@ static inline struct ipc_namespace *get_
+@@ -144,12 +145,13 @@ static inline struct ipc_namespace *get_
  extern void put_ipc_ns(struct ipc_namespace *ns);
  #else
  static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
@@ -8438,9 +8111,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/ipc_namespace.h linux-3.4.11-vs
  }
  
  static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.4.11/include/linux/loop.h linux-3.4.11-vs2.3.3.8/include/linux/loop.h
---- linux-3.4.11/include/linux/loop.h	2012-01-09 16:14:58.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/loop.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/loop.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/loop.h
+--- linux-3.6/include/linux/loop.h	2012-01-09 16:14:58.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/loop.h	2012-10-04 18:47:00.000000000 +0200
 @@ -45,6 +45,7 @@ struct loop_device {
  	struct loop_func_table *lo_encryption;
  	__u32           lo_init[2];
@@ -8449,9 +8122,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/loop.h linux-3.4.11-vs2.3.3.8/i
  	int		(*ioctl)(struct loop_device *, int cmd, 
  				 unsigned long arg); 
  
-diff -NurpP --minimal linux-3.4.11/include/linux/magic.h linux-3.4.11-vs2.3.3.8/include/linux/magic.h
---- linux-3.4.11/include/linux/magic.h	2012-05-21 18:07:31.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/magic.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/magic.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/magic.h
+--- linux-3.6/include/linux/magic.h	2012-05-21 18:07:31.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/magic.h	2012-10-04 18:47:00.000000000 +0200
 @@ -3,7 +3,7 @@
  
  #define ADFS_SUPER_MAGIC	0xadf5
@@ -8461,9 +8134,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/magic.h linux-3.4.11-vs2.3.3.8/
  #define AUTOFS_SUPER_MAGIC	0x0187
  #define CODA_SUPER_MAGIC	0x73757245
  #define CRAMFS_MAGIC		0x28cd3d45	/* some random number */
-diff -NurpP --minimal linux-3.4.11/include/linux/major.h linux-3.4.11-vs2.3.3.8/include/linux/major.h
---- linux-3.4.11/include/linux/major.h	2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/major.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/major.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/major.h
+--- linux-3.6/include/linux/major.h	2009-09-10 15:26:25.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/major.h	2012-10-04 18:47:00.000000000 +0200
 @@ -15,6 +15,7 @@
  #define HD_MAJOR		IDE0_MAJOR
  #define PTY_SLAVE_MAJOR		3
@@ -8472,10 +8145,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/major.h linux-3.4.11-vs2.3.3.8/
  #define TTYAUX_MAJOR		5
  #define LP_MAJOR		6
  #define VCS_MAJOR		7
-diff -NurpP --minimal linux-3.4.11/include/linux/memcontrol.h linux-3.4.11-vs2.3.3.8/include/linux/memcontrol.h
---- linux-3.4.11/include/linux/memcontrol.h	2012-05-21 18:07:31.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/memcontrol.h	2012-05-21 18:15:05.000000000 +0200
-@@ -88,6 +88,13 @@ extern struct mem_cgroup *try_get_mem_cg
+diff -NurpP --minimal linux-3.6/include/linux/memcontrol.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/memcontrol.h
+--- linux-3.6/include/linux/memcontrol.h	2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/memcontrol.h	2012-10-04 18:47:00.000000000 +0200
+@@ -83,6 +83,13 @@ extern struct mem_cgroup *try_get_mem_cg
  extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
  extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
  
@@ -8489,21 +8162,21 @@ diff -NurpP --minimal linux-3.4.11/include/linux/memcontrol.h linux-3.4.11-vs2.3
  static inline
  int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
  {
-diff -NurpP --minimal linux-3.4.11/include/linux/mm_types.h linux-3.4.11-vs2.3.3.8/include/linux/mm_types.h
---- linux-3.4.11/include/linux/mm_types.h	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/mm_types.h	2012-07-18 00:29:43.000000000 +0200
-@@ -353,6 +353,7 @@ struct mm_struct {
+diff -NurpP --minimal linux-3.6/include/linux/mm_types.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mm_types.h
+--- linux-3.6/include/linux/mm_types.h	2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mm_types.h	2012-10-04 18:47:00.000000000 +0200
+@@ -370,6 +370,7 @@ struct mm_struct {
  
  	/* Architecture-specific MM context */
  	mm_context_t context;
 +	struct vx_info *mm_vx_info;
  
- 	/* Swap token stuff */
- 	/*
-diff -NurpP --minimal linux-3.4.11/include/linux/mmzone.h linux-3.4.11-vs2.3.3.8/include/linux/mmzone.h
---- linux-3.4.11/include/linux/mmzone.h	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/mmzone.h	2012-07-18 00:29:43.000000000 +0200
-@@ -684,6 +684,13 @@ typedef struct pglist_data {
+ 	unsigned long flags; /* Must use atomic bitops to access the bits */
+ 
+diff -NurpP --minimal linux-3.6/include/linux/mmzone.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mmzone.h
+--- linux-3.6/include/linux/mmzone.h	2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mmzone.h	2012-10-04 18:47:00.000000000 +0200
+@@ -727,6 +727,13 @@ typedef struct pglist_data {
  	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
  })
  
@@ -8517,9 +8190,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/mmzone.h linux-3.4.11-vs2.3.3.8
  #include <linux/memory_hotplug.h>
  
  extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.4.11/include/linux/mount.h linux-3.4.11-vs2.3.3.8/include/linux/mount.h
---- linux-3.4.11/include/linux/mount.h	2012-03-19 19:47:28.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/mount.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/mount.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mount.h
+--- linux-3.6/include/linux/mount.h	2012-03-19 19:47:28.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mount.h	2012-10-04 18:47:00.000000000 +0200
 @@ -47,6 +47,9 @@ struct mnt_namespace;
  
  #define MNT_INTERNAL	0x4000
@@ -8530,9 +8203,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/mount.h linux-3.4.11-vs2.3.3.8/
  struct vfsmount {
  	struct dentry *mnt_root;	/* root of the mounted tree */
  	struct super_block *mnt_sb;	/* pointer to superblock */
-diff -NurpP --minimal linux-3.4.11/include/linux/net.h linux-3.4.11-vs2.3.3.8/include/linux/net.h
---- linux-3.4.11/include/linux/net.h	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/net.h	2012-09-01 10:51:18.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/net.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/net.h
+--- linux-3.6/include/linux/net.h	2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/net.h	2012-10-04 18:47:00.000000000 +0200
 @@ -73,6 +73,7 @@ struct net;
  #define SOCK_PASSCRED		3
  #define SOCK_PASSSEC		4
@@ -8541,10 +8214,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/net.h linux-3.4.11-vs2.3.3.8/in
  
  #ifndef ARCH_HAS_SOCKET_TYPES
  /**
-diff -NurpP --minimal linux-3.4.11/include/linux/netdevice.h linux-3.4.11-vs2.3.3.8/include/linux/netdevice.h
---- linux-3.4.11/include/linux/netdevice.h	2012-05-21 18:07:31.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/netdevice.h	2012-05-21 18:15:05.000000000 +0200
-@@ -1620,6 +1620,7 @@ extern void		netdev_resync_ops(struct ne
+diff -NurpP --minimal linux-3.6/include/linux/netdevice.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/netdevice.h
+--- linux-3.6/include/linux/netdevice.h	2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/netdevice.h	2012-10-04 18:47:00.000000000 +0200
+@@ -1651,6 +1651,7 @@ extern void		netdev_resync_ops(struct ne
  
  extern struct net_device	*dev_get_by_index(struct net *net, int ifindex);
  extern struct net_device	*__dev_get_by_index(struct net *net, int ifindex);
@@ -8552,9 +8225,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/netdevice.h linux-3.4.11-vs2.3.
  extern struct net_device	*dev_get_by_index_rcu(struct net *net, int ifindex);
  extern int		dev_restart(struct net_device *dev);
  #ifdef CONFIG_NETPOLL_TRAP
-diff -NurpP --minimal linux-3.4.11/include/linux/nfs_mount.h linux-3.4.11-vs2.3.3.8/include/linux/nfs_mount.h
---- linux-3.4.11/include/linux/nfs_mount.h	2011-01-05 21:50:31.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/nfs_mount.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/nfs_mount.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/nfs_mount.h
+--- linux-3.6/include/linux/nfs_mount.h	2011-01-05 21:50:31.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/nfs_mount.h	2012-10-04 18:47:00.000000000 +0200
 @@ -63,7 +63,8 @@ struct nfs_mount_data {
  #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
  #define NFS_MOUNT_NORDIRPLUS	0x4000	/* 5 */
@@ -8565,9 +8238,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/nfs_mount.h linux-3.4.11-vs2.3.
  
  /* The following are for internal use only */
  #define NFS_MOUNT_LOOKUP_CACHE_NONEG	0x10000
-diff -NurpP --minimal linux-3.4.11/include/linux/nsproxy.h linux-3.4.11-vs2.3.3.8/include/linux/nsproxy.h
---- linux-3.4.11/include/linux/nsproxy.h	2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/nsproxy.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/nsproxy.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/nsproxy.h
+--- linux-3.6/include/linux/nsproxy.h	2011-10-24 18:45:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/nsproxy.h	2012-10-04 18:47:00.000000000 +0200
 @@ -3,6 +3,7 @@
  
  #include <linux/spinlock.h>
@@ -8617,9 +8290,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/nsproxy.h linux-3.4.11-vs2.3.3.
  }
  
  #endif
-diff -NurpP --minimal linux-3.4.11/include/linux/pid.h linux-3.4.11-vs2.3.3.8/include/linux/pid.h
---- linux-3.4.11/include/linux/pid.h	2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/pid.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/pid.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/pid.h
+--- linux-3.6/include/linux/pid.h	2011-07-22 11:18:11.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/pid.h	2012-10-04 18:47:00.000000000 +0200
 @@ -8,7 +8,8 @@ enum pid_type
  	PIDTYPE_PID,
  	PIDTYPE_PGID,
@@ -8638,13 +8311,13 @@ diff -NurpP --minimal linux-3.4.11/include/linux/pid.h linux-3.4.11-vs2.3.3.8/in
  pid_t pid_vnr(struct pid *pid);
  
  #define do_each_pid_task(pid, type, task)				\
-diff -NurpP --minimal linux-3.4.11/include/linux/proc_fs.h linux-3.4.11-vs2.3.3.8/include/linux/proc_fs.h
---- linux-3.4.11/include/linux/proc_fs.h	2012-03-19 19:47:28.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/proc_fs.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/proc_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/proc_fs.h
+--- linux-3.6/include/linux/proc_fs.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/proc_fs.h	2012-10-04 18:47:00.000000000 +0200
 @@ -54,6 +54,7 @@ struct proc_dir_entry {
  	nlink_t nlink;
- 	uid_t uid;
- 	gid_t gid;
+ 	kuid_t uid;
+ 	kgid_t gid;
 +	int vx_flags;
  	loff_t size;
  	const struct inode_operations *proc_iops;
@@ -8676,9 +8349,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/proc_fs.h linux-3.4.11-vs2.3.3.
  	int fd;
  	union proc_op op;
  	struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.4.11/include/linux/quotaops.h linux-3.4.11-vs2.3.3.8/include/linux/quotaops.h
---- linux-3.4.11/include/linux/quotaops.h	2012-01-09 16:14:58.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/quotaops.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/quotaops.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/quotaops.h
+--- linux-3.6/include/linux/quotaops.h	2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/quotaops.h	2012-10-04 18:47:00.000000000 +0200
 @@ -8,6 +8,7 @@
  #define _LINUX_QUOTAOPS_
  
@@ -8687,7 +8360,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/quotaops.h linux-3.4.11-vs2.3.3
  
  #define DQUOT_SPACE_WARN	0x1
  #define DQUOT_SPACE_RESERVE	0x2
-@@ -204,11 +205,12 @@ static inline void dquot_drop(struct ino
+@@ -205,11 +206,12 @@ static inline void dquot_drop(struct ino
  
  static inline int dquot_alloc_inode(const struct inode *inode)
  {
@@ -8701,7 +8374,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/quotaops.h linux-3.4.11-vs2.3.3
  }
  
  static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
-@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct 
+@@ -220,6 +222,10 @@ static inline int dquot_transfer(struct 
  static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
  		int flags)
  {
@@ -8712,7 +8385,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/quotaops.h linux-3.4.11-vs2.3.3
  	if (!(flags & DQUOT_SPACE_RESERVE))
  		inode_add_bytes(inode, number);
  	return 0;
-@@ -229,6 +235,7 @@ static inline void __dquot_free_space(st
+@@ -230,6 +236,7 @@ static inline void __dquot_free_space(st
  {
  	if (!(flags & DQUOT_SPACE_RESERVE))
  		inode_sub_bytes(inode, number);
@@ -8720,9 +8393,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/quotaops.h linux-3.4.11-vs2.3.3
  }
  
  static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.4.11/include/linux/reboot.h linux-3.4.11-vs2.3.3.8/include/linux/reboot.h
---- linux-3.4.11/include/linux/reboot.h	2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/reboot.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/reboot.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/reboot.h
+--- linux-3.6/include/linux/reboot.h	2011-10-24 18:45:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/reboot.h	2012-10-04 18:47:00.000000000 +0200
 @@ -33,6 +33,7 @@
  #define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
  #define	LINUX_REBOOT_CMD_SW_SUSPEND	0xD000FCE2
@@ -8731,12 +8404,12 @@ diff -NurpP --minimal linux-3.4.11/include/linux/reboot.h linux-3.4.11-vs2.3.3.8
  
  
  #ifdef __KERNEL__
-diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/include/linux/sched.h
---- linux-3.4.11/include/linux/sched.h	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/sched.h	2012-07-24 11:52:30.000000000 +0200
-@@ -1452,6 +1452,14 @@ struct task_struct {
+diff -NurpP --minimal linux-3.6/include/linux/sched.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sched.h
+--- linux-3.6/include/linux/sched.h	2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sched.h	2012-10-04 18:47:00.000000000 +0200
+@@ -1422,6 +1422,14 @@ struct task_struct {
  #endif
- 	seccomp_t seccomp;
+ 	struct seccomp seccomp;
  
 +/* vserver context data */
 +	struct vx_info *vx_info;
@@ -8749,7 +8422,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1696,6 +1704,11 @@ struct pid_namespace;
+@@ -1668,6 +1676,11 @@ struct pid_namespace;
  pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
  			struct pid_namespace *ns);
  
@@ -8761,7 +8434,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/
  static inline pid_t task_pid_nr(struct task_struct *tsk)
  {
  	return tsk->pid;
-@@ -1709,7 +1722,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1681,7 +1694,8 @@ static inline pid_t task_pid_nr_ns(struc
  
  static inline pid_t task_pid_vnr(struct task_struct *tsk)
  {
@@ -8771,7 +8444,7 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/
  }
  
  
-@@ -1722,7 +1736,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+@@ -1694,7 +1708,7 @@ pid_t task_tgid_nr_ns(struct task_struct
  
  static inline pid_t task_tgid_vnr(struct task_struct *tsk)
  {
@@ -8780,9 +8453,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sched.h linux-3.4.11-vs2.3.3.8/
  }
  
  
-diff -NurpP --minimal linux-3.4.11/include/linux/shmem_fs.h linux-3.4.11-vs2.3.3.8/include/linux/shmem_fs.h
---- linux-3.4.11/include/linux/shmem_fs.h	2012-03-19 19:47:29.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/shmem_fs.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/shmem_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/shmem_fs.h
+--- linux-3.6/include/linux/shmem_fs.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/shmem_fs.h	2012-10-04 18:47:00.000000000 +0200
 @@ -8,6 +8,9 @@
  
  /* inode in-kernel data */
@@ -8793,20 +8466,20 @@ diff -NurpP --minimal linux-3.4.11/include/linux/shmem_fs.h linux-3.4.11-vs2.3.3
  struct shmem_inode_info {
  	spinlock_t		lock;
  	unsigned long		flags;
-diff -NurpP --minimal linux-3.4.11/include/linux/stat.h linux-3.4.11-vs2.3.3.8/include/linux/stat.h
---- linux-3.4.11/include/linux/stat.h	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/stat.h	2012-05-21 18:15:05.000000000 +0200
-@@ -66,6 +66,7 @@ struct kstat {
+diff -NurpP --minimal linux-3.6/include/linux/stat.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/stat.h
+--- linux-3.6/include/linux/stat.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/stat.h	2012-10-04 18:47:00.000000000 +0200
+@@ -67,6 +67,7 @@ struct kstat {
  	unsigned int	nlink;
- 	uid_t		uid;
- 	gid_t		gid;
+ 	kuid_t		uid;
+ 	kgid_t		gid;
 +	tag_t		tag;
  	dev_t		rdev;
  	loff_t		size;
  	struct timespec  atime;
-diff -NurpP --minimal linux-3.4.11/include/linux/sunrpc/auth.h linux-3.4.11-vs2.3.3.8/include/linux/sunrpc/auth.h
---- linux-3.4.11/include/linux/sunrpc/auth.h	2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/sunrpc/auth.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/sunrpc/auth.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sunrpc/auth.h
+--- linux-3.6/include/linux/sunrpc/auth.h	2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sunrpc/auth.h	2012-10-04 18:47:00.000000000 +0200
 @@ -25,6 +25,7 @@
  struct auth_cred {
  	uid_t	uid;
@@ -8815,9 +8488,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sunrpc/auth.h linux-3.4.11-vs2.
  	struct group_info *group_info;
  	const char *principal;
  	unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.4.11/include/linux/sunrpc/clnt.h linux-3.4.11-vs2.3.3.8/include/linux/sunrpc/clnt.h
---- linux-3.4.11/include/linux/sunrpc/clnt.h	2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/sunrpc/clnt.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/sunrpc/clnt.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sunrpc/clnt.h
+--- linux-3.6/include/linux/sunrpc/clnt.h	2012-05-21 18:07:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sunrpc/clnt.h	2012-10-04 18:47:00.000000000 +0200
 @@ -49,7 +49,8 @@ struct rpc_clnt {
  	unsigned int		cl_softrtry : 1,/* soft timeouts */
  				cl_discrtry : 1,/* disconnect before retry */
@@ -8828,9 +8501,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sunrpc/clnt.h linux-3.4.11-vs2.
  
  	struct rpc_rtt *	cl_rtt;		/* RTO estimator data */
  	const struct rpc_timeout *cl_timeout;	/* Timeout strategy */
-diff -NurpP --minimal linux-3.4.11/include/linux/sysctl.h linux-3.4.11-vs2.3.3.8/include/linux/sysctl.h
---- linux-3.4.11/include/linux/sysctl.h	2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/sysctl.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/sysctl.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sysctl.h
+--- linux-3.6/include/linux/sysctl.h	2012-05-21 18:07:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sysctl.h	2012-10-04 18:47:00.000000000 +0200
 @@ -60,6 +60,7 @@ enum
  	CTL_ABI=9,		/* Binary emulation */
  	CTL_CPU=10,		/* CPU stuff (speed scaling, etc) */
@@ -8847,9 +8520,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sysctl.h linux-3.4.11-vs2.3.3.8
  
  	KERN_SPARC_REBOOT=21,	/* reboot command on Sparc */
  	KERN_CTLALTDEL=22,	/* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.4.11/include/linux/sysfs.h linux-3.4.11-vs2.3.3.8/include/linux/sysfs.h
---- linux-3.4.11/include/linux/sysfs.h	2012-03-19 19:47:29.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/sysfs.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/sysfs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sysfs.h
+--- linux-3.6/include/linux/sysfs.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sysfs.h	2012-10-04 18:47:00.000000000 +0200
 @@ -19,6 +19,8 @@
  #include <linux/kobject_ns.h>
  #include <linux/atomic.h>
@@ -8859,10 +8532,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/sysfs.h linux-3.4.11-vs2.3.3.8/
  struct kobject;
  struct module;
  enum kobj_ns_type;
-diff -NurpP --minimal linux-3.4.11/include/linux/time.h linux-3.4.11-vs2.3.3.8/include/linux/time.h
---- linux-3.4.11/include/linux/time.h	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/time.h	2012-09-01 10:50:49.000000000 +0200
-@@ -256,6 +256,8 @@ static __always_inline void timespec_add
+diff -NurpP --minimal linux-3.6/include/linux/time.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/time.h
+--- linux-3.6/include/linux/time.h	2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/time.h	2012-10-04 18:47:00.000000000 +0200
+@@ -280,6 +280,8 @@ static __always_inline void timespec_add
  	a->tv_nsec = ns;
  }
  
@@ -8871,9 +8544,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/time.h linux-3.4.11-vs2.3.3.8/i
  #endif /* __KERNEL__ */
  
  /*
-diff -NurpP --minimal linux-3.4.11/include/linux/types.h linux-3.4.11-vs2.3.3.8/include/linux/types.h
---- linux-3.4.11/include/linux/types.h	2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/linux/types.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/types.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/types.h
+--- linux-3.6/include/linux/types.h	2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/types.h	2012-10-04 18:47:00.000000000 +0200
 @@ -41,6 +41,9 @@ typedef __kernel_uid32_t	uid_t;
  typedef __kernel_gid32_t	gid_t;
  typedef __kernel_uid16_t        uid16_t;
@@ -8884,9 +8557,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/types.h linux-3.4.11-vs2.3.3.8/
  
  typedef unsigned long		uintptr_t;
  
-diff -NurpP --minimal linux-3.4.11/include/linux/utsname.h linux-3.4.11-vs2.3.3.8/include/linux/utsname.h
---- linux-3.4.11/include/linux/utsname.h	2012-01-09 16:14:59.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/utsname.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/utsname.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/utsname.h
+--- linux-3.6/include/linux/utsname.h	2012-01-09 16:14:59.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/utsname.h	2012-10-04 18:47:00.000000000 +0200
 @@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts
  }
  
@@ -8913,9 +8586,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/utsname.h linux-3.4.11-vs2.3.3.
  }
  #endif
  
-diff -NurpP --minimal linux-3.4.11/include/linux/vroot.h linux-3.4.11-vs2.3.3.8/include/linux/vroot.h
---- linux-3.4.11/include/linux/vroot.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vroot.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vroot.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vroot.h
+--- linux-3.6/include/linux/vroot.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vroot.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,51 @@
 +
 +/*
@@ -8968,9 +8641,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vroot.h linux-3.4.11-vs2.3.3.8/
 +#define VROOT_CLR_DEV		0x5601
 +
 +#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_base.h linux-3.4.11-vs2.3.3.8/include/linux/vs_base.h
---- linux-3.4.11/include/linux/vs_base.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_base.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_base.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_base.h
+--- linux-3.6/include/linux/vs_base.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_base.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,10 @@
 +#ifndef _VS_BASE_H
 +#define _VS_BASE_H
@@ -8982,9 +8655,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_base.h linux-3.4.11-vs2.3.3.
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_context.h linux-3.4.11-vs2.3.3.8/include/linux/vs_context.h
---- linux-3.4.11/include/linux/vs_context.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_context.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_context.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_context.h
+--- linux-3.6/include/linux/vs_context.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_context.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,242 @@
 +#ifndef _VS_CONTEXT_H
 +#define _VS_CONTEXT_H
@@ -9228,9 +8901,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_context.h linux-3.4.11-vs2.3
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_cowbl.h linux-3.4.11-vs2.3.3.8/include/linux/vs_cowbl.h
---- linux-3.4.11/include/linux/vs_cowbl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_cowbl.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_cowbl.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_cowbl.h
+--- linux-3.6/include/linux/vs_cowbl.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_cowbl.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,48 @@
 +#ifndef _VS_COWBL_H
 +#define _VS_COWBL_H
@@ -9280,9 +8953,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_cowbl.h linux-3.4.11-vs2.3.3
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_cvirt.h linux-3.4.11-vs2.3.3.8/include/linux/vs_cvirt.h
---- linux-3.4.11/include/linux/vs_cvirt.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_cvirt.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_cvirt.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_cvirt.h
+--- linux-3.6/include/linux/vs_cvirt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_cvirt.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,50 @@
 +#ifndef _VS_CVIRT_H
 +#define _VS_CVIRT_H
@@ -9334,9 +9007,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_cvirt.h linux-3.4.11-vs2.3.3
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_device.h linux-3.4.11-vs2.3.3.8/include/linux/vs_device.h
---- linux-3.4.11/include/linux/vs_device.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_device.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_device.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_device.h
+--- linux-3.6/include/linux/vs_device.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_device.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,45 @@
 +#ifndef _VS_DEVICE_H
 +#define _VS_DEVICE_H
@@ -9383,9 +9056,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_device.h linux-3.4.11-vs2.3.
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_dlimit.h linux-3.4.11-vs2.3.3.8/include/linux/vs_dlimit.h
---- linux-3.4.11/include/linux/vs_dlimit.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_dlimit.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_dlimit.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_dlimit.h
+--- linux-3.6/include/linux/vs_dlimit.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_dlimit.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,215 @@
 +#ifndef _VS_DLIMIT_H
 +#define _VS_DLIMIT_H
@@ -9602,9 +9275,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_dlimit.h linux-3.4.11-vs2.3.
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_inet.h linux-3.4.11-vs2.3.3.8/include/linux/vs_inet.h
---- linux-3.4.11/include/linux/vs_inet.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_inet.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_inet.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_inet.h
+--- linux-3.6/include/linux/vs_inet.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_inet.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,353 @@
 +#ifndef _VS_INET_H
 +#define _VS_INET_H
@@ -9959,9 +9632,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_inet.h linux-3.4.11-vs2.3.3.
 +#else
 +// #warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_inet6.h linux-3.4.11-vs2.3.3.8/include/linux/vs_inet6.h
---- linux-3.4.11/include/linux/vs_inet6.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_inet6.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_inet6.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_inet6.h
+--- linux-3.6/include/linux/vs_inet6.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_inet6.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,246 @@
 +#ifndef _VS_INET6_H
 +#define _VS_INET6_H
@@ -10209,9 +9882,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_inet6.h linux-3.4.11-vs2.3.3
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_limit.h linux-3.4.11-vs2.3.3.8/include/linux/vs_limit.h
---- linux-3.4.11/include/linux/vs_limit.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_limit.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_limit.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_limit.h
+--- linux-3.6/include/linux/vs_limit.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_limit.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,140 @@
 +#ifndef _VS_LIMIT_H
 +#define _VS_LIMIT_H
@@ -10353,9 +10026,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_limit.h linux-3.4.11-vs2.3.3
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_network.h linux-3.4.11-vs2.3.3.8/include/linux/vs_network.h
---- linux-3.4.11/include/linux/vs_network.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_network.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_network.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_network.h
+--- linux-3.6/include/linux/vs_network.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_network.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,169 @@
 +#ifndef _NX_VS_NETWORK_H
 +#define _NX_VS_NETWORK_H
@@ -10526,9 +10199,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_network.h linux-3.4.11-vs2.3
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_pid.h linux-3.4.11-vs2.3.3.8/include/linux/vs_pid.h
---- linux-3.4.11/include/linux/vs_pid.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_pid.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_pid.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_pid.h
+--- linux-3.6/include/linux/vs_pid.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_pid.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,50 @@
 +#ifndef _VS_PID_H
 +#define _VS_PID_H
@@ -10580,9 +10253,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_pid.h linux-3.4.11-vs2.3.3.8
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_sched.h linux-3.4.11-vs2.3.3.8/include/linux/vs_sched.h
---- linux-3.4.11/include/linux/vs_sched.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_sched.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_sched.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_sched.h
+--- linux-3.6/include/linux/vs_sched.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_sched.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,40 @@
 +#ifndef _VS_SCHED_H
 +#define _VS_SCHED_H
@@ -10624,9 +10297,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_sched.h linux-3.4.11-vs2.3.3
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_socket.h linux-3.4.11-vs2.3.3.8/include/linux/vs_socket.h
---- linux-3.4.11/include/linux/vs_socket.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_socket.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_socket.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_socket.h
+--- linux-3.6/include/linux/vs_socket.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_socket.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,67 @@
 +#ifndef _VS_SOCKET_H
 +#define _VS_SOCKET_H
@@ -10695,9 +10368,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_socket.h linux-3.4.11-vs2.3.
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_tag.h linux-3.4.11-vs2.3.3.8/include/linux/vs_tag.h
---- linux-3.4.11/include/linux/vs_tag.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_tag.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_tag.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_tag.h
+--- linux-3.6/include/linux/vs_tag.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_tag.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,47 @@
 +#ifndef _VS_TAG_H
 +#define _VS_TAG_H
@@ -10746,9 +10419,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_tag.h linux-3.4.11-vs2.3.3.8
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vs_time.h linux-3.4.11-vs2.3.3.8/include/linux/vs_time.h
---- linux-3.4.11/include/linux/vs_time.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vs_time.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_time.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_time.h
+--- linux-3.6/include/linux/vs_time.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_time.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _VS_TIME_H
 +#define _VS_TIME_H
@@ -10769,9 +10442,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vs_time.h linux-3.4.11-vs2.3.3.
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/Kbuild linux-3.4.11-vs2.3.3.8/include/linux/vserver/Kbuild
---- linux-3.4.11/include/linux/vserver/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/Kbuild	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/Kbuild linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/Kbuild
+--- linux-3.6/include/linux/vserver/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/Kbuild	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,8 @@
 +
 +header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -10781,9 +10454,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/Kbuild linux-3.4.11-vs2
 +
 +header-y += switch.h network.h monitor.h inode.h device.h
 +
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/base.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/base.h
---- linux-3.4.11/include/linux/vserver/base.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/base.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/base.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/base.h
+--- linux-3.6/include/linux/vserver/base.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/base.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,178 @@
 +#ifndef _VX_BASE_H
 +#define _VX_BASE_H
@@ -10963,9 +10636,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/base.h linux-3.4.11-vs2
 +#define nx_info_state(n, m)	(__nx_state(n) & (m))
 +
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct.h
---- linux-3.4.11/include/linux/vserver/cacct.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cacct.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct.h
+--- linux-3.6/include/linux/vserver/cacct.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,15 @@
 +#ifndef _VX_CACCT_H
 +#define _VX_CACCT_H
@@ -10982,9 +10655,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct.h linux-3.4.11-vs
 +};
 +
 +#endif	/* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct_cmd.h
---- linux-3.4.11/include/linux/vserver/cacct_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cacct_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct_cmd.h
+--- linux-3.6/include/linux/vserver/cacct_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,23 @@
 +#ifndef _VX_CACCT_CMD_H
 +#define _VX_CACCT_CMD_H
@@ -11009,9 +10682,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_cmd.h linux-3.4.1
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct_def.h
---- linux-3.4.11/include/linux/vserver/cacct_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct_def.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cacct_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct_def.h
+--- linux-3.6/include/linux/vserver/cacct_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct_def.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,43 @@
 +#ifndef _VX_CACCT_DEF_H
 +#define _VX_CACCT_DEF_H
@@ -11056,9 +10729,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_def.h linux-3.4.1
 +#endif
 +
 +#endif	/* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_int.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct_int.h
---- linux-3.4.11/include/linux/vserver/cacct_int.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/cacct_int.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cacct_int.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct_int.h
+--- linux-3.6/include/linux/vserver/cacct_int.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct_int.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _VX_CACCT_INT_H
 +#define _VX_CACCT_INT_H
@@ -11081,9 +10754,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cacct_int.h linux-3.4.1
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/check.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/check.h
---- linux-3.4.11/include/linux/vserver/check.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/check.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/check.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/check.h
+--- linux-3.6/include/linux/vserver/check.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/check.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,89 @@
 +#ifndef _VS_CHECK_H
 +#define _VS_CHECK_H
@@ -11174,9 +10847,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/check.h linux-3.4.11-vs
 +#define nx_weak_check(c, m)	((m) ? nx_check(c, m) : 1)
 +
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/context.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/context.h
---- linux-3.4.11/include/linux/vserver/context.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/context.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/context.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/context.h
+--- linux-3.6/include/linux/vserver/context.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/context.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,188 @@
 +#ifndef _VX_CONTEXT_H
 +#define _VX_CONTEXT_H
@@ -11366,9 +11039,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/context.h linux-3.4.11-
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/context_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/context_cmd.h
---- linux-3.4.11/include/linux/vserver/context_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/context_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/context_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/context_cmd.h
+--- linux-3.6/include/linux/vserver/context_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/context_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,162 @@
 +#ifndef _VX_CONTEXT_CMD_H
 +#define _VX_CONTEXT_CMD_H
@@ -11532,9 +11205,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/context_cmd.h linux-3.4
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cvirt.h
---- linux-3.4.11/include/linux/vserver/cvirt.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/cvirt.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cvirt.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cvirt.h
+--- linux-3.6/include/linux/vserver/cvirt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cvirt.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,22 @@
 +#ifndef _VX_CVIRT_H
 +#define _VX_CVIRT_H
@@ -11558,9 +11231,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt.h linux-3.4.11-vs
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cvirt_cmd.h
---- linux-3.4.11/include/linux/vserver/cvirt_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/cvirt_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cvirt_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cvirt_cmd.h
+--- linux-3.6/include/linux/vserver/cvirt_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cvirt_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,53 @@
 +#ifndef _VX_CVIRT_CMD_H
 +#define _VX_CVIRT_CMD_H
@@ -11615,9 +11288,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt_cmd.h linux-3.4.1
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/cvirt_def.h
---- linux-3.4.11/include/linux/vserver/cvirt_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/cvirt_def.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cvirt_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cvirt_def.h
+--- linux-3.6/include/linux/vserver/cvirt_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cvirt_def.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,80 @@
 +#ifndef _VX_CVIRT_DEF_H
 +#define _VX_CVIRT_DEF_H
@@ -11699,9 +11372,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/cvirt_def.h linux-3.4.1
 +#endif
 +
 +#endif	/* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/debug.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/debug.h
---- linux-3.4.11/include/linux/vserver/debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/debug.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/debug.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/debug.h
+--- linux-3.6/include/linux/vserver/debug.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/debug.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,145 @@
 +#ifndef _VX_DEBUG_H
 +#define _VX_DEBUG_H
@@ -11848,9 +11521,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/debug.h linux-3.4.11-vs
 +
 +
 +#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/debug_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/debug_cmd.h
---- linux-3.4.11/include/linux/vserver/debug_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/debug_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/debug_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/debug_cmd.h
+--- linux-3.6/include/linux/vserver/debug_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/debug_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,58 @@
 +#ifndef _VX_DEBUG_CMD_H
 +#define _VX_DEBUG_CMD_H
@@ -11910,9 +11583,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/debug_cmd.h linux-3.4.1
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/device.h
---- linux-3.4.11/include/linux/vserver/device.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/device.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/device.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/device.h
+--- linux-3.6/include/linux/vserver/device.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/device.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,15 @@
 +#ifndef _VX_DEVICE_H
 +#define _VX_DEVICE_H
@@ -11929,9 +11602,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device.h linux-3.4.11-v
 +#else	/* _VX_DEVICE_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/device_cmd.h
---- linux-3.4.11/include/linux/vserver/device_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/device_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/device_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/device_cmd.h
+--- linux-3.6/include/linux/vserver/device_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/device_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,44 @@
 +#ifndef _VX_DEVICE_CMD_H
 +#define _VX_DEVICE_CMD_H
@@ -11977,9 +11650,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device_cmd.h linux-3.4.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/device_def.h
---- linux-3.4.11/include/linux/vserver/device_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/device_def.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/device_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/device_def.h
+--- linux-3.6/include/linux/vserver/device_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/device_def.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,17 @@
 +#ifndef _VX_DEVICE_DEF_H
 +#define _VX_DEVICE_DEF_H
@@ -11998,9 +11671,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/device_def.h linux-3.4.
 +};
 +
 +#endif	/* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/dlimit.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/dlimit.h
---- linux-3.4.11/include/linux/vserver/dlimit.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/dlimit.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/dlimit.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/dlimit.h
+--- linux-3.6/include/linux/vserver/dlimit.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/dlimit.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,54 @@
 +#ifndef _VX_DLIMIT_H
 +#define _VX_DLIMIT_H
@@ -12056,9 +11729,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/dlimit.h linux-3.4.11-v
 +#else	/* _VX_DLIMIT_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/dlimit_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/dlimit_cmd.h
---- linux-3.4.11/include/linux/vserver/dlimit_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/dlimit_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/dlimit_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/dlimit_cmd.h
+--- linux-3.6/include/linux/vserver/dlimit_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/dlimit_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,109 @@
 +#ifndef _VX_DLIMIT_CMD_H
 +#define _VX_DLIMIT_CMD_H
@@ -12169,9 +11842,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/dlimit_cmd.h linux-3.4.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/global.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/global.h
---- linux-3.4.11/include/linux/vserver/global.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/global.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/global.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/global.h
+--- linux-3.6/include/linux/vserver/global.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/global.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _VX_GLOBAL_H
 +#define _VX_GLOBAL_H
@@ -12192,9 +11865,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/global.h linux-3.4.11-v
 +
 +
 +#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/history.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/history.h
---- linux-3.4.11/include/linux/vserver/history.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/history.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/history.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/history.h
+--- linux-3.6/include/linux/vserver/history.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/history.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,197 @@
 +#ifndef _VX_HISTORY_H
 +#define _VX_HISTORY_H
@@ -12393,9 +12066,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/history.h linux-3.4.11-
 +#endif /* CONFIG_VSERVER_HISTORY */
 +
 +#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/inode.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/inode.h
---- linux-3.4.11/include/linux/vserver/inode.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/inode.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/inode.h
+--- linux-3.6/include/linux/vserver/inode.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/inode.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,39 @@
 +#ifndef _VX_INODE_H
 +#define _VX_INODE_H
@@ -12436,9 +12109,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/inode.h linux-3.4.11-vs
 +#else	/* _VX_INODE_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_INODE_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/inode_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/inode_cmd.h
---- linux-3.4.11/include/linux/vserver/inode_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/inode_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/inode_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/inode_cmd.h
+--- linux-3.6/include/linux/vserver/inode_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/inode_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,59 @@
 +#ifndef _VX_INODE_CMD_H
 +#define _VX_INODE_CMD_H
@@ -12499,9 +12172,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/inode_cmd.h linux-3.4.1
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit.h
---- linux-3.4.11/include/linux/vserver/limit.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/limit.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit.h
+--- linux-3.6/include/linux/vserver/limit.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,71 @@
 +#ifndef _VX_LIMIT_H
 +#define _VX_LIMIT_H
@@ -12574,9 +12247,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit.h linux-3.4.11-vs
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit_cmd.h
---- linux-3.4.11/include/linux/vserver/limit_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/limit_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit_cmd.h
+--- linux-3.6/include/linux/vserver/limit_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,71 @@
 +#ifndef _VX_LIMIT_CMD_H
 +#define _VX_LIMIT_CMD_H
@@ -12649,9 +12322,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_cmd.h linux-3.4.1
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit_def.h
---- linux-3.4.11/include/linux/vserver/limit_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit_def.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/limit_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit_def.h
+--- linux-3.6/include/linux/vserver/limit_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit_def.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,47 @@
 +#ifndef _VX_LIMIT_DEF_H
 +#define _VX_LIMIT_DEF_H
@@ -12700,9 +12373,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_def.h linux-3.4.1
 +#endif
 +
 +#endif	/* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_int.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit_int.h
---- linux-3.4.11/include/linux/vserver/limit_int.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/limit_int.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/limit_int.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit_int.h
+--- linux-3.6/include/linux/vserver/limit_int.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit_int.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,198 @@
 +#ifndef _VX_LIMIT_INT_H
 +#define _VX_LIMIT_INT_H
@@ -12902,9 +12575,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/limit_int.h linux-3.4.1
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/monitor.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/monitor.h
---- linux-3.4.11/include/linux/vserver/monitor.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/monitor.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/monitor.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/monitor.h
+--- linux-3.6/include/linux/vserver/monitor.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/monitor.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,96 @@
 +#ifndef _VX_MONITOR_H
 +#define _VX_MONITOR_H
@@ -13002,9 +12675,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/monitor.h linux-3.4.11-
 +
 +
 +#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/network.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/network.h
---- linux-3.4.11/include/linux/vserver/network.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/network.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/network.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/network.h
+--- linux-3.6/include/linux/vserver/network.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/network.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,148 @@
 +#ifndef _VX_NETWORK_H
 +#define _VX_NETWORK_H
@@ -13154,9 +12827,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/network.h linux-3.4.11-
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/network_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/network_cmd.h
---- linux-3.4.11/include/linux/vserver/network_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/network_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/network_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/network_cmd.h
+--- linux-3.6/include/linux/vserver/network_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/network_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,164 @@
 +#ifndef _VX_NETWORK_CMD_H
 +#define _VX_NETWORK_CMD_H
@@ -13322,9 +12995,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/network_cmd.h linux-3.4
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/percpu.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/percpu.h
---- linux-3.4.11/include/linux/vserver/percpu.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/percpu.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/percpu.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/percpu.h
+--- linux-3.6/include/linux/vserver/percpu.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/percpu.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef _VX_PERCPU_H
 +#define _VX_PERCPU_H
@@ -13340,9 +13013,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/percpu.h linux-3.4.11-v
 +#define	PERCPU_PERCTX	(sizeof(struct _vx_percpu))
 +
 +#endif	/* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/pid.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/pid.h
---- linux-3.4.11/include/linux/vserver/pid.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/pid.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/pid.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/pid.h
+--- linux-3.6/include/linux/vserver/pid.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/pid.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,51 @@
 +#ifndef _VSERVER_PID_H
 +#define _VSERVER_PID_H
@@ -13395,9 +13068,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/pid.h linux-3.4.11-vs2.
 +}
 +
 +#endif
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/sched.h
---- linux-3.4.11/include/linux/vserver/sched.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/sched.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/sched.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/sched.h
+--- linux-3.6/include/linux/vserver/sched.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/sched.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,23 @@
 +#ifndef _VX_SCHED_H
 +#define _VX_SCHED_H
@@ -13422,9 +13095,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched.h linux-3.4.11-vs
 +#else	/* _VX_SCHED_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/sched_cmd.h
---- linux-3.4.11/include/linux/vserver/sched_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/sched_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/sched_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/sched_cmd.h
+--- linux-3.6/include/linux/vserver/sched_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/sched_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _VX_SCHED_CMD_H
 +#define _VX_SCHED_CMD_H
@@ -13447,9 +13120,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched_cmd.h linux-3.4.1
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched_def.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/sched_def.h
---- linux-3.4.11/include/linux/vserver/sched_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/sched_def.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/sched_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/sched_def.h
+--- linux-3.6/include/linux/vserver/sched_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/sched_def.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,38 @@
 +#ifndef _VX_SCHED_DEF_H
 +#define _VX_SCHED_DEF_H
@@ -13489,9 +13162,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/sched_def.h linux-3.4.1
 +#endif
 +
 +#endif	/* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/signal.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/signal.h
---- linux-3.4.11/include/linux/vserver/signal.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/signal.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/signal.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/signal.h
+--- linux-3.6/include/linux/vserver/signal.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/signal.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef _VX_SIGNAL_H
 +#define _VX_SIGNAL_H
@@ -13507,9 +13180,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/signal.h linux-3.4.11-v
 +#else	/* _VX_SIGNAL_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/signal_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/signal_cmd.h
---- linux-3.4.11/include/linux/vserver/signal_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/signal_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/signal_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/signal_cmd.h
+--- linux-3.6/include/linux/vserver/signal_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/signal_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,43 @@
 +#ifndef _VX_SIGNAL_CMD_H
 +#define _VX_SIGNAL_CMD_H
@@ -13554,9 +13227,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/signal_cmd.h linux-3.4.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/space.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/space.h
---- linux-3.4.11/include/linux/vserver/space.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/space.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/space.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/space.h
+--- linux-3.6/include/linux/vserver/space.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/space.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,12 @@
 +#ifndef _VX_SPACE_H
 +#define _VX_SPACE_H
@@ -13570,9 +13243,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/space.h linux-3.4.11-vs
 +#else	/* _VX_SPACE_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/space_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/space_cmd.h
---- linux-3.4.11/include/linux/vserver/space_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/space_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/space_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/space_cmd.h
+--- linux-3.6/include/linux/vserver/space_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/space_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,38 @@
 +#ifndef _VX_SPACE_CMD_H
 +#define _VX_SPACE_CMD_H
@@ -13612,9 +13285,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/space_cmd.h linux-3.4.1
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/switch.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/switch.h
---- linux-3.4.11/include/linux/vserver/switch.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/switch.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/switch.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/switch.h
+--- linux-3.6/include/linux/vserver/switch.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/switch.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,98 @@
 +#ifndef _VX_SWITCH_H
 +#define _VX_SWITCH_H
@@ -13714,9 +13387,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/switch.h linux-3.4.11-v
 +
 +#endif	/* _VX_SWITCH_H */
 +
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/tag.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/tag.h
---- linux-3.4.11/include/linux/vserver/tag.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/tag.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/tag.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/tag.h
+--- linux-3.6/include/linux/vserver/tag.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/tag.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,143 @@
 +#ifndef _DX_TAG_H
 +#define _DX_TAG_H
@@ -13861,9 +13534,9 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/tag.h linux-3.4.11-vs2.
 +#endif
 +
 +#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.4.11/include/linux/vserver/tag_cmd.h linux-3.4.11-vs2.3.3.8/include/linux/vserver/tag_cmd.h
---- linux-3.4.11/include/linux/vserver/tag_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/linux/vserver/tag_cmd.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/tag_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/tag_cmd.h
+--- linux-3.6/include/linux/vserver/tag_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/tag_cmd.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,22 @@
 +#ifndef _VX_TAG_CMD_H
 +#define _VX_TAG_CMD_H
@@ -13887,10 +13560,10 @@ diff -NurpP --minimal linux-3.4.11/include/linux/vserver/tag_cmd.h linux-3.4.11-
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.4.11/include/net/addrconf.h linux-3.4.11-vs2.3.3.8/include/net/addrconf.h
---- linux-3.4.11/include/net/addrconf.h	2012-05-21 18:07:33.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/net/addrconf.h	2012-05-21 18:15:05.000000000 +0200
-@@ -80,7 +80,8 @@ extern int			ipv6_dev_get_saddr(struct n
+diff -NurpP --minimal linux-3.6/include/net/addrconf.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/addrconf.h
+--- linux-3.6/include/net/addrconf.h	2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/addrconf.h	2012-10-04 18:47:00.000000000 +0200
+@@ -81,7 +81,8 @@ extern int			ipv6_dev_get_saddr(struct n
  					       struct net_device *dev,
  					       const struct in6_addr *daddr,
  					       unsigned int srcprefs,
@@ -13900,9 +13573,9 @@ diff -NurpP --minimal linux-3.4.11/include/net/addrconf.h linux-3.4.11-vs2.3.3.8
  extern int			ipv6_get_lladdr(struct net_device *dev,
  						struct in6_addr *addr,
  						unsigned char banned_flags);
-diff -NurpP --minimal linux-3.4.11/include/net/af_unix.h linux-3.4.11-vs2.3.3.8/include/net/af_unix.h
---- linux-3.4.11/include/net/af_unix.h	2012-05-21 18:07:33.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/net/af_unix.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/net/af_unix.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/af_unix.h
+--- linux-3.6/include/net/af_unix.h	2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/af_unix.h	2012-10-04 18:47:00.000000000 +0200
 @@ -4,6 +4,7 @@
  #include <linux/socket.h>
  #include <linux/un.h>
@@ -13911,9 +13584,9 @@ diff -NurpP --minimal linux-3.4.11/include/net/af_unix.h linux-3.4.11-vs2.3.3.8/
  #include <net/sock.h>
  
  extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.4.11/include/net/inet_timewait_sock.h linux-3.4.11-vs2.3.3.8/include/net/inet_timewait_sock.h
---- linux-3.4.11/include/net/inet_timewait_sock.h	2012-03-19 19:47:29.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/net/inet_timewait_sock.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/net/inet_timewait_sock.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/inet_timewait_sock.h
+--- linux-3.6/include/net/inet_timewait_sock.h	2012-03-19 19:47:29.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/inet_timewait_sock.h	2012-10-04 18:47:00.000000000 +0200
 @@ -112,6 +112,10 @@ struct inet_timewait_sock {
  #define tw_net			__tw_common.skc_net
  #define tw_daddr        	__tw_common.skc_daddr
@@ -13925,10 +13598,10 @@ diff -NurpP --minimal linux-3.4.11/include/net/inet_timewait_sock.h linux-3.4.11
  	int			tw_timeout;
  	volatile unsigned char	tw_substate;
  	unsigned char		tw_rcv_wscale;
-diff -NurpP --minimal linux-3.4.11/include/net/ip6_route.h linux-3.4.11-vs2.3.3.8/include/net/ip6_route.h
---- linux-3.4.11/include/net/ip6_route.h	2012-03-19 19:47:29.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/net/ip6_route.h	2012-05-21 18:15:05.000000000 +0200
-@@ -88,7 +88,8 @@ extern int			ip6_route_get_saddr(struct 
+diff -NurpP --minimal linux-3.6/include/net/ip6_route.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/ip6_route.h
+--- linux-3.6/include/net/ip6_route.h	2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/ip6_route.h	2012-10-04 18:47:00.000000000 +0200
+@@ -97,7 +97,8 @@ extern int			ip6_route_get_saddr(struct 
  						    struct rt6_info *rt,
  						    const struct in6_addr *daddr,
  						    unsigned int prefs,
@@ -13938,10 +13611,10 @@ diff -NurpP --minimal linux-3.4.11/include/net/ip6_route.h linux-3.4.11-vs2.3.3.
  
  extern struct rt6_info		*rt6_lookup(struct net *net,
  					    const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.4.11/include/net/route.h linux-3.4.11-vs2.3.3.8/include/net/route.h
---- linux-3.4.11/include/net/route.h	2012-03-19 19:47:29.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/include/net/route.h	2012-05-21 18:15:05.000000000 +0200
-@@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
+diff -NurpP --minimal linux-3.6/include/net/route.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/route.h
+--- linux-3.6/include/net/route.h	2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/route.h	2012-10-04 18:47:00.000000000 +0200
+@@ -203,6 +203,9 @@ static inline void ip_rt_put(struct rtab
  		dst_release(&rt->dst);
  }
  
@@ -13951,7 +13624,7 @@ diff -NurpP --minimal linux-3.4.11/include/net/route.h linux-3.4.11-vs2.3.3.8/in
  #define IPTOS_RT_MASK	(IPTOS_TOS_MASK & ~3)
  
  extern const __u8 ip_tos2prio[16];
-@@ -253,6 +256,9 @@ static inline void ip_route_connect_init
+@@ -252,6 +255,9 @@ static inline void ip_route_connect_init
  			   protocol, flow_flags, dst, src, dport, sport);
  }
  
@@ -13961,7 +13634,7 @@ diff -NurpP --minimal linux-3.4.11/include/net/route.h linux-3.4.11-vs2.3.3.8/in
  static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
  					      __be32 dst, __be32 src, u32 tos,
  					      int oif, u8 protocol,
-@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co
+@@ -260,11 +266,25 @@ static inline struct rtable *ip_route_co
  {
  	struct net *net = sock_net(sk);
  	struct rtable *rt;
@@ -13988,10 +13661,10 @@ diff -NurpP --minimal linux-3.4.11/include/net/route.h linux-3.4.11-vs2.3.3.8/in
  		rt = __ip_route_output_key(net, fl4);
  		if (IS_ERR(rt))
  			return rt;
-diff -NurpP --minimal linux-3.4.11/include/net/sock.h linux-3.4.11-vs2.3.3.8/include/net/sock.h
---- linux-3.4.11/include/net/sock.h	2012-05-21 18:07:33.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/include/net/sock.h	2012-05-21 18:15:05.000000000 +0200
-@@ -170,6 +170,10 @@ struct sock_common {
+diff -NurpP --minimal linux-3.6/include/net/sock.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/sock.h
+--- linux-3.6/include/net/sock.h	2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/sock.h	2012-10-04 18:47:00.000000000 +0200
+@@ -171,6 +171,10 @@ struct sock_common {
  #ifdef CONFIG_NET_NS
  	struct net	 	*skc_net;
  #endif
@@ -14002,7 +13675,7 @@ diff -NurpP --minimal linux-3.4.11/include/net/sock.h linux-3.4.11-vs2.3.3.8/inc
  	/*
  	 * fields between dontcopy_begin/dontcopy_end
  	 * are not copied in sock_copy()
-@@ -281,6 +285,10 @@ struct sock {
+@@ -284,6 +288,10 @@ struct sock {
  #define sk_bind_node		__sk_common.skc_bind_node
  #define sk_prot			__sk_common.skc_prot
  #define sk_net			__sk_common.skc_net
@@ -14013,10 +13686,10 @@ diff -NurpP --minimal linux-3.4.11/include/net/sock.h linux-3.4.11-vs2.3.3.8/inc
  	socket_lock_t		sk_lock;
  	struct sk_buff_head	sk_receive_queue;
  	/*
-diff -NurpP --minimal linux-3.4.11/init/Kconfig linux-3.4.11-vs2.3.3.8/init/Kconfig
---- linux-3.4.11/init/Kconfig	2012-05-21 18:07:33.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/init/Kconfig	2012-05-21 18:15:05.000000000 +0200
-@@ -579,6 +579,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
+diff -NurpP --minimal linux-3.6/init/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/init/Kconfig
+--- linux-3.6/init/Kconfig	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/init/Kconfig	2012-10-04 18:47:00.000000000 +0200
+@@ -624,6 +624,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
  menuconfig CGROUPS
  	boolean "Control Group support"
  	depends on EVENTFD
@@ -14024,29 +13697,29 @@ diff -NurpP --minimal linux-3.4.11/init/Kconfig linux-3.4.11-vs2.3.3.8/init/Kcon
  	help
  	  This option adds support for grouping sets of processes together, for
  	  use with process control subsystems such as Cpusets, CFS, memory
-@@ -828,6 +829,7 @@ config IPC_NS
- config USER_NS
+@@ -889,6 +890,7 @@ config USER_NS
  	bool "User namespace (EXPERIMENTAL)"
  	depends on EXPERIMENTAL
+ 	depends on UIDGID_CONVERTED
 +	depends on VSERVER_DISABLED
- 	default y
- 	help
- 	  This allows containers, i.e. vservers, to use user namespaces
-diff -NurpP --minimal linux-3.4.11/init/main.c linux-3.4.11-vs2.3.3.8/init/main.c
---- linux-3.4.11/init/main.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/init/main.c	2012-06-28 16:45:07.000000000 +0200
-@@ -68,6 +68,7 @@
- #include <linux/shmem_fs.h>
+ 	select UIDGID_STRICT_TYPE_CHECKS
+ 
+ 	default n
+diff -NurpP --minimal linux-3.6/init/main.c linux-3.6-vs2.3.4.3-noxfs-nocow/init/main.c
+--- linux-3.6/init/main.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/init/main.c	2012-10-04 18:51:41.000000000 +0200
+@@ -69,6 +69,7 @@
  #include <linux/slab.h>
  #include <linux/perf_event.h>
+ #include <linux/file.h>
 +#include <linux/vserver/percpu.h>
  
  #include <asm/io.h>
  #include <asm/bugs.h>
-diff -NurpP --minimal linux-3.4.11/ipc/mqueue.c linux-3.4.11-vs2.3.3.8/ipc/mqueue.c
---- linux-3.4.11/ipc/mqueue.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/ipc/mqueue.c	2012-05-21 18:15:05.000000000 +0200
-@@ -34,6 +34,8 @@
+diff -NurpP --minimal linux-3.6/ipc/mqueue.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/mqueue.c
+--- linux-3.6/ipc/mqueue.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/mqueue.c	2012-10-04 18:47:00.000000000 +0200
+@@ -35,6 +35,8 @@
  #include <linux/ipc_namespace.h>
  #include <linux/user_namespace.h>
  #include <linux/slab.h>
@@ -14055,31 +13728,31 @@ diff -NurpP --minimal linux-3.4.11/ipc/mqueue.c linux-3.4.11-vs2.3.3.8/ipc/mqueu
  
  #include <net/sock.h>
  #include "util.h"
-@@ -67,6 +69,7 @@ struct mqueue_inode_info {
- 	struct sigevent notify;
+@@ -76,6 +78,7 @@ struct mqueue_inode_info {
  	struct pid* notify_owner;
+ 	struct user_namespace *notify_user_ns;
  	struct user_struct *user;	/* user who created, for accounting */
 +	struct vx_info *vxi;
  	struct sock *notify_sock;
  	struct sk_buff *notify_cookie;
  
-@@ -129,6 +132,7 @@ static struct inode *mqueue_get_inode(st
+@@ -235,6 +238,7 @@ static struct inode *mqueue_get_inode(st
  	if (S_ISREG(mode)) {
  		struct mqueue_inode_info *info;
- 		unsigned long mq_bytes, mq_msg_tblsz;
+ 		unsigned long mq_bytes, mq_treesize;
 +		struct vx_info *vxi = current_vx_info();
  
  		inode->i_fop = &mqueue_file_operations;
  		inode->i_size = FILENT_SIZE;
-@@ -141,6 +145,7 @@ static struct inode *mqueue_get_inode(st
- 		info->notify_owner = NULL;
+@@ -248,6 +252,7 @@ static struct inode *mqueue_get_inode(st
+ 		info->notify_user_ns = NULL;
  		info->qsize = 0;
  		info->user = NULL;	/* set when all is ok */
 +		info->vxi = NULL;
+ 		info->msg_tree = RB_ROOT;
+ 		info->node_cache = NULL;
  		memset(&info->attr, 0, sizeof(info->attr));
- 		info->attr.mq_maxmsg = ipc_ns->mq_msg_max;
- 		info->attr.mq_msgsize = ipc_ns->mq_msgsize_max;
-@@ -158,17 +163,20 @@ static struct inode *mqueue_get_inode(st
+@@ -281,17 +286,20 @@ static struct inode *mqueue_get_inode(st
  
  		spin_lock(&mq_lock);
  		if (u->mq_bytes + mq_bytes < u->mq_bytes ||
@@ -14101,8 +13774,8 @@ diff -NurpP --minimal linux-3.4.11/ipc/mqueue.c linux-3.4.11-vs2.3.3.8/ipc/mqueu
  	} else if (S_ISDIR(mode)) {
  		inc_nlink(inode);
  		/* Some things misbehave if size == 0 on a directory */
-@@ -267,8 +275,11 @@ static void mqueue_evict_inode(struct in
- 	    + info->attr.mq_msgsize);
+@@ -395,8 +403,11 @@ static void mqueue_evict_inode(struct in
+ 
  	user = info->user;
  	if (user) {
 +		struct vx_info *vxi = info->vxi;
@@ -14113,7 +13786,7 @@ diff -NurpP --minimal linux-3.4.11/ipc/mqueue.c linux-3.4.11-vs2.3.3.8/ipc/mqueu
  		/*
  		 * get_ns_from_inode() ensures that the
  		 * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
-@@ -278,6 +289,7 @@ static void mqueue_evict_inode(struct in
+@@ -406,6 +417,7 @@ static void mqueue_evict_inode(struct in
  		if (ipc_ns)
  			ipc_ns->mq_queues_count--;
  		spin_unlock(&mq_lock);
@@ -14121,9 +13794,9 @@ diff -NurpP --minimal linux-3.4.11/ipc/mqueue.c linux-3.4.11-vs2.3.3.8/ipc/mqueu
  		free_uid(user);
  	}
  	if (ipc_ns)
-diff -NurpP --minimal linux-3.4.11/ipc/msg.c linux-3.4.11-vs2.3.3.8/ipc/msg.c
---- linux-3.4.11/ipc/msg.c	2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/ipc/msg.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/ipc/msg.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/msg.c
+--- linux-3.6/ipc/msg.c	2011-05-22 16:17:59.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/msg.c	2012-10-04 18:47:00.000000000 +0200
 @@ -37,6 +37,7 @@
  #include <linux/rwsem.h>
  #include <linux/nsproxy.h>
@@ -14140,9 +13813,9 @@ diff -NurpP --minimal linux-3.4.11/ipc/msg.c linux-3.4.11-vs2.3.3.8/ipc/msg.c
  
  	msq->q_perm.security = NULL;
  	retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.4.11/ipc/namespace.c linux-3.4.11-vs2.3.3.8/ipc/namespace.c
---- linux-3.4.11/ipc/namespace.c	2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/ipc/namespace.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/ipc/namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/namespace.c
+--- linux-3.6/ipc/namespace.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/namespace.c	2012-10-04 18:47:00.000000000 +0200
 @@ -13,11 +13,12 @@
  #include <linux/mount.h>
  #include <linux/user_namespace.h>
@@ -14158,11 +13831,12 @@ diff -NurpP --minimal linux-3.4.11/ipc/namespace.c linux-3.4.11-vs2.3.3.8/ipc/na
  {
  	struct ipc_namespace *ns;
  	int err;
-@@ -46,19 +47,18 @@ static struct ipc_namespace *create_ipc_
+@@ -46,19 +47,19 @@ static struct ipc_namespace *create_ipc_
  	ipcns_notify(IPCNS_CREATED);
  	register_ipcns_notifier(ns);
  
--	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
+-	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
++	// ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
 +	ns->user_ns = get_user_ns(user_ns);
  
  	return ns;
@@ -14183,9 +13857,9 @@ diff -NurpP --minimal linux-3.4.11/ipc/namespace.c linux-3.4.11-vs2.3.3.8/ipc/na
  }
  
  /*
-diff -NurpP --minimal linux-3.4.11/ipc/sem.c linux-3.4.11-vs2.3.3.8/ipc/sem.c
---- linux-3.4.11/ipc/sem.c	2012-01-09 16:14:59.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/ipc/sem.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/ipc/sem.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/sem.c
+--- linux-3.6/ipc/sem.c	2012-01-09 16:14:59.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/sem.c	2012-10-04 18:47:00.000000000 +0200
 @@ -86,6 +86,8 @@
  #include <linux/rwsem.h>
  #include <linux/nsproxy.h>
@@ -14223,9 +13897,9 @@ diff -NurpP --minimal linux-3.4.11/ipc/sem.c linux-3.4.11-vs2.3.3.8/ipc/sem.c
  	security_sem_free(sma);
  	ipc_rcu_putref(sma);
  }
-diff -NurpP --minimal linux-3.4.11/ipc/shm.c linux-3.4.11-vs2.3.3.8/ipc/shm.c
---- linux-3.4.11/ipc/shm.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/ipc/shm.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/ipc/shm.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/shm.c
+--- linux-3.6/ipc/shm.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/shm.c	2012-10-04 18:47:00.000000000 +0200
 @@ -39,6 +39,8 @@
  #include <linux/nsproxy.h>
  #include <linux/mount.h>
@@ -14257,7 +13931,7 @@ diff -NurpP --minimal linux-3.4.11/ipc/shm.c linux-3.4.11-vs2.3.3.8/ipc/shm.c
  	ipc_rcu_putref(shp);
  }
  
-@@ -462,11 +470,15 @@ static int newseg(struct ipc_namespace *
+@@ -474,11 +482,15 @@ static int newseg(struct ipc_namespace *
  	if (ns->shm_tot + numpages > ns->shm_ctlall)
  		return -ENOSPC;
  
@@ -14273,7 +13947,7 @@ diff -NurpP --minimal linux-3.4.11/ipc/shm.c linux-3.4.11-vs2.3.3.8/ipc/shm.c
  	shp->shm_perm.mode = (shmflg & S_IRWXUGO);
  	shp->mlock_user = NULL;
  
-@@ -521,6 +533,7 @@ static int newseg(struct ipc_namespace *
+@@ -533,6 +545,7 @@ static int newseg(struct ipc_namespace *
  	ns->shm_tot += numpages;
  	error = shp->shm_perm.id;
  	shm_unlock(shp);
@@ -14281,21 +13955,21 @@ diff -NurpP --minimal linux-3.4.11/ipc/shm.c linux-3.4.11-vs2.3.3.8/ipc/shm.c
  	return error;
  
  no_id:
-diff -NurpP --minimal linux-3.4.11/kernel/Makefile linux-3.4.11-vs2.3.3.8/kernel/Makefile
---- linux-3.4.11/kernel/Makefile	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/Makefile	2012-05-21 18:15:05.000000000 +0200
-@@ -25,6 +25,7 @@ endif
+diff -NurpP --minimal linux-3.6/kernel/Makefile linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/Makefile
+--- linux-3.6/kernel/Makefile	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/Makefile	2012-10-04 18:47:00.000000000 +0200
+@@ -24,6 +24,7 @@ endif
+ 
  obj-y += sched/
  obj-y += power/
- 
 +obj-y += vserver/
- obj-$(CONFIG_FREEZER) += freezer.o
- obj-$(CONFIG_PROFILING) += profile.o
- obj-$(CONFIG_STACKTRACE) += stacktrace.o
-diff -NurpP --minimal linux-3.4.11/kernel/auditsc.c linux-3.4.11-vs2.3.3.8/kernel/auditsc.c
---- linux-3.4.11/kernel/auditsc.c	2012-03-19 19:47:29.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/auditsc.c	2012-05-21 18:15:05.000000000 +0200
-@@ -2308,7 +2308,7 @@ int audit_set_loginuid(uid_t loginuid)
+ 
+ ifeq ($(CONFIG_CHECKPOINT_RESTORE),y)
+ obj-$(CONFIG_X86) += kcmp.o
+diff -NurpP --minimal linux-3.6/kernel/auditsc.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/auditsc.c
+--- linux-3.6/kernel/auditsc.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/auditsc.c	2012-10-04 18:47:00.000000000 +0200
+@@ -2309,7 +2309,7 @@ int audit_set_loginuid(uid_t loginuid)
  	if (task->loginuid != -1)
  		return -EPERM;
  #else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
@@ -14304,9 +13978,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/auditsc.c linux-3.4.11-vs2.3.3.8/kerne
  		return -EPERM;
  #endif  /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
  
-diff -NurpP --minimal linux-3.4.11/kernel/capability.c linux-3.4.11-vs2.3.3.8/kernel/capability.c
---- linux-3.4.11/kernel/capability.c	2012-03-19 19:47:29.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/capability.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/capability.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/capability.c
+--- linux-3.6/kernel/capability.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/capability.c	2012-10-04 18:47:00.000000000 +0200
 @@ -15,6 +15,7 @@
  #include <linux/syscalls.h>
  #include <linux/pid_namespace.h>
@@ -14332,9 +14006,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/capability.c linux-3.4.11-vs2.3.3.8/ke
  /**
   * has_capability_noaudit - Does a task have a capability (unaudited) in the
   * initial user ns
-diff -NurpP --minimal linux-3.4.11/kernel/compat.c linux-3.4.11-vs2.3.3.8/kernel/compat.c
---- linux-3.4.11/kernel/compat.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/compat.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/compat.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/compat.c
+--- linux-3.6/kernel/compat.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/compat.c	2012-10-04 18:47:00.000000000 +0200
 @@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_
  	if (err)
  		return err;
@@ -14344,10 +14018,10 @@ diff -NurpP --minimal linux-3.4.11/kernel/compat.c linux-3.4.11-vs2.3.3.8/kernel
  	return 0;
  }
  
-diff -NurpP --minimal linux-3.4.11/kernel/cred.c linux-3.4.11-vs2.3.3.8/kernel/cred.c
---- linux-3.4.11/kernel/cred.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/cred.c	2012-05-21 18:15:05.000000000 +0200
-@@ -62,31 +62,6 @@ struct cred init_cred = {
+diff -NurpP --minimal linux-3.6/kernel/cred.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/cred.c
+--- linux-3.6/kernel/cred.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/cred.c	2012-10-04 18:47:00.000000000 +0200
+@@ -70,31 +70,6 @@ struct cred init_cred = {
  #endif
  };
  
@@ -14379,7 +14053,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/cred.c linux-3.4.11-vs2.3.3.8/kernel/c
  /*
   * Dispose of the shared task group credentials
   */
-@@ -282,21 +257,16 @@ error:
+@@ -284,21 +259,16 @@ error:
   *
   * Call commit_creds() or abort_creds() to clean up.
   */
@@ -14402,7 +14076,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/cred.c linux-3.4.11-vs2.3.3.8/kernel/c
  	memcpy(new, old, sizeof(struct cred));
  
  	atomic_set(&new->usage, 1);
-@@ -323,6 +293,13 @@ error:
+@@ -326,6 +296,13 @@ error:
  	abort_creds(new);
  	return NULL;
  }
@@ -14416,9 +14090,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/cred.c linux-3.4.11-vs2.3.3.8/kernel/c
  EXPORT_SYMBOL(prepare_creds);
  
  /*
-diff -NurpP --minimal linux-3.4.11/kernel/exit.c linux-3.4.11-vs2.3.3.8/kernel/exit.c
---- linux-3.4.11/kernel/exit.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/exit.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/exit.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/exit.c
+--- linux-3.6/kernel/exit.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/exit.c	2012-10-04 18:47:00.000000000 +0200
 @@ -48,6 +48,10 @@
  #include <linux/fs_struct.h>
  #include <linux/init_task.h>
@@ -14430,7 +14104,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/exit.c linux-3.4.11-vs2.3.3.8/kernel/e
  #include <trace/events/sched.h>
  #include <linux/hw_breakpoint.h>
  #include <linux/oom.h>
-@@ -482,9 +486,11 @@ static void close_files(struct files_str
+@@ -494,9 +498,11 @@ static void close_files(struct files_str
  					filp_close(file, files);
  					cond_resched();
  				}
@@ -14442,7 +14116,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/exit.c linux-3.4.11-vs2.3.3.8/kernel/e
  		}
  	}
  }
-@@ -1013,6 +1019,9 @@ void do_exit(long code)
+@@ -1018,6 +1024,9 @@ void do_exit(long code)
  	 */
  	ptrace_put_breakpoints(tsk);
  
@@ -14452,7 +14126,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/exit.c linux-3.4.11-vs2.3.3.8/kernel/e
  	exit_notify(tsk, group_dead);
  #ifdef CONFIG_NUMA
  	task_lock(tsk);
-@@ -1063,10 +1072,15 @@ void do_exit(long code)
+@@ -1068,10 +1077,15 @@ void do_exit(long code)
  	smp_mb();
  	raw_spin_unlock_wait(&tsk->pi_lock);
  
@@ -14468,29 +14142,29 @@ diff -NurpP --minimal linux-3.4.11/kernel/exit.c linux-3.4.11-vs2.3.3.8/kernel/e
  	BUG();
  	/* Avoid "noreturn function does return".  */
  	for (;;)
-diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/kernel/fork.c
---- linux-3.4.11/kernel/fork.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/fork.c	2012-06-28 16:45:07.000000000 +0200
-@@ -68,6 +68,9 @@
- #include <linux/oom.h>
+diff -NurpP --minimal linux-3.6/kernel/fork.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/fork.c
+--- linux-3.6/kernel/fork.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/fork.c	2012-10-04 18:47:00.000000000 +0200
+@@ -70,6 +70,9 @@
  #include <linux/khugepaged.h>
  #include <linux/signalfd.h>
+ #include <linux/uprobes.h>
 +#include <linux/vs_context.h>
 +#include <linux/vs_network.h>
 +#include <linux/vs_limit.h>
  
  #include <asm/pgtable.h>
  #include <asm/pgalloc.h>
-@@ -170,6 +173,8 @@ void free_task(struct task_struct *tsk)
- 	account_kernel_stack(tsk->stack, -1);
+@@ -210,6 +213,8 @@ void free_task(struct task_struct *tsk)
+ 	arch_release_thread_info(tsk->stack);
  	free_thread_info(tsk->stack);
  	rt_mutex_debug_task_free(tsk);
 +	clr_vx_info(&tsk->vx_info);
 +	clr_nx_info(&tsk->nx_info);
  	ftrace_graph_exit_task(tsk);
- 	free_task_struct(tsk);
- }
-@@ -507,6 +512,7 @@ static struct mm_struct *mm_init(struct 
+ 	put_seccomp_filter(tsk);
+ 	arch_release_task_struct(tsk);
+@@ -541,6 +546,7 @@ static struct mm_struct *mm_init(struct 
  	if (likely(!mm_alloc_pgd(mm))) {
  		mm->def_flags = 0;
  		mmu_notifier_mm_init(mm);
@@ -14498,7 +14172,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/kernel/f
  		return mm;
  	}
  
-@@ -559,6 +565,7 @@ void __mmdrop(struct mm_struct *mm)
+@@ -593,6 +599,7 @@ void __mmdrop(struct mm_struct *mm)
  	destroy_context(mm);
  	mmu_notifier_mm_destroy(mm);
  	check_mm(mm);
@@ -14506,15 +14180,15 @@ diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/kernel/f
  	free_mm(mm);
  }
  EXPORT_SYMBOL_GPL(__mmdrop);
-@@ -794,6 +801,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -834,6 +841,7 @@ struct mm_struct *dup_mm(struct task_str
  		goto fail_nomem;
  
  	memcpy(mm, oldmm, sizeof(*mm));
 +	mm->mm_vx_info = NULL;
  	mm_init_cpumask(mm);
  
- 	/* Initializing for Swap token stuff */
-@@ -837,6 +845,7 @@ fail_nocontext:
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+@@ -874,6 +882,7 @@ fail_nocontext:
  	 * If init_new_context() failed, we cannot use mmput() to free the mm
  	 * because it calls destroy_context()
  	 */
@@ -14522,7 +14196,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/kernel/f
  	mm_free_pgd(mm);
  	free_mm(mm);
  	return NULL;
-@@ -1125,6 +1134,8 @@ static struct task_struct *copy_process(
+@@ -1157,6 +1166,8 @@ static struct task_struct *copy_process(
  	int retval;
  	struct task_struct *p;
  	int cgroup_callbacks_done = 0;
@@ -14531,7 +14205,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/kernel/f
  
  	if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
  		return ERR_PTR(-EINVAL);
-@@ -1171,7 +1182,12 @@ static struct task_struct *copy_process(
+@@ -1204,7 +1215,12 @@ static struct task_struct *copy_process(
  	DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
  	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
  #endif
@@ -14544,7 +14218,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/kernel/f
  	if (atomic_read(&p->real_cred->user->processes) >=
  			task_rlimit(p, RLIMIT_NPROC)) {
  		if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
-@@ -1448,6 +1464,18 @@ static struct task_struct *copy_process(
+@@ -1483,6 +1499,18 @@ static struct task_struct *copy_process(
  
  	total_forks++;
  	spin_unlock(&current->sighand->siglock);
@@ -14563,9 +14237,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/fork.c linux-3.4.11-vs2.3.3.8/kernel/f
  	write_unlock_irq(&tasklist_lock);
  	proc_fork_connector(p);
  	cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.4.11/kernel/kthread.c linux-3.4.11-vs2.3.3.8/kernel/kthread.c
---- linux-3.4.11/kernel/kthread.c	2012-03-19 19:47:30.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/kthread.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/kthread.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/kthread.c
+--- linux-3.6/kernel/kthread.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/kthread.c	2012-10-04 18:47:00.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/mutex.h>
  #include <linux/slab.h>
@@ -14574,9 +14248,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/kthread.c linux-3.4.11-vs2.3.3.8/kerne
  #include <trace/events/sched.h>
  
  static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.4.11/kernel/nsproxy.c linux-3.4.11-vs2.3.3.8/kernel/nsproxy.c
---- linux-3.4.11/kernel/nsproxy.c	2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/nsproxy.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/nsproxy.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/nsproxy.c
+--- linux-3.6/kernel/nsproxy.c	2012-01-09 16:15:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/nsproxy.c	2012-10-04 18:47:00.000000000 +0200
 @@ -20,11 +20,14 @@
  #include <linux/mnt_namespace.h>
  #include <linux/utsname.h>
@@ -14664,7 +14338,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/nsproxy.c linux-3.4.11-vs2.3.3.8/kerne
 +			struct task_struct *tsk, struct fs_struct *new_fs)
 +{
 +	return unshare_namespaces(flags, tsk->nsproxy,
-+		new_fs, task_cred_xxx(tsk, user)->user_ns,
++		new_fs, task_cred_xxx(tsk, user_ns),
 +		task_active_pid_ns(tsk));
 +}
 +
@@ -14758,9 +14432,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/nsproxy.c linux-3.4.11-vs2.3.3.8/kerne
  		return -EPERM;
  
  	*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.4.11/kernel/pid.c linux-3.4.11-vs2.3.3.8/kernel/pid.c
---- linux-3.4.11/kernel/pid.c	2012-03-19 19:47:30.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/pid.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/pid.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/pid.c
+--- linux-3.6/kernel/pid.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/pid.c	2012-10-04 18:47:00.000000000 +0200
 @@ -36,6 +36,7 @@
  #include <linux/pid_namespace.h>
  #include <linux/init_task.h>
@@ -14818,9 +14492,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/pid.c linux-3.4.11-vs2.3.3.8/kernel/pi
  pid_t pid_vnr(struct pid *pid)
  {
  	return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.4.11/kernel/pid_namespace.c linux-3.4.11-vs2.3.3.8/kernel/pid_namespace.c
---- linux-3.4.11/kernel/pid_namespace.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/pid_namespace.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/pid_namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/pid_namespace.c
+--- linux-3.6/kernel/pid_namespace.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/pid_namespace.c	2012-10-04 18:47:00.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/slab.h>
  #include <linux/proc_fs.h>
@@ -14845,9 +14519,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/pid_namespace.c linux-3.4.11-vs2.3.3.8
  	kmem_cache_free(pid_ns_cachep, ns);
  }
  
-diff -NurpP --minimal linux-3.4.11/kernel/posix-timers.c linux-3.4.11-vs2.3.3.8/kernel/posix-timers.c
---- linux-3.4.11/kernel/posix-timers.c	2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/posix-timers.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/posix-timers.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/posix-timers.c
+--- linux-3.6/kernel/posix-timers.c	2012-01-09 16:15:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/posix-timers.c	2012-10-04 18:47:00.000000000 +0200
 @@ -47,6 +47,7 @@
  #include <linux/wait.h>
  #include <linux/workqueue.h>
@@ -14883,18 +14557,18 @@ diff -NurpP --minimal linux-3.4.11/kernel/posix-timers.c linux-3.4.11-vs2.3.3.8/
  	/* If we failed to send the signal the timer stops. */
  	return ret > 0;
  }
-diff -NurpP --minimal linux-3.4.11/kernel/printk.c linux-3.4.11-vs2.3.3.8/kernel/printk.c
---- linux-3.4.11/kernel/printk.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/printk.c	2012-05-21 18:15:05.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <linux/cpu.h>
+diff -NurpP --minimal linux-3.6/kernel/printk.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/printk.c
+--- linux-3.6/kernel/printk.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/printk.c	2012-10-04 18:47:00.000000000 +0200
+@@ -42,6 +42,7 @@
  #include <linux/notifier.h>
  #include <linux/rculist.h>
+ #include <linux/poll.h>
 +#include <linux/vs_cvirt.h>
  
  #include <asm/uaccess.h>
  
-@@ -317,7 +318,7 @@ static int check_syslog_permissions(int 
+@@ -818,7 +819,7 @@ static int check_syslog_permissions(int 
  		return 0;
  
  	if (syslog_action_restricted(type)) {
@@ -14903,7 +14577,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/printk.c linux-3.4.11-vs2.3.3.8/kernel
  			return 0;
  		/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
  		if (capable(CAP_SYS_ADMIN)) {
-@@ -347,12 +348,9 @@ int do_syslog(int type, char __user *buf
+@@ -1111,12 +1112,9 @@ int do_syslog(int type, char __user *buf
  	if (error)
  		return error;
  
@@ -14919,7 +14593,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/printk.c linux-3.4.11-vs2.3.3.8/kernel
  		error = -EINVAL;
  		if (!buf || len < 0)
  			goto out;
-@@ -363,6 +361,16 @@ int do_syslog(int type, char __user *buf
+@@ -1127,6 +1125,16 @@ int do_syslog(int type, char __user *buf
  			error = -EFAULT;
  			goto out;
  		}
@@ -14934,9 +14608,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/printk.c linux-3.4.11-vs2.3.3.8/kernel
 +		break;
 +	case SYSLOG_ACTION_READ:	/* Read from log */
  		error = wait_event_interruptible(log_wait,
- 							(log_start - log_end));
+ 						 syslog_seq != log_next_seq);
  		if (error)
-@@ -389,16 +397,6 @@ int do_syslog(int type, char __user *buf
+@@ -1139,16 +1147,6 @@ int do_syslog(int type, char __user *buf
  		/* FALL THRU */
  	/* Read last kernel messages */
  	case SYSLOG_ACTION_READ_ALL:
@@ -14950,12 +14624,12 @@ diff -NurpP --minimal linux-3.4.11/kernel/printk.c linux-3.4.11-vs2.3.3.8/kernel
 -			error = -EFAULT;
 -			goto out;
 -		}
- 		count = len;
- 		if (count > log_buf_len)
- 			count = log_buf_len;
-diff -NurpP --minimal linux-3.4.11/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/kernel/ptrace.c
---- linux-3.4.11/kernel/ptrace.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/ptrace.c	2012-05-21 18:15:05.000000000 +0200
+ 		error = syslog_print_all(buf, len, clear);
+ 		break;
+ 	/* Clear ring buffer */
+diff -NurpP --minimal linux-3.6/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/ptrace.c
+--- linux-3.6/kernel/ptrace.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/ptrace.c	2012-10-04 18:47:00.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/syscalls.h>
  #include <linux/uaccess.h>
@@ -14964,7 +14638,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/kernel
  #include <linux/hw_breakpoint.h>
  #include <linux/cn_proc.h>
  
-@@ -217,6 +218,11 @@ ok:
+@@ -216,6 +217,11 @@ ok:
  		dumpable = get_dumpable(task->mm);
  	if (!dumpable  && !ptrace_has_cap(task_user_ns(task), mode))
  		return -EPERM;
@@ -14976,9 +14650,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/ptrace.c linux-3.4.11-vs2.3.3.8/kernel
  
  	return security_ptrace_access_check(task, mode);
  }
-diff -NurpP --minimal linux-3.4.11/kernel/sched/core.c linux-3.4.11-vs2.3.3.8/kernel/sched/core.c
---- linux-3.4.11/kernel/sched/core.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/sched/core.c	2012-09-16 20:49:11.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/sched/core.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sched/core.c
+--- linux-3.6/kernel/sched/core.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sched/core.c	2012-10-04 18:47:00.000000000 +0200
 @@ -72,6 +72,8 @@
  #include <linux/slab.h>
  #include <linux/init_task.h>
@@ -14988,7 +14662,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sched/core.c linux-3.4.11-vs2.3.3.8/ke
  
  #include <asm/switch_to.h>
  #include <asm/tlb.h>
-@@ -2225,9 +2227,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
+@@ -2223,9 +2225,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
   */
  void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
  {
@@ -15009,7 +14683,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sched/core.c linux-3.4.11-vs2.3.3.8/ke
  }
  
  static long calc_load_fold_active(struct rq *this_rq)
-@@ -2796,14 +2806,17 @@ static inline void task_group_account_fi
+@@ -2854,14 +2864,17 @@ static inline void task_group_account_fi
  void account_user_time(struct task_struct *p, cputime_t cputime,
  		       cputime_t cputime_scaled)
  {
@@ -15028,7 +14702,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sched/core.c linux-3.4.11-vs2.3.3.8/ke
  
  	/* Add user time to cpustat. */
  	task_group_account_field(p, index, (__force u64) cputime);
-@@ -2850,9 +2863,12 @@ static inline
+@@ -2908,9 +2921,12 @@ static inline
  void __account_system_time(struct task_struct *p, cputime_t cputime,
  			cputime_t cputime_scaled, int index)
  {
@@ -15041,7 +14715,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sched/core.c linux-3.4.11-vs2.3.3.8/ke
  	account_group_system_time(p, cputime);
  
  	/* Add system time to cpustat. */
-@@ -4078,7 +4094,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4137,7 +4153,7 @@ SYSCALL_DEFINE1(nice, int, increment)
  		nice = 19;
  
  	if (increment < 0 && !can_nice(current, nice))
@@ -15050,9 +14724,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/sched/core.c linux-3.4.11-vs2.3.3.8/ke
  
  	retval = security_task_setnice(current, nice);
  	if (retval)
-diff -NurpP --minimal linux-3.4.11/kernel/sched/fair.c linux-3.4.11-vs2.3.3.8/kernel/sched/fair.c
---- linux-3.4.11/kernel/sched/fair.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/sched/fair.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/sched/fair.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sched/fair.c
+--- linux-3.6/kernel/sched/fair.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sched/fair.c	2012-10-04 18:47:00.000000000 +0200
 @@ -26,6 +26,7 @@
  #include <linux/slab.h>
  #include <linux/profile.h>
@@ -15079,13 +14753,13 @@ diff -NurpP --minimal linux-3.4.11/kernel/sched/fair.c linux-3.4.11-vs2.3.3.8/ke
  	update_cfs_load(cfs_rq, 0);
  	account_entity_dequeue(cfs_rq, se);
  
-diff -NurpP --minimal linux-3.4.11/kernel/signal.c linux-3.4.11-vs2.3.3.8/kernel/signal.c
---- linux-3.4.11/kernel/signal.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/signal.c	2012-05-21 18:15:05.000000000 +0200
-@@ -29,6 +29,8 @@
- #include <linux/pid_namespace.h>
+diff -NurpP --minimal linux-3.6/kernel/signal.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/signal.c
+--- linux-3.6/kernel/signal.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/signal.c	2012-10-04 18:47:00.000000000 +0200
+@@ -30,6 +30,8 @@
  #include <linux/nsproxy.h>
  #include <linux/user_namespace.h>
+ #include <linux/uprobes.h>
 +#include <linux/vs_context.h>
 +#include <linux/vs_pid.h>
  #define CREATE_TRACE_POINTS
@@ -15131,7 +14805,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/signal.c linux-3.4.11-vs2.3.3.8/kernel
  	return security_task_kill(t, info, sig, 0);
  }
  
-@@ -1358,7 +1383,7 @@ int kill_pid_info(int sig, struct siginf
+@@ -1351,7 +1376,7 @@ int kill_pid_info(int sig, struct siginf
  	rcu_read_lock();
  retry:
  	p = pid_task(pid, PIDTYPE_PID);
@@ -15140,7 +14814,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/signal.c linux-3.4.11-vs2.3.3.8/kernel
  		error = group_send_sig_info(sig, info, p);
  		if (unlikely(error == -ESRCH))
  			/*
-@@ -1408,7 +1433,7 @@ int kill_pid_info_as_cred(int sig, struc
+@@ -1399,7 +1424,7 @@ int kill_pid_info_as_cred(int sig, struc
  
  	rcu_read_lock();
  	p = pid_task(pid, PIDTYPE_PID);
@@ -15149,7 +14823,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/signal.c linux-3.4.11-vs2.3.3.8/kernel
  		ret = -ESRCH;
  		goto out_unlock;
  	}
-@@ -1460,8 +1485,10 @@ static int kill_something_info(int sig, 
+@@ -1451,8 +1476,10 @@ static int kill_something_info(int sig, 
  		struct task_struct * p;
  
  		for_each_process(p) {
@@ -15162,7 +14836,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/signal.c linux-3.4.11-vs2.3.3.8/kernel
  				int err = group_send_sig_info(sig, info, p);
  				++count;
  				if (err != -EPERM)
-@@ -2310,6 +2337,11 @@ relock:
+@@ -2317,6 +2344,11 @@ relock:
  				!sig_kernel_only(signr))
  			continue;
  
@@ -15174,9 +14848,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/signal.c linux-3.4.11-vs2.3.3.8/kernel
  		if (sig_kernel_stop(signr)) {
  			/*
  			 * The default action is to stop all threads in
-diff -NurpP --minimal linux-3.4.11/kernel/softirq.c linux-3.4.11-vs2.3.3.8/kernel/softirq.c
---- linux-3.4.11/kernel/softirq.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/softirq.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/softirq.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/softirq.c
+--- linux-3.6/kernel/softirq.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/softirq.c	2012-10-04 18:47:00.000000000 +0200
 @@ -24,6 +24,7 @@
  #include <linux/ftrace.h>
  #include <linux/smp.h>
@@ -15185,10 +14859,10 @@ diff -NurpP --minimal linux-3.4.11/kernel/softirq.c linux-3.4.11-vs2.3.3.8/kerne
  
  #define CREATE_TRACE_POINTS
  #include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sys.c
---- linux-3.4.11/kernel/sys.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/sys.c	2012-05-21 18:15:05.000000000 +0200
-@@ -45,6 +45,7 @@
+diff -NurpP --minimal linux-3.6/kernel/sys.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sys.c
+--- linux-3.6/kernel/sys.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sys.c	2012-10-04 18:47:00.000000000 +0200
+@@ -47,6 +47,7 @@
  #include <linux/syscalls.h>
  #include <linux/kprobes.h>
  #include <linux/user_namespace.h>
@@ -15196,7 +14870,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy
  
  #include <linux/kmsg_dump.h>
  /* Move somewhere else to avoid recompiling? */
-@@ -155,7 +156,10 @@ static int set_one_prio(struct task_stru
+@@ -154,7 +155,10 @@ static int set_one_prio(struct task_stru
  		goto out;
  	}
  	if (niceval < task_nice(p) && !can_nice(p, niceval)) {
@@ -15217,7 +14891,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy
  				error = set_one_prio(p, niceval, error);
  			} while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
  			break;
-@@ -268,6 +274,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+@@ -270,6 +276,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
  			else
  				pgrp = task_pgrp(current);
  			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -15226,7 +14900,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy
  				niceval = 20 - task_nice(p);
  				if (niceval > retval)
  					retval = niceval;
-@@ -418,6 +426,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
+@@ -421,6 +429,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
  
  static DEFINE_MUTEX(reboot_mutex);
  
@@ -15235,7 +14909,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy
  /*
   * Reboot system call: for obvious reasons only root may call it,
   * and even root needs to set up some magic numbers in the registers
-@@ -459,6 +469,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+@@ -462,6 +472,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
  	if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
  		cmd = LINUX_REBOOT_CMD_HALT;
  
@@ -15245,7 +14919,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy
  	mutex_lock(&reboot_mutex);
  	switch (cmd) {
  	case LINUX_REBOOT_CMD_RESTART:
-@@ -1282,7 +1295,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+@@ -1367,7 +1380,8 @@ SYSCALL_DEFINE2(sethostname, char __user
  	int errno;
  	char tmp[__NEW_UTS_LEN];
  
@@ -15255,7 +14929,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy
  		return -EPERM;
  
  	if (len < 0 || len > __NEW_UTS_LEN)
-@@ -1333,7 +1347,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+@@ -1418,7 +1432,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
  	int errno;
  	char tmp[__NEW_UTS_LEN];
  
@@ -15265,7 +14939,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy
  		return -EPERM;
  	if (len < 0 || len > __NEW_UTS_LEN)
  		return -EINVAL;
-@@ -1452,7 +1467,7 @@ int do_prlimit(struct task_struct *tsk, 
+@@ -1537,7 +1552,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 &&
@@ -15274,20 +14948,20 @@ diff -NurpP --minimal linux-3.4.11/kernel/sys.c linux-3.4.11-vs2.3.3.8/kernel/sy
  			retval = -EPERM;
  		if (!retval)
  			retval = security_task_setrlimit(tsk->group_leader,
-@@ -1506,7 +1521,8 @@ static int check_prlimit_permission(stru
- 	     cred->gid == tcred->sgid &&
- 	     cred->gid == tcred->gid))
+@@ -1590,7 +1605,8 @@ static int check_prlimit_permission(stru
+ 	    gid_eq(cred->gid, tcred->sgid) &&
+ 	    gid_eq(cred->gid, tcred->gid))
  		return 0;
--	if (ns_capable(tcred->user->user_ns, CAP_SYS_RESOURCE))
-+	if (vx_ns_capable(tcred->user->user_ns,
+-	if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
++	if (vx_ns_capable(tcred->user_ns,
 +		CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
  		return 0;
  
  	return -EPERM;
-diff -NurpP --minimal linux-3.4.11/kernel/sysctl.c linux-3.4.11-vs2.3.3.8/kernel/sysctl.c
---- linux-3.4.11/kernel/sysctl.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/sysctl.c	2012-05-21 18:15:05.000000000 +0200
-@@ -81,6 +81,7 @@
+diff -NurpP --minimal linux-3.6/kernel/sysctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sysctl.c
+--- linux-3.6/kernel/sysctl.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sysctl.c	2012-10-04 18:47:00.000000000 +0200
+@@ -82,6 +82,7 @@
  #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
  #include <linux/lockdep.h>
  #endif
@@ -15295,7 +14969,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/sysctl.c linux-3.4.11-vs2.3.3.8/kernel
  #ifdef CONFIG_CHR_DEV_SG
  #include <scsi/sg.h>
  #endif
-@@ -562,6 +563,13 @@ static struct ctl_table kern_table[] = {
+@@ -568,6 +569,13 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= proc_dostring,
  	},
  #endif
@@ -15309,9 +14983,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/sysctl.c linux-3.4.11-vs2.3.3.8/kernel
  #ifdef CONFIG_CHR_DEV_SG
  	{
  		.procname	= "sg-big-buff",
-diff -NurpP --minimal linux-3.4.11/kernel/sysctl_binary.c linux-3.4.11-vs2.3.3.8/kernel/sysctl_binary.c
---- linux-3.4.11/kernel/sysctl_binary.c	2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/sysctl_binary.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/sysctl_binary.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sysctl_binary.c
+--- linux-3.6/kernel/sysctl_binary.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sysctl_binary.c	2012-10-04 18:47:00.000000000 +0200
 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
  
  	{ CTL_INT,	KERN_PANIC,			"panic" },
@@ -15320,20 +14994,20 @@ diff -NurpP --minimal linux-3.4.11/kernel/sysctl_binary.c linux-3.4.11-vs2.3.3.8
  
  	{ CTL_STR,	KERN_SPARC_REBOOT,		"reboot-cmd" },
  	{ CTL_INT,	KERN_CTLALTDEL,			"ctrl-alt-del" },
-diff -NurpP --minimal linux-3.4.11/kernel/time/timekeeping.c linux-3.4.11-vs2.3.3.8/kernel/time/timekeeping.c
---- linux-3.4.11/kernel/time/timekeeping.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/time/timekeeping.c	2012-07-24 11:52:30.000000000 +0200
-@@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts)
- 	} while (read_seqretry(&timekeeper.lock, seq));
+diff -NurpP --minimal linux-3.6/kernel/time/timekeeping.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/time/timekeeping.c
+--- linux-3.6/kernel/time/timekeeping.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/time/timekeeping.c	2012-10-04 18:47:00.000000000 +0200
+@@ -309,6 +309,7 @@ void getnstimeofday(struct timespec *ts)
  
+ 	ts->tv_nsec = 0;
  	timespec_add_ns(ts, nsecs);
 +	vx_adjust_timespec(ts);
  }
- 
  EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-3.4.11/kernel/time.c linux-3.4.11-vs2.3.3.8/kernel/time.c
---- linux-3.4.11/kernel/time.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/kernel/time.c	2012-05-21 18:15:05.000000000 +0200
+ 
+diff -NurpP --minimal linux-3.6/kernel/time.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/time.c
+--- linux-3.6/kernel/time.c	2012-05-21 18:07:34.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/time.c	2012-10-04 18:47:00.000000000 +0200
 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, 
  	if (err)
  		return err;
@@ -15352,9 +15026,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/time.c linux-3.4.11-vs2.3.3.8/kernel/t
  	return 0;
  }
  
-diff -NurpP --minimal linux-3.4.11/kernel/timer.c linux-3.4.11-vs2.3.3.8/kernel/timer.c
---- linux-3.4.11/kernel/timer.c	2012-03-19 19:47:30.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/timer.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/timer.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/timer.c
+--- linux-3.6/kernel/timer.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/timer.c	2012-10-09 14:02:12.000000000 +0200
 @@ -40,6 +40,10 @@
  #include <linux/irq_work.h>
  #include <linux/sched.h>
@@ -15366,75 +15040,38 @@ diff -NurpP --minimal linux-3.4.11/kernel/timer.c linux-3.4.11-vs2.3.3.8/kernel/
  
  #include <asm/uaccess.h>
  #include <asm/unistd.h>
-@@ -1386,12 +1390,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
- 
- #endif
- 
--#ifndef __alpha__
--
--/*
-- * The Alpha uses getxpid, getxuid, and getxgid instead.  Maybe this
-- * should be moved into arch/i386 instead?
-- */
- 
- /**
-  * sys_getpid - return the thread group id of the current process
-@@ -1420,10 +1418,23 @@ SYSCALL_DEFINE0(getppid)
- 	rcu_read_lock();
- 	pid = task_tgid_vnr(rcu_dereference(current->real_parent));
- 	rcu_read_unlock();
-+	return vx_map_pid(pid);
-+}
- 
--	return pid;
-+#ifdef __alpha__
-+
-+/*
-+ * The Alpha uses getxpid, getxuid, and getxgid instead.
-+ */
-+
-+asmlinkage long do_getxpid(long *ppid)
-+{
-+	*ppid = sys_getppid();
-+	return sys_getpid();
- }
- 
-+#else /* _alpha_ */
-+
- SYSCALL_DEFINE0(getuid)
- {
- 	/* Only we change this so SMP safe */
-diff -NurpP --minimal linux-3.4.11/kernel/user_namespace.c linux-3.4.11-vs2.3.3.8/kernel/user_namespace.c
---- linux-3.4.11/kernel/user_namespace.c	2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/user_namespace.c	2012-05-21 18:15:05.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <linux/user_namespace.h>
- #include <linux/highuid.h>
- #include <linux/cred.h>
+diff -NurpP --minimal linux-3.6/kernel/user_namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/user_namespace.c
+--- linux-3.6/kernel/user_namespace.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/user_namespace.c	2012-10-04 18:47:00.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include <linux/fs.h>
+ #include <linux/uaccess.h>
+ #include <linux/ctype.h>
 +#include <linux/vserver/global.h>
  
  static struct kmem_cache *user_ns_cachep __read_mostly;
  
-@@ -33,6 +34,7 @@ int create_user_ns(struct cred *new)
+@@ -52,6 +53,7 @@ int create_user_ns(struct cred *new)
  		return -ENOMEM;
  
  	kref_init(&ns->kref);
 +	atomic_inc(&vs_global_user_ns);
+ 	ns->parent = parent_ns;
+ 	ns->owner = owner;
+ 	ns->group = group;
+@@ -84,6 +86,9 @@ void free_user_ns(struct kref *kref)
  
- 	for (n = 0; n < UIDHASH_SZ; ++n)
- 		INIT_HLIST_HEAD(ns->uidhash_table + n);
-@@ -81,6 +83,8 @@ void free_user_ns(struct kref *kref)
- 	struct user_namespace *ns =
- 		container_of(kref, struct user_namespace, kref);
- 
+ 	parent = ns->parent;
+ 	kmem_cache_free(user_ns_cachep, ns);
++
 +	/* FIXME: maybe move into destroyer? */
 +	atomic_dec(&vs_global_user_ns);
- 	INIT_WORK(&ns->destroyer, free_user_ns_work);
- 	schedule_work(&ns->destroyer);
+ 	put_user_ns(parent);
  }
-diff -NurpP --minimal linux-3.4.11/kernel/utsname.c linux-3.4.11-vs2.3.3.8/kernel/utsname.c
---- linux-3.4.11/kernel/utsname.c	2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/utsname.c	2012-05-21 18:15:05.000000000 +0200
+ EXPORT_SYMBOL(free_user_ns);
+diff -NurpP --minimal linux-3.6/kernel/utsname.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/utsname.c
+--- linux-3.6/kernel/utsname.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/utsname.c	2012-10-04 18:47:00.000000000 +0200
 @@ -16,14 +16,17 @@
  #include <linux/slab.h>
  #include <linux/user_namespace.h>
@@ -15469,7 +15106,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/utsname.c linux-3.4.11-vs2.3.3.8/kerne
  
  	down_read(&uts_sem);
  	memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
--	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
+-	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
 +	ns->user_ns = get_user_ns(old_user);
  	up_read(&uts_sem);
  	return ns;
@@ -15503,9 +15140,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/utsname.c linux-3.4.11-vs2.3.3.8/kerne
  	kfree(ns);
  }
  
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/Kconfig linux-3.4.11-vs2.3.3.8/kernel/vserver/Kconfig
---- linux-3.4.11/kernel/vserver/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/Kconfig	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/Kconfig
+--- linux-3.6/kernel/vserver/Kconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/Kconfig	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,224 @@
 +#
 +# Linux VServer configuration
@@ -15731,9 +15368,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/Kconfig linux-3.4.11-vs2.3.3.8
 +	bool
 +	default n
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/Makefile linux-3.4.11-vs2.3.3.8/kernel/vserver/Makefile
---- linux-3.4.11/kernel/vserver/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/Makefile	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/Makefile linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/Makefile
+--- linux-3.6/kernel/vserver/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/Makefile	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,18 @@
 +#
 +# Makefile for the Linux vserver routines.
@@ -15753,9 +15390,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/Makefile linux-3.4.11-vs2.3.3.
 +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
 +vserver-$(CONFIG_VSERVER_DEVICE) += device.o
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct.c linux-3.4.11-vs2.3.3.8/kernel/vserver/cacct.c
---- linux-3.4.11/kernel/vserver/cacct.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/cacct.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cacct.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct.c
+--- linux-3.6/kernel/vserver/cacct.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,42 @@
 +/*
 + *  linux/kernel/vserver/cacct.c
@@ -15799,9 +15436,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct.c linux-3.4.11-vs2.3.3.8
 +	return 0;
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct_init.h linux-3.4.11-vs2.3.3.8/kernel/vserver/cacct_init.h
---- linux-3.4.11/kernel/vserver/cacct_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/cacct_init.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cacct_init.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct_init.h
+--- linux-3.6/kernel/vserver/cacct_init.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct_init.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,25 @@
 +
 +
@@ -15828,9 +15465,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct_init.h linux-3.4.11-vs2.
 +	return;
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct_proc.h linux-3.4.11-vs2.3.3.8/kernel/vserver/cacct_proc.h
---- linux-3.4.11/kernel/vserver/cacct_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/cacct_proc.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cacct_proc.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct_proc.h
+--- linux-3.6/kernel/vserver/cacct_proc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct_proc.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,53 @@
 +#ifndef _VX_CACCT_PROC_H
 +#define _VX_CACCT_PROC_H
@@ -15885,9 +15522,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cacct_proc.h linux-3.4.11-vs2.
 +}
 +
 +#endif	/* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/context.c linux-3.4.11-vs2.3.3.8/kernel/vserver/context.c
---- linux-3.4.11/kernel/vserver/context.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/context.c	2012-06-28 16:45:48.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/context.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/context.c
+--- linux-3.6/kernel/vserver/context.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/context.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,1119 @@
 +/*
 + *  linux/kernel/vserver/context.c
@@ -17008,9 +16645,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/context.c linux-3.4.11-vs2.3.3
 +
 +EXPORT_SYMBOL_GPL(free_vx_info);
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt.c linux-3.4.11-vs2.3.3.8/kernel/vserver/cvirt.c
---- linux-3.4.11/kernel/vserver/cvirt.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/cvirt.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cvirt.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt.c
+--- linux-3.6/kernel/vserver/cvirt.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,313 @@
 +/*
 + *  linux/kernel/vserver/cvirt.c
@@ -17325,9 +16962,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt.c linux-3.4.11-vs2.3.3.8
 +
 +#endif
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt_init.h linux-3.4.11-vs2.3.3.8/kernel/vserver/cvirt_init.h
---- linux-3.4.11/kernel/vserver/cvirt_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/cvirt_init.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cvirt_init.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt_init.h
+--- linux-3.6/kernel/vserver/cvirt_init.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt_init.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,70 @@
 +
 +
@@ -17399,9 +17036,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt_init.h linux-3.4.11-vs2.
 +	return;
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt_proc.h linux-3.4.11-vs2.3.3.8/kernel/vserver/cvirt_proc.h
---- linux-3.4.11/kernel/vserver/cvirt_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/cvirt_proc.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cvirt_proc.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt_proc.h
+--- linux-3.6/kernel/vserver/cvirt_proc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt_proc.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,123 @@
 +#ifndef _VX_CVIRT_PROC_H
 +#define _VX_CVIRT_PROC_H
@@ -17526,9 +17163,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/cvirt_proc.h linux-3.4.11-vs2.
 +}
 +
 +#endif	/* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/debug.c linux-3.4.11-vs2.3.3.8/kernel/vserver/debug.c
---- linux-3.4.11/kernel/vserver/debug.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/debug.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/debug.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/debug.c
+--- linux-3.6/kernel/vserver/debug.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/debug.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,32 @@
 +/*
 + *  kernel/vserver/debug.c
@@ -17562,9 +17199,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/debug.c linux-3.4.11-vs2.3.3.8
 +
 +EXPORT_SYMBOL_GPL(dump_vx_info);
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/device.c linux-3.4.11-vs2.3.3.8/kernel/vserver/device.c
---- linux-3.4.11/kernel/vserver/device.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/device.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/device.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/device.c
+--- linux-3.6/kernel/vserver/device.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/device.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,443 @@
 +/*
 + *  linux/kernel/vserver/device.c
@@ -18009,9 +17646,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/device.c linux-3.4.11-vs2.3.3.
 +#endif	/* CONFIG_COMPAT */
 +
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/dlimit.c linux-3.4.11-vs2.3.3.8/kernel/vserver/dlimit.c
---- linux-3.4.11/kernel/vserver/dlimit.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/dlimit.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/dlimit.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/dlimit.c
+--- linux-3.6/kernel/vserver/dlimit.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/dlimit.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,531 @@
 +/*
 + *  linux/kernel/vserver/dlimit.c
@@ -18544,9 +18181,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/dlimit.c linux-3.4.11-vs2.3.3.
 +EXPORT_SYMBOL_GPL(locate_dl_info);
 +EXPORT_SYMBOL_GPL(rcu_free_dl_info);
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/helper.c linux-3.4.11-vs2.3.3.8/kernel/vserver/helper.c
---- linux-3.4.11/kernel/vserver/helper.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/helper.c	2012-09-16 20:49:44.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/helper.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/helper.c
+--- linux-3.6/kernel/vserver/helper.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/helper.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,229 @@
 +/*
 + *  linux/kernel/vserver/helper.c
@@ -18777,9 +18414,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/helper.c linux-3.4.11-vs2.3.3.
 +	return do_vshelper(vshelper_path, argv, envp, 1);
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/history.c linux-3.4.11-vs2.3.3.8/kernel/vserver/history.c
---- linux-3.4.11/kernel/vserver/history.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/history.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/history.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/history.c
+--- linux-3.6/kernel/vserver/history.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/history.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,258 @@
 +/*
 + *  kernel/vserver/history.c
@@ -19039,9 +18676,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/history.c linux-3.4.11-vs2.3.3
 +
 +#endif	/* CONFIG_COMPAT */
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/inet.c linux-3.4.11-vs2.3.3.8/kernel/vserver/inet.c
---- linux-3.4.11/kernel/vserver/inet.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/inet.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/inet.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/inet.c
+--- linux-3.6/kernel/vserver/inet.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/inet.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,226 @@
 +
 +#include <linux/in.h>
@@ -19269,9 +18906,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/inet.c linux-3.4.11-vs2.3.3.8/
 +
 +EXPORT_SYMBOL_GPL(ip_v4_find_src);
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/init.c linux-3.4.11-vs2.3.3.8/kernel/vserver/init.c
---- linux-3.4.11/kernel/vserver/init.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/init.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/init.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/init.c
+--- linux-3.6/kernel/vserver/init.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/init.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,45 @@
 +/*
 + *  linux/kernel/init.c
@@ -19318,9 +18955,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/init.c linux-3.4.11-vs2.3.3.8/
 +module_init(init_vserver);
 +module_exit(exit_vserver);
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/inode.c linux-3.4.11-vs2.3.3.8/kernel/vserver/inode.c
---- linux-3.4.11/kernel/vserver/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/inode.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/inode.c
+--- linux-3.6/kernel/vserver/inode.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/inode.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,437 @@
 +/*
 + *  linux/kernel/vserver/inode.c
@@ -19759,9 +19396,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/inode.c linux-3.4.11-vs2.3.3.8
 +
 +#endif	/* CONFIG_PROPAGATE */
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit.c linux-3.4.11-vs2.3.3.8/kernel/vserver/limit.c
---- linux-3.4.11/kernel/vserver/limit.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/limit.c	2012-09-01 11:15:21.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/limit.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit.c
+--- linux-3.6/kernel/vserver/limit.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,345 @@
 +/*
 + *  linux/kernel/vserver/limit.c
@@ -20028,6 +19665,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit.c linux-3.4.11-vs2.3.3.8
 +
 +	rcu_read_lock();
 +	mcg = mem_cgroup_from_task(current);
++	rcu_read_unlock();
 +	if (!mcg)
 +		goto out;
 +
@@ -20041,7 +19679,6 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit.c linux-3.4.11-vs2.3.3.8
 +	val->totalhigh = 0;
 +	val->freehigh = 0;
 +out:
-+	rcu_read_unlock();
 +#endif	/* CONFIG_CGROUP_MEM_RES_CTLR */
 +	return;
 +}
@@ -20056,6 +19693,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit.c linux-3.4.11-vs2.3.3.8
 +
 +	rcu_read_lock();
 +	mcg = mem_cgroup_from_task(current);
++	rcu_read_unlock();
 +	if (!mcg)
 +		goto out;
 +
@@ -20081,7 +19719,6 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit.c linux-3.4.11-vs2.3.3.8
 +	val->freeswap = (swap_usage < swap_limit) ?
 +		val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
 +out:
-+	rcu_read_unlock();
 +#else	/* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
 +	val->totalswap = 0;
 +	val->freeswap = 0;
@@ -20098,19 +19735,19 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit.c linux-3.4.11-vs2.3.3.8
 +
 +	rcu_read_lock();
 +	mcg = mem_cgroup_from_task(current);
++	rcu_read_unlock();
 +	if (!mcg)
 +		goto out;
 +
 +	cache = mem_cgroup_stat_read_cache(mcg);
 +out:
-+	rcu_read_unlock();
 +#endif
 +	return cache;
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit_init.h linux-3.4.11-vs2.3.3.8/kernel/vserver/limit_init.h
---- linux-3.4.11/kernel/vserver/limit_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/limit_init.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/limit_init.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit_init.h
+--- linux-3.6/kernel/vserver/limit_init.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit_init.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,31 @@
 +
 +
@@ -20143,9 +19780,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit_init.h linux-3.4.11-vs2.
 +	}
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit_proc.h linux-3.4.11-vs2.3.3.8/kernel/vserver/limit_proc.h
---- linux-3.4.11/kernel/vserver/limit_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/limit_proc.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/limit_proc.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit_proc.h
+--- linux-3.6/kernel/vserver/limit_proc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit_proc.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,57 @@
 +#ifndef _VX_LIMIT_PROC_H
 +#define _VX_LIMIT_PROC_H
@@ -20204,9 +19841,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/limit_proc.h linux-3.4.11-vs2.
 +#endif	/* _VX_LIMIT_PROC_H */
 +
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/network.c linux-3.4.11-vs2.3.3.8/kernel/vserver/network.c
---- linux-3.4.11/kernel/vserver/network.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/network.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/network.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/network.c
+--- linux-3.6/kernel/vserver/network.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/network.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,912 @@
 +/*
 + *  linux/kernel/vserver/network.c
@@ -21120,10 +20757,10 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/network.c linux-3.4.11-vs2.3.3
 +EXPORT_SYMBOL_GPL(free_nx_info);
 +EXPORT_SYMBOL_GPL(unhash_nx_info);
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/kernel/vserver/proc.c
---- linux-3.4.11/kernel/vserver/proc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/proc.c	2012-05-21 18:15:05.000000000 +0200
-@@ -0,0 +1,1103 @@
+diff -NurpP --minimal linux-3.6/kernel/vserver/proc.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/proc.c
+--- linux-3.6/kernel/vserver/proc.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/proc.c	2012-10-09 14:19:59.000000000 +0200
+@@ -0,0 +1,1110 @@
 +/*
 + *  linux/kernel/vserver/proc.c
 + *
@@ -21146,6 +20783,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/
 +#include <linux/proc_fs.h>
 +#include <linux/fs_struct.h>
 +#include <linux/mount.h>
++#include <linux/namei.h>
 +#include <asm/unistd.h>
 +
 +#include <linux/vs_context.h>
@@ -21505,11 +21143,14 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/
 +	return lookup_vx_info(PROC_I(inode)->fd);
 +}
 +
-+static int proc_xid_revalidate(struct dentry *dentry, struct nameidata *nd)
++static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags)
 +{
 +	struct inode *inode = dentry->d_inode;
 +	xid_t xid = PROC_I(inode)->fd;
 +
++	if (flags & LOOKUP_RCU)	/* FIXME: can be dropped? */
++		return -ECHILD;
++
 +	if (!xid || xid_is_hashed(xid))
 +		return 1;
 +	d_drop(dentry);
@@ -21519,11 +21160,14 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/
 +
 +/* get and revalidate nx_info/nid */
 +
-+static int proc_nid_revalidate(struct dentry *dentry, struct nameidata *nd)
++static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags)
 +{
 +	struct inode *inode = dentry->d_inode;
 +	nid_t nid = PROC_I(inode)->fd;
 +
++	if (flags & LOOKUP_RCU)	/* FIXME: can be dropped? */
++		return -ECHILD;
++
 +	if (!nid || nid_is_hashed(nid))
 +		return 1;
 +	d_drop(dentry);
@@ -21704,7 +21348,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/
 +}
 +
 +static struct dentry *proc_xid_lookup(struct inode *dir,
-+	struct dentry *dentry, struct nameidata *nd)
++	struct dentry *dentry, unsigned int flags)
 +{
 +	struct vs_entry *p = vx_base_stuff;
 +	struct dentry *error = ERR_PTR(-ENOENT);
@@ -21788,7 +21432,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/
 +}
 +
 +static struct dentry *proc_nid_lookup(struct inode *dir,
-+	struct dentry *dentry, struct nameidata *nd)
++	struct dentry *dentry, unsigned int flags)
 +{
 +	struct vs_entry *p = nx_base_stuff;
 +	struct dentry *error = ERR_PTR(-ENOENT);
@@ -21890,7 +21534,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/
 +
 +
 +static struct dentry *proc_virtual_lookup(struct inode *dir,
-+	struct dentry *dentry, struct nameidata *nd)
++	struct dentry *dentry, unsigned int flags)
 +{
 +	struct vs_entry *p = vx_virtual_stuff;
 +	struct dentry *error = ERR_PTR(-ENOENT);
@@ -21932,7 +21576,7 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/
 +
 +
 +static struct dentry *proc_virtnet_lookup(struct inode *dir,
-+	struct dentry *dentry, struct nameidata *nd)
++	struct dentry *dentry, unsigned int flags)
 +{
 +	struct vs_entry *p = nx_virtnet_stuff;
 +	struct dentry *error = ERR_PTR(-ENOENT);
@@ -22227,9 +21871,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/proc.c linux-3.4.11-vs2.3.3.8/
 +	return buffer - orig;
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched.c linux-3.4.11-vs2.3.3.8/kernel/vserver/sched.c
---- linux-3.4.11/kernel/vserver/sched.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/sched.c	2012-05-21 18:25:11.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/sched.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched.c
+--- linux-3.6/kernel/vserver/sched.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,83 @@
 +/*
 + *  linux/kernel/vserver/sched.c
@@ -22314,9 +21958,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched.c linux-3.4.11-vs2.3.3.8
 +	return 0;
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched_init.h linux-3.4.11-vs2.3.3.8/kernel/vserver/sched_init.h
---- linux-3.4.11/kernel/vserver/sched_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/sched_init.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/sched_init.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched_init.h
+--- linux-3.6/kernel/vserver/sched_init.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched_init.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,27 @@
 +
 +static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -22345,9 +21989,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched_init.h linux-3.4.11-vs2.
 +{
 +	return;
 +}
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched_proc.h linux-3.4.11-vs2.3.3.8/kernel/vserver/sched_proc.h
---- linux-3.4.11/kernel/vserver/sched_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/sched_proc.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/sched_proc.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched_proc.h
+--- linux-3.6/kernel/vserver/sched_proc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched_proc.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,32 @@
 +#ifndef _VX_SCHED_PROC_H
 +#define _VX_SCHED_PROC_H
@@ -22381,9 +22025,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/sched_proc.h linux-3.4.11-vs2.
 +}
 +
 +#endif	/* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/signal.c linux-3.4.11-vs2.3.3.8/kernel/vserver/signal.c
---- linux-3.4.11/kernel/vserver/signal.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/signal.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/signal.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/signal.c
+--- linux-3.6/kernel/vserver/signal.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/signal.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,134 @@
 +/*
 + *  linux/kernel/vserver/signal.c
@@ -22519,9 +22163,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/signal.c linux-3.4.11-vs2.3.3.
 +	return ret;
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/space.c linux-3.4.11-vs2.3.3.8/kernel/vserver/space.c
---- linux-3.4.11/kernel/vserver/space.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/space.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/space.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/space.c
+--- linux-3.6/kernel/vserver/space.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/space.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,436 @@
 +/*
 + *  linux/kernel/vserver/space.c
@@ -22959,9 +22603,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/space.c linux-3.4.11-vs2.3.3.8
 +	return 0;
 +}
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/switch.c linux-3.4.11-vs2.3.3.8/kernel/vserver/switch.c
---- linux-3.4.11/kernel/vserver/switch.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/switch.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/switch.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/switch.c
+--- linux-3.6/kernel/vserver/switch.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/switch.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,556 @@
 +/*
 + *  linux/kernel/vserver/switch.c
@@ -23519,9 +23163,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/switch.c linux-3.4.11-vs2.3.3.
 +}
 +
 +#endif	/* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/sysctl.c linux-3.4.11-vs2.3.3.8/kernel/vserver/sysctl.c
---- linux-3.4.11/kernel/vserver/sysctl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/sysctl.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/sysctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sysctl.c
+--- linux-3.6/kernel/vserver/sysctl.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sysctl.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,247 @@
 +/*
 + *  kernel/vserver/sysctl.c
@@ -23770,9 +23414,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/sysctl.c linux-3.4.11-vs2.3.3.
 +EXPORT_SYMBOL_GPL(vs_debug_perm);
 +EXPORT_SYMBOL_GPL(vs_debug_misc);
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/tag.c linux-3.4.11-vs2.3.3.8/kernel/vserver/tag.c
---- linux-3.4.11/kernel/vserver/tag.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/tag.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/tag.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/tag.c
+--- linux-3.6/kernel/vserver/tag.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/tag.c	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,63 @@
 +/*
 + *  linux/kernel/vserver/tag.c
@@ -23837,9 +23481,9 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/tag.c linux-3.4.11-vs2.3.3.8/k
 +}
 +
 +
-diff -NurpP --minimal linux-3.4.11/kernel/vserver/vci_config.h linux-3.4.11-vs2.3.3.8/kernel/vserver/vci_config.h
---- linux-3.4.11/kernel/vserver/vci_config.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/kernel/vserver/vci_config.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/vci_config.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/vci_config.h
+--- linux-3.6/kernel/vserver/vci_config.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/vci_config.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,76 @@
 +
 +/*  interface version */
@@ -23917,11 +23561,11 @@ diff -NurpP --minimal linux-3.4.11/kernel/vserver/vci_config.h linux-3.4.11-vs2.
 +	0;
 +}
 +
-diff -NurpP --minimal linux-3.4.11/mm/memcontrol.c linux-3.4.11-vs2.3.3.8/mm/memcontrol.c
---- linux-3.4.11/mm/memcontrol.c	2012-05-21 18:07:35.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/mm/memcontrol.c	2012-05-21 18:15:05.000000000 +0200
-@@ -846,6 +846,31 @@ struct mem_cgroup *mem_cgroup_from_task(
- 				struct mem_cgroup, css);
+diff -NurpP --minimal linux-3.6/mm/memcontrol.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/memcontrol.c
+--- linux-3.6/mm/memcontrol.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/memcontrol.c	2012-10-04 18:47:00.000000000 +0200
+@@ -885,6 +885,31 @@ struct mem_cgroup *mem_cgroup_from_task(
+ 	return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id));
  }
  
 +u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
@@ -23952,9 +23596,9 @@ diff -NurpP --minimal linux-3.4.11/mm/memcontrol.c linux-3.4.11-vs2.3.3.8/mm/mem
  struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
  {
  	struct mem_cgroup *memcg = NULL;
-diff -NurpP --minimal linux-3.4.11/mm/oom_kill.c linux-3.4.11-vs2.3.3.8/mm/oom_kill.c
---- linux-3.4.11/mm/oom_kill.c	2012-05-21 18:07:35.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/mm/oom_kill.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/mm/oom_kill.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/oom_kill.c
+--- linux-3.6/mm/oom_kill.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/oom_kill.c	2012-10-04 18:53:46.000000000 +0200
 @@ -35,6 +35,8 @@
  #include <linux/freezer.h>
  #include <linux/ftrace.h>
@@ -23984,7 +23628,7 @@ diff -NurpP --minimal linux-3.4.11/mm/oom_kill.c linux-3.4.11-vs2.3.3.8/mm/oom_k
  	/* When mem_cgroup_out_of_memory() and p is not member of the group */
  	if (memcg && !task_in_mem_cgroup(p, memcg))
  		return true;
-@@ -462,8 +471,8 @@ static void oom_kill_process(struct task
+@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct
  		dump_header(p, gfp_mask, order, memcg, nodemask);
  
  	task_lock(p);
@@ -23995,7 +23639,7 @@ diff -NurpP --minimal linux-3.4.11/mm/oom_kill.c linux-3.4.11-vs2.3.3.8/mm/oom_k
  	task_unlock(p);
  
  	/*
-@@ -496,8 +505,8 @@ static void oom_kill_process(struct task
+@@ -518,8 +527,8 @@ void oom_kill_process(struct task_struct
  
  	/* mm cannot safely be dereferenced after task_unlock(victim) */
  	mm = victim->mm;
@@ -24006,7 +23650,7 @@ diff -NurpP --minimal linux-3.4.11/mm/oom_kill.c linux-3.4.11-vs2.3.3.8/mm/oom_k
  		K(get_mm_counter(victim->mm, MM_ANONPAGES)),
  		K(get_mm_counter(victim->mm, MM_FILEPAGES)));
  	task_unlock(victim);
-@@ -596,6 +605,8 @@ int unregister_oom_notifier(struct notif
+@@ -589,6 +598,8 @@ int unregister_oom_notifier(struct notif
  }
  EXPORT_SYMBOL_GPL(unregister_oom_notifier);
  
@@ -24015,10 +23659,10 @@ diff -NurpP --minimal linux-3.4.11/mm/oom_kill.c linux-3.4.11-vs2.3.3.8/mm/oom_k
  /*
   * Try to acquire the OOM killer lock for the zones in zonelist.  Returns zero
   * if a parallel OOM killing is already taking place that includes a zone in
-@@ -747,7 +758,12 @@ void out_of_memory(struct zonelist *zone
+@@ -738,7 +749,12 @@ void out_of_memory(struct zonelist *zone
+ 	/* Found nothing?!?! Either we hang forever, or we panic. */
  	if (!p) {
  		dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
- 		read_unlock(&tasklist_lock);
 -		panic("Out of memory and no killable processes...\n");
 +
 +		/* avoid panic for guest OOM */
@@ -24029,19 +23673,19 @@ diff -NurpP --minimal linux-3.4.11/mm/oom_kill.c linux-3.4.11-vs2.3.3.8/mm/oom_k
  	}
  	if (PTR_ERR(p) != -1UL) {
  		oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.4.11/mm/page_alloc.c linux-3.4.11-vs2.3.3.8/mm/page_alloc.c
---- linux-3.4.11/mm/page_alloc.c	2012-05-21 18:07:35.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/mm/page_alloc.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/mm/page_alloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/page_alloc.c
+--- linux-3.6/mm/page_alloc.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/page_alloc.c	2012-10-04 18:47:00.000000000 +0200
 @@ -58,6 +58,8 @@
- #include <linux/memcontrol.h>
  #include <linux/prefetch.h>
+ #include <linux/migrate.h>
  #include <linux/page-debug-flags.h>
 +#include <linux/vs_base.h>
 +#include <linux/vs_limit.h>
  
  #include <asm/tlbflush.h>
  #include <asm/div64.h>
-@@ -2655,6 +2657,9 @@ void si_meminfo(struct sysinfo *val)
+@@ -2773,6 +2775,9 @@ void si_meminfo(struct sysinfo *val)
  	val->totalhigh = totalhigh_pages;
  	val->freehigh = nr_free_highpages();
  	val->mem_unit = PAGE_SIZE;
@@ -24051,7 +23695,7 @@ diff -NurpP --minimal linux-3.4.11/mm/page_alloc.c linux-3.4.11-vs2.3.3.8/mm/pag
  }
  
  EXPORT_SYMBOL(si_meminfo);
-@@ -2675,6 +2680,9 @@ void si_meminfo_node(struct sysinfo *val
+@@ -2793,6 +2798,9 @@ void si_meminfo_node(struct sysinfo *val
  	val->freehigh = 0;
  #endif
  	val->mem_unit = PAGE_SIZE;
@@ -24061,9 +23705,9 @@ diff -NurpP --minimal linux-3.4.11/mm/page_alloc.c linux-3.4.11-vs2.3.3.8/mm/pag
  }
  #endif
  
-diff -NurpP --minimal linux-3.4.11/mm/pgtable-generic.c linux-3.4.11-vs2.3.3.8/mm/pgtable-generic.c
---- linux-3.4.11/mm/pgtable-generic.c	2012-05-21 18:07:35.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/mm/pgtable-generic.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/mm/pgtable-generic.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/pgtable-generic.c
+--- linux-3.6/mm/pgtable-generic.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/pgtable-generic.c	2012-10-04 18:47:00.000000000 +0200
 @@ -6,6 +6,8 @@
   *  Copyright (C) 2010  Linus Torvalds
   */
@@ -24073,10 +23717,10 @@ diff -NurpP --minimal linux-3.4.11/mm/pgtable-generic.c linux-3.4.11-vs2.3.3.8/m
  #include <linux/pagemap.h>
  #include <asm/tlb.h>
  #include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.4.11/mm/shmem.c linux-3.4.11-vs2.3.3.8/mm/shmem.c
---- linux-3.4.11/mm/shmem.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/mm/shmem.c	2012-07-18 00:29:44.000000000 +0200
-@@ -1467,7 +1467,7 @@ static int shmem_statfs(struct dentry *d
+diff -NurpP --minimal linux-3.6/mm/shmem.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/shmem.c
+--- linux-3.6/mm/shmem.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/shmem.c	2012-10-04 18:47:00.000000000 +0200
+@@ -1814,7 +1814,7 @@ static int shmem_statfs(struct dentry *d
  {
  	struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
  
@@ -24085,7 +23729,7 @@ diff -NurpP --minimal linux-3.4.11/mm/shmem.c linux-3.4.11-vs2.3.3.8/mm/shmem.c
  	buf->f_bsize = PAGE_CACHE_SIZE;
  	buf->f_namelen = NAME_MAX;
  	if (sbinfo->max_blocks) {
-@@ -2273,7 +2273,7 @@ int shmem_fill_super(struct super_block 
+@@ -2630,7 +2630,7 @@ int shmem_fill_super(struct super_block 
  	sb->s_maxbytes = MAX_LFS_FILESIZE;
  	sb->s_blocksize = PAGE_CACHE_SIZE;
  	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -24094,10 +23738,10 @@ diff -NurpP --minimal linux-3.4.11/mm/shmem.c linux-3.4.11-vs2.3.3.8/mm/shmem.c
  	sb->s_op = &shmem_ops;
  	sb->s_time_gran = 1;
  #ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.4.11/mm/slab.c linux-3.4.11-vs2.3.3.8/mm/slab.c
---- linux-3.4.11/mm/slab.c	2012-05-21 18:07:35.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/mm/slab.c	2012-05-21 18:15:05.000000000 +0200
-@@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_
+diff -NurpP --minimal linux-3.6/mm/slab.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/slab.c
+--- linux-3.6/mm/slab.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/slab.c	2012-10-04 18:47:00.000000000 +0200
+@@ -445,6 +445,8 @@ static void kmem_list3_init(struct kmem_
  #define STATS_INC_FREEMISS(x)	do { } while (0)
  #endif
  
@@ -24106,7 +23750,7 @@ diff -NurpP --minimal linux-3.4.11/mm/slab.c linux-3.4.11-vs2.3.3.8/mm/slab.c
  #if DEBUG
  
  /*
-@@ -3466,6 +3468,7 @@ retry:
+@@ -3539,6 +3541,7 @@ retry:
  
  	obj = slab_get_obj(cachep, slabp, nodeid);
  	check_slabp(cachep, slabp);
@@ -24114,25 +23758,25 @@ diff -NurpP --minimal linux-3.4.11/mm/slab.c linux-3.4.11-vs2.3.3.8/mm/slab.c
  	l3->free_objects--;
  	/* move slabp to correct slabp list: */
  	list_del(&slabp->list);
-@@ -3543,6 +3546,7 @@ __cache_alloc_node(struct kmem_cache *ca
+@@ -3616,6 +3619,7 @@ __cache_alloc_node(struct kmem_cache *ca
  	/* ___cache_alloc_node can fall back to other nodes */
  	ptr = ____cache_alloc_node(cachep, flags, nodeid);
    out:
 +	vx_slab_alloc(cachep, flags);
  	local_irq_restore(save_flags);
  	ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
- 	kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
-@@ -3730,6 +3734,7 @@ static inline void __cache_free(struct k
+ 	kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags,
+@@ -3806,6 +3810,7 @@ static inline void __cache_free(struct k
  	check_irq_off();
  	kmemleak_free_recursive(objp, cachep->flags);
  	objp = cache_free_debugcheck(cachep, objp, caller);
 +	vx_slab_free(cachep);
  
- 	kmemcheck_slab_free(cachep, objp, obj_size(cachep));
+ 	kmemcheck_slab_free(cachep, objp, cachep->object_size);
  
-diff -NurpP --minimal linux-3.4.11/mm/slab_vs.h linux-3.4.11-vs2.3.3.8/mm/slab_vs.h
---- linux-3.4.11/mm/slab_vs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/mm/slab_vs.h	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/mm/slab_vs.h linux-3.6-vs2.3.4.3-noxfs-nocow/mm/slab_vs.h
+--- linux-3.6/mm/slab_vs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/slab_vs.h	2012-10-04 18:47:00.000000000 +0200
 @@ -0,0 +1,29 @@
 +
 +#include <linux/vserver/context.h>
@@ -24163,10 +23807,10 @@ diff -NurpP --minimal linux-3.4.11/mm/slab_vs.h linux-3.4.11-vs2.3.3.8/mm/slab_v
 +	atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
 +}
 +
-diff -NurpP --minimal linux-3.4.11/mm/swapfile.c linux-3.4.11-vs2.3.3.8/mm/swapfile.c
---- linux-3.4.11/mm/swapfile.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/mm/swapfile.c	2012-06-28 16:45:07.000000000 +0200
-@@ -36,6 +36,7 @@
+diff -NurpP --minimal linux-3.6/mm/swapfile.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/swapfile.c
+--- linux-3.6/mm/swapfile.c	2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/swapfile.c	2012-10-04 18:47:00.000000000 +0200
+@@ -39,6 +39,7 @@
  #include <asm/tlbflush.h>
  #include <linux/swapops.h>
  #include <linux/page_cgroup.h>
@@ -24174,7 +23818,7 @@ diff -NurpP --minimal linux-3.4.11/mm/swapfile.c linux-3.4.11-vs2.3.3.8/mm/swapf
  
  static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
  				 unsigned char);
-@@ -1754,6 +1755,16 @@ static int swap_show(struct seq_file *sw
+@@ -1686,6 +1687,16 @@ static int swap_show(struct seq_file *sw
  
  	if (si == SEQ_START_TOKEN) {
  		seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
@@ -24191,7 +23835,7 @@ diff -NurpP --minimal linux-3.4.11/mm/swapfile.c linux-3.4.11-vs2.3.3.8/mm/swapf
  		return 0;
  	}
  
-@@ -2176,6 +2187,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -2113,6 +2124,8 @@ void si_swapinfo(struct sysinfo *val)
  	val->freeswap = nr_swap_pages + nr_to_be_unused;
  	val->totalswap = total_swap_pages + nr_to_be_unused;
  	spin_unlock(&swap_lock);
@@ -24200,10 +23844,10 @@ diff -NurpP --minimal linux-3.4.11/mm/swapfile.c linux-3.4.11-vs2.3.3.8/mm/swapf
  }
  
  /*
-diff -NurpP --minimal linux-3.4.11/net/bridge/br_multicast.c linux-3.4.11-vs2.3.3.8/net/bridge/br_multicast.c
---- linux-3.4.11/net/bridge/br_multicast.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/bridge/br_multicast.c	2012-05-21 18:15:05.000000000 +0200
-@@ -445,7 +445,7 @@ static struct sk_buff *br_ip6_multicast_
+diff -NurpP --minimal linux-3.6/net/bridge/br_multicast.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/bridge/br_multicast.c
+--- linux-3.6/net/bridge/br_multicast.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/bridge/br_multicast.c	2012-10-04 18:47:00.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));
  	if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
@@ -24212,9 +23856,9 @@ diff -NurpP --minimal linux-3.4.11/net/bridge/br_multicast.c linux-3.4.11-vs2.3.
  		kfree_skb(skb);
  		return NULL;
  	}
-diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/core/dev.c
---- linux-3.4.11/net/core/dev.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/core/dev.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/core/dev.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/dev.c
+--- linux-3.6/net/core/dev.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/dev.c	2012-10-04 18:47:00.000000000 +0200
 @@ -126,6 +126,7 @@
  #include <linux/in.h>
  #include <linux/jhash.h>
@@ -24223,7 +23867,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  #include <trace/events/napi.h>
  #include <trace/events/net.h>
  #include <trace/events/skb.h>
-@@ -621,7 +622,8 @@ struct net_device *__dev_get_by_name(str
+@@ -620,7 +621,8 @@ struct net_device *__dev_get_by_name(str
  	struct hlist_head *head = dev_name_hash(net, name);
  
  	hlist_for_each_entry(dev, p, head, name_hlist)
@@ -24233,7 +23877,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  			return dev;
  
  	return NULL;
-@@ -647,7 +649,8 @@ struct net_device *dev_get_by_name_rcu(s
+@@ -646,7 +648,8 @@ struct net_device *dev_get_by_name_rcu(s
  	struct hlist_head *head = dev_name_hash(net, name);
  
  	hlist_for_each_entry_rcu(dev, p, head, name_hlist)
@@ -24243,7 +23887,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  			return dev;
  
  	return NULL;
-@@ -698,7 +701,8 @@ struct net_device *__dev_get_by_index(st
+@@ -697,7 +700,8 @@ struct net_device *__dev_get_by_index(st
  	struct hlist_head *head = dev_index_hash(net, ifindex);
  
  	hlist_for_each_entry(dev, p, head, index_hlist)
@@ -24253,7 +23897,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  			return dev;
  
  	return NULL;
-@@ -716,7 +720,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
+@@ -715,7 +719,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
   *	about locking. The caller must hold RCU lock.
   */
  
@@ -24262,7 +23906,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  {
  	struct hlist_node *p;
  	struct net_device *dev;
-@@ -728,6 +732,16 @@ struct net_device *dev_get_by_index_rcu(
+@@ -727,6 +731,16 @@ struct net_device *dev_get_by_index_rcu(
  
  	return NULL;
  }
@@ -24279,7 +23923,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  EXPORT_SYMBOL(dev_get_by_index_rcu);
  
  
-@@ -776,7 +790,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
+@@ -775,7 +789,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
  
  	for_each_netdev_rcu(net, dev)
  		if (dev->type == type &&
@@ -24289,7 +23933,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  			return dev;
  
  	return NULL;
-@@ -788,9 +803,11 @@ struct net_device *__dev_getfirstbyhwtyp
+@@ -787,9 +802,11 @@ struct net_device *__dev_getfirstbyhwtyp
  	struct net_device *dev;
  
  	ASSERT_RTNL();
@@ -24303,7 +23947,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  
  	return NULL;
  }
-@@ -908,6 +925,8 @@ static int __dev_alloc_name(struct net *
+@@ -907,6 +924,8 @@ static int __dev_alloc_name(struct net *
  				continue;
  			if (i < 0 || i >= max_netdevices)
  				continue;
@@ -24312,7 +23956,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  
  			/*  avoid cases where sscanf is not exact inverse of printf */
  			snprintf(buf, IFNAMSIZ, name, i);
-@@ -3974,6 +3993,8 @@ static int dev_ifconf(struct net *net, c
+@@ -4071,6 +4090,8 @@ static int dev_ifconf(struct net *net, c
  
  	total = 0;
  	for_each_netdev(net, dev) {
@@ -24321,7 +23965,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  		for (i = 0; i < NPROTO; i++) {
  			if (gifconf_list[i]) {
  				int done;
-@@ -4076,6 +4097,10 @@ static void dev_seq_printf_stats(struct 
+@@ -4173,6 +4194,10 @@ static void dev_seq_printf_stats(struct 
  	struct rtnl_link_stats64 temp;
  	const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
  
@@ -24332,10 +23976,10 @@ diff -NurpP --minimal linux-3.4.11/net/core/dev.c linux-3.4.11-vs2.3.3.8/net/cor
  	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.4.11/net/core/rtnetlink.c linux-3.4.11-vs2.3.3.8/net/core/rtnetlink.c
---- linux-3.4.11/net/core/rtnetlink.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/core/rtnetlink.c	2012-09-01 10:50:49.000000000 +0200
-@@ -1078,6 +1078,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+diff -NurpP --minimal linux-3.6/net/core/rtnetlink.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/rtnetlink.c
+--- linux-3.6/net/core/rtnetlink.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/rtnetlink.c	2012-10-04 18:47:00.000000000 +0200
+@@ -1080,6 +1080,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
  		hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
  			if (idx < s_idx)
  				goto cont;
@@ -24344,7 +23988,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/rtnetlink.c linux-3.4.11-vs2.3.3.8/n
  			if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
  					     NETLINK_CB(cb->skb).pid,
  					     cb->nlh->nlmsg_seq, 0,
-@@ -1961,6 +1963,9 @@ void rtmsg_ifinfo(int type, struct net_d
+@@ -1969,6 +1971,9 @@ void rtmsg_ifinfo(int type, struct net_d
  	int err = -ENOBUFS;
  	size_t if_info_size;
  
@@ -24354,10 +23998,10 @@ diff -NurpP --minimal linux-3.4.11/net/core/rtnetlink.c linux-3.4.11-vs2.3.3.8/n
  	skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
  	if (skb == NULL)
  		goto errout;
-diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/core/sock.c
---- linux-3.4.11/net/core/sock.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/core/sock.c	2012-07-18 00:29:44.000000000 +0200
-@@ -129,6 +129,10 @@
+diff -NurpP --minimal linux-3.6/net/core/sock.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/sock.c
+--- linux-3.6/net/core/sock.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/sock.c	2012-10-04 18:47:00.000000000 +0200
+@@ -132,6 +132,10 @@
  #include <net/netprio_cgroup.h>
  
  #include <linux/filter.h>
@@ -24368,7 +24012,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co
  
  #include <trace/events/sock.h>
  
-@@ -1146,6 +1150,8 @@ static struct sock *sk_prot_alloc(struct
+@@ -1194,6 +1198,8 @@ static struct sock *sk_prot_alloc(struct
  			goto out_free_sec;
  		sk_tx_queue_clear(sk);
  	}
@@ -24377,7 +24021,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co
  
  	return sk;
  
-@@ -1254,6 +1260,11 @@ static void __sk_free(struct sock *sk)
+@@ -1302,6 +1308,11 @@ static void __sk_free(struct sock *sk)
  		put_cred(sk->sk_peer_cred);
  	put_pid(sk->sk_peer_pid);
  	put_net(sock_net(sk));
@@ -24389,7 +24033,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co
  	sk_prot_free(sk->sk_prot_creator, sk);
  }
  
-@@ -1314,6 +1325,8 @@ struct sock *sk_clone_lock(const struct 
+@@ -1362,6 +1373,8 @@ struct sock *sk_clone_lock(const struct 
  
  		/* SANITY */
  		get_net(sock_net(newsk));
@@ -24398,7 +24042,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co
  		sk_node_init(&newsk->sk_node);
  		sock_lock_init(newsk);
  		bh_lock_sock(newsk);
-@@ -1370,6 +1383,12 @@ struct sock *sk_clone_lock(const struct 
+@@ -1418,6 +1431,12 @@ struct sock *sk_clone_lock(const struct 
  		smp_wmb();
  		atomic_set(&newsk->sk_refcnt, 2);
  
@@ -24411,7 +24055,7 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co
  		/*
  		 * Increment the counter in the same struct proto as the master
  		 * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -2125,6 +2144,12 @@ void sock_init_data(struct socket *sock,
+@@ -2187,6 +2206,12 @@ void sock_init_data(struct socket *sock,
  
  	sk->sk_stamp = ktime_set(-1L, 0);
  
@@ -24424,9 +24068,9 @@ diff -NurpP --minimal linux-3.4.11/net/core/sock.c linux-3.4.11-vs2.3.3.8/net/co
  	/*
  	 * Before updating sk_refcnt, we must commit prior changes to memory
  	 * (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-3.4.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net/ipv4/af_inet.c
---- linux-3.4.11/net/ipv4/af_inet.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/af_inet.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/af_inet.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/af_inet.c
+--- linux-3.6/net/ipv4/af_inet.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/af_inet.c	2012-10-04 18:47:00.000000000 +0200
 @@ -118,6 +118,7 @@
  #ifdef CONFIG_IP_MROUTE
  #include <linux/mroute.h>
@@ -24435,7 +24079,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net
  
  
  /* The inetsw table contains everything that inet_create needs to
-@@ -327,9 +328,13 @@ lookup_protocol:
+@@ -326,9 +327,13 @@ lookup_protocol:
  	}
  
  	err = -EPERM;
@@ -24450,7 +24094,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net
  	err = -EAFNOSUPPORT;
  	if (!inet_netns_ok(net, protocol))
  		goto out_rcu_unlock;
-@@ -454,6 +459,7 @@ int inet_bind(struct socket *sock, struc
+@@ -453,6 +458,7 @@ int inet_bind(struct socket *sock, struc
  	struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
  	struct sock *sk = sock->sk;
  	struct inet_sock *inet = inet_sk(sk);
@@ -24458,7 +24102,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net
  	unsigned short snum;
  	int chk_addr_ret;
  	int err;
-@@ -477,7 +483,11 @@ int inet_bind(struct socket *sock, struc
+@@ -476,7 +482,11 @@ int inet_bind(struct socket *sock, struc
  			goto out;
  	}
  
@@ -24471,7 +24115,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net
  
  	/* Not specified by any standard per-se, however it breaks too
  	 * many applications when removed.  It is unfortunate since
-@@ -489,7 +499,7 @@ int inet_bind(struct socket *sock, struc
+@@ -488,7 +498,7 @@ int inet_bind(struct socket *sock, struc
  	err = -EADDRNOTAVAIL;
  	if (!sysctl_ip_nonlocal_bind &&
  	    !(inet->freebind || inet->transparent) &&
@@ -24480,7 +24124,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net
  	    chk_addr_ret != RTN_LOCAL &&
  	    chk_addr_ret != RTN_MULTICAST &&
  	    chk_addr_ret != RTN_BROADCAST)
-@@ -514,7 +524,7 @@ int inet_bind(struct socket *sock, struc
+@@ -513,7 +523,7 @@ int inet_bind(struct socket *sock, struc
  	if (sk->sk_state != TCP_CLOSE || inet->inet_num)
  		goto out_release_sock;
  
@@ -24489,7 +24133,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net
  	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
  		inet->inet_saddr = 0;  /* Use device */
  
-@@ -717,11 +727,13 @@ int inet_getname(struct socket *sock, st
+@@ -731,11 +741,13 @@ int inet_getname(struct socket *sock, st
  		     peer == 1))
  			return -ENOTCONN;
  		sin->sin_port = inet->inet_dport;
@@ -24504,10 +24148,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/af_inet.c linux-3.4.11-vs2.3.3.8/net
  		sin->sin_port = inet->inet_sport;
  		sin->sin_addr.s_addr = addr;
  	}
-diff -NurpP --minimal linux-3.4.11/net/ipv4/arp.c linux-3.4.11-vs2.3.3.8/net/ipv4/arp.c
---- linux-3.4.11/net/ipv4/arp.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/arp.c	2012-05-21 18:15:05.000000000 +0200
-@@ -1328,6 +1328,7 @@ static void arp_format_neigh_entry(struc
+diff -NurpP --minimal linux-3.6/net/ipv4/arp.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/arp.c
+--- linux-3.6/net/ipv4/arp.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/arp.c	2012-10-04 18:47:00.000000000 +0200
+@@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc
  	struct net_device *dev = n->dev;
  	int hatype = dev->type;
  
@@ -24515,7 +24159,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/arp.c linux-3.4.11-vs2.3.3.8/net/ipv
  	read_lock(&n->lock);
  	/* Convert hardware address to XX:XX:XX:XX ... form. */
  #if IS_ENABLED(CONFIG_AX25)
-@@ -1359,6 +1360,7 @@ static void arp_format_pneigh_entry(stru
+@@ -1349,6 +1350,7 @@ static void arp_format_pneigh_entry(stru
  	int hatype = dev ? dev->type : 0;
  	char tbuf[16];
  
@@ -24523,10 +24167,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/arp.c linux-3.4.11-vs2.3.3.8/net/ipv
  	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.4.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net/ipv4/devinet.c
---- linux-3.4.11/net/ipv4/devinet.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/devinet.c	2012-05-21 18:15:05.000000000 +0200
-@@ -517,6 +517,7 @@ struct in_device *inetdev_by_index(struc
+diff -NurpP --minimal linux-3.6/net/ipv4/devinet.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/devinet.c
+--- linux-3.6/net/ipv4/devinet.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/devinet.c	2012-10-04 18:47:00.000000000 +0200
+@@ -516,6 +516,7 @@ struct in_device *inetdev_by_index(struc
  }
  EXPORT_SYMBOL(inetdev_by_index);
  
@@ -24534,7 +24178,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net
  /* Called only from RTNL semaphored context. No locks. */
  
  struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
-@@ -758,6 +759,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -757,6 +758,8 @@ int devinet_ioctl(struct net *net, unsig
  
  	in_dev = __in_dev_get_rtnl(dev);
  	if (in_dev) {
@@ -24543,7 +24187,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net
  		if (tryaddrmatch) {
  			/* Matthias Andree */
  			/* compare label and address (4.4BSD style) */
-@@ -766,6 +769,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -765,6 +768,8 @@ int devinet_ioctl(struct net *net, unsig
  			   This is checked above. */
  			for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
  			     ifap = &ifa->ifa_next) {
@@ -24552,7 +24196,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net
  				if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
  				    sin_orig.sin_addr.s_addr ==
  							ifa->ifa_local) {
-@@ -778,9 +783,12 @@ int devinet_ioctl(struct net *net, unsig
+@@ -777,9 +782,12 @@ int devinet_ioctl(struct net *net, unsig
  		   comparing just the label */
  		if (!ifa) {
  			for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
@@ -24566,7 +24210,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net
  		}
  	}
  
-@@ -933,6 +941,8 @@ static int inet_gifconf(struct net_devic
+@@ -932,6 +940,8 @@ static int inet_gifconf(struct net_devic
  		goto out;
  
  	for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
@@ -24575,7 +24219,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net
  		if (!buf) {
  			done += sizeof(ifr);
  			continue;
-@@ -1294,6 +1304,7 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1291,6 +1301,7 @@ static int inet_dump_ifaddr(struct sk_bu
  	struct net_device *dev;
  	struct in_device *in_dev;
  	struct in_ifaddr *ifa;
@@ -24583,7 +24227,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net
  	struct hlist_head *head;
  	struct hlist_node *node;
  
-@@ -1316,6 +1327,8 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1313,6 +1324,8 @@ static int inet_dump_ifaddr(struct sk_bu
  
  			for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
  			     ifa = ifa->ifa_next, ip_idx++) {
@@ -24592,10 +24236,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/devinet.c linux-3.4.11-vs2.3.3.8/net
  				if (ip_idx < s_ip_idx)
  					continue;
  				if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.4.11/net/ipv4/fib_trie.c linux-3.4.11-vs2.3.3.8/net/ipv4/fib_trie.c
---- linux-3.4.11/net/ipv4/fib_trie.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/fib_trie.c	2012-05-21 18:15:05.000000000 +0200
-@@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq
+diff -NurpP --minimal linux-3.6/net/ipv4/fib_trie.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/fib_trie.c
+--- linux-3.6/net/ipv4/fib_trie.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/fib_trie.c	2012-10-04 18:47:00.000000000 +0200
+@@ -2554,6 +2554,7 @@ static int fib_route_seq_show(struct seq
  			    || fa->fa_type == RTN_MULTICAST)
  				continue;
  
@@ -24603,10 +24247,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/fib_trie.c linux-3.4.11-vs2.3.3.8/ne
  			if (fi)
  				seq_printf(seq,
  					 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_connection_sock.c linux-3.4.11-vs2.3.3.8/net/ipv4/inet_connection_sock.c
---- linux-3.4.11/net/ipv4/inet_connection_sock.c	2012-03-19 19:47:33.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/inet_connection_sock.c	2012-05-21 18:15:05.000000000 +0200
-@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
+diff -NurpP --minimal linux-3.6/net/ipv4/inet_connection_sock.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_connection_sock.c
+--- linux-3.6/net/ipv4/inet_connection_sock.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_connection_sock.c	2012-10-04 18:47:00.000000000 +0200
+@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
  }
  EXPORT_SYMBOL(inet_get_local_port_range);
  
@@ -24642,9 +24286,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_connection_sock.c linux-3.4.11-
 +}
 +
  int inet_csk_bind_conflict(const struct sock *sk,
- 			   const struct inet_bind_bucket *tb)
+ 			   const struct inet_bind_bucket *tb, bool relax)
  {
-@@ -74,9 +105,7 @@ int inet_csk_bind_conflict(const struct 
+@@ -75,9 +106,7 @@ int inet_csk_bind_conflict(const struct 
  		     sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
  			if (!reuse || !sk2->sk_reuse ||
  			    sk2->sk_state == TCP_LISTEN) {
@@ -24654,10 +24298,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_connection_sock.c linux-3.4.11-
 +				if (ipv4_rcv_saddr_equal(sk, sk2))
  					break;
  			}
- 		}
-diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/net/ipv4/inet_diag.c
---- linux-3.4.11/net/ipv4/inet_diag.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/inet_diag.c	2012-05-21 18:15:05.000000000 +0200
+ 			if (!relax && reuse && sk2->sk_reuse &&
+diff -NurpP --minimal linux-3.6/net/ipv4/inet_diag.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_diag.c
+--- linux-3.6/net/ipv4/inet_diag.c	2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_diag.c	2012-10-04 19:02:16.000000000 +0200
 @@ -31,6 +31,8 @@
  
  #include <linux/inet.h>
@@ -24667,7 +24311,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/n
  
  #include <linux/inet_diag.h>
  #include <linux/sock_diag.h>
-@@ -106,8 +108,10 @@ int inet_sk_diag_fill(struct sock *sk, s
+@@ -101,8 +103,10 @@ int inet_sk_diag_fill(struct sock *sk, s
  
  	r->id.idiag_sport = inet->inet_sport;
  	r->id.idiag_dport = inet->inet_dport;
@@ -24680,7 +24324,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/n
  
  	/* IPv6 dual-stack sockets use inet->tos for IPv4 connections,
  	 * hence this needs to be included regardless of socket family.
-@@ -227,8 +231,8 @@ static int inet_twsk_diag_fill(struct in
+@@ -233,8 +237,8 @@ static int inet_twsk_diag_fill(struct in
  	sock_diag_save_cookie(tw, r->id.idiag_cookie);
  	r->id.idiag_sport     = tw->tw_sport;
  	r->id.idiag_dport     = tw->tw_dport;
@@ -24691,22 +24335,22 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/n
  	r->idiag_state	      = tw->tw_substate;
  	r->idiag_timer	      = 3;
  	r->idiag_expires      = DIV_ROUND_UP(tmo * 1000, HZ);
-@@ -272,12 +276,14 @@ int inet_diag_dump_one_icsk(struct inet_
+@@ -276,12 +280,14 @@ int inet_diag_dump_one_icsk(struct inet_
  
  	err = -EINVAL;
  	if (req->sdiag_family == AF_INET) {
 +		/* TODO: lback */
- 		sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
+ 		sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0],
  				 req->id.idiag_dport, req->id.idiag_src[0],
  				 req->id.idiag_sport, req->id.idiag_if);
  	}
  #if IS_ENABLED(CONFIG_IPV6)
  	else if (req->sdiag_family == AF_INET6) {
 +		/* TODO: lback */
- 		sk = inet6_lookup(&init_net, hashinfo,
+ 		sk = inet6_lookup(net, hashinfo,
  				  (struct in6_addr *)req->id.idiag_dst,
  				  req->id.idiag_dport,
-@@ -472,6 +478,7 @@ int inet_diag_bc_sk(const struct nlattr 
+@@ -476,6 +482,7 @@ int inet_diag_bc_sk(const struct nlattr 
  	} else
  #endif
  	{
@@ -24714,7 +24358,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/n
  		entry.saddr = &inet->inet_rcv_saddr;
  		entry.daddr = &inet->inet_daddr;
  	}
-@@ -570,6 +577,7 @@ static int inet_twsk_diag_dump(struct in
+@@ -574,6 +581,7 @@ static int inet_twsk_diag_dump(struct in
  		} else
  #endif
  		{
@@ -24722,7 +24366,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/n
  			entry.saddr = &tw->tw_rcv_saddr;
  			entry.daddr = &tw->tw_daddr;
  		}
-@@ -615,8 +623,8 @@ static int inet_diag_fill_req(struct sk_
+@@ -620,8 +628,8 @@ static int inet_diag_fill_req(struct sk_
  
  	r->id.idiag_sport = inet->inet_sport;
  	r->id.idiag_dport = ireq->rmt_port;
@@ -24741,36 +24385,37 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_diag.c linux-3.4.11-vs2.3.3.8/n
  				entry.saddr =
  #if IS_ENABLED(CONFIG_IPV6)
  					(entry.family == AF_INET6) ?
-@@ -744,6 +753,8 @@ void inet_diag_dump_icsk(struct inet_has
- 			sk_nulls_for_each(sk, node, &ilb->head) {
- 				struct inet_sock *inet = inet_sk(sk);
+@@ -748,6 +757,8 @@ void inet_diag_dump_icsk(struct inet_has
+ 				if (!net_eq(sock_net(sk), net))
+ 					continue;
  
 +				if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 +					continue;
  				if (num < s_num) {
  					num++;
  					continue;
-@@ -814,6 +825,8 @@ skip_listen_ht:
- 		sk_nulls_for_each(sk, node, &head->chain) {
- 			struct inet_sock *inet = inet_sk(sk);
+@@ -820,6 +831,8 @@ skip_listen_ht:
  
+ 			if (!net_eq(sock_net(sk), net))
+ 				continue;
 +			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 +				continue;
  			if (num < s_num)
  				goto next_normal;
  			if (!(r->idiag_states & (1 << sk->sk_state)))
-@@ -841,6 +854,8 @@ next_normal:
- 			inet_twsk_for_each(tw, node,
+@@ -848,7 +861,8 @@ next_normal:
  				    &head->twchain) {
- 
+ 				if (!net_eq(twsk_net(tw), net))
+ 					continue;
+-
 +				if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
 +					continue;
  				if (num < s_num)
  					goto next_dying;
  				if (r->sdiag_family != AF_UNSPEC &&
-diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_hashtables.c linux-3.4.11-vs2.3.3.8/net/ipv4/inet_hashtables.c
---- linux-3.4.11/net/ipv4/inet_hashtables.c	2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/inet_hashtables.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/inet_hashtables.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_hashtables.c
+--- linux-3.6/net/ipv4/inet_hashtables.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_hashtables.c	2012-10-04 18:47:00.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <net/inet_connection_sock.h>
  #include <net/inet_hashtables.h>
@@ -24807,9 +24452,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/inet_hashtables.c linux-3.4.11-vs2.3
  	/*
  	 * 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.4.11/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.11-vs2.3.3.8/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.4.11/net/ipv4/netfilter/nf_nat_helper.c	2012-03-19 19:47:33.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/netfilter/nf_nat_helper.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/netfilter/nf_nat_helper.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.6/net/ipv4/netfilter/nf_nat_helper.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/netfilter/nf_nat_helper.c	2012-10-04 18:47:00.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <net/route.h>
  
@@ -24818,9 +24463,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.
  #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.4.11/net/ipv4/netfilter.c linux-3.4.11-vs2.3.3.8/net/ipv4/netfilter.c
---- linux-3.4.11/net/ipv4/netfilter.c	2012-01-09 16:15:03.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/netfilter.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/netfilter.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/netfilter.c
+--- linux-3.6/net/ipv4/netfilter.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/netfilter.c	2012-10-04 18:47:00.000000000 +0200
 @@ -6,7 +6,7 @@
  #include <linux/skbuff.h>
  #include <linux/gfp.h>
@@ -24830,9 +24475,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/netfilter.c linux-3.4.11-vs2.3.3.8/n
  #include <net/xfrm.h>
  #include <net/ip.h>
  #include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv4/raw.c
---- linux-3.4.11/net/ipv4/raw.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/raw.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/raw.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/raw.c
+--- linux-3.6/net/ipv4/raw.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/raw.c	2012-10-04 18:47:00.000000000 +0200
 @@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru
  
  		if (net_eq(sock_net(sk), net) && inet->inet_num == num	&&
@@ -24842,7 +24487,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv
  		    !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
  			goto found; /* gotcha */
  	}
-@@ -390,6 +390,12 @@ static int raw_send_hdrinc(struct sock *
+@@ -397,6 +397,12 @@ static int raw_send_hdrinc(struct sock *
  		icmp_out_count(net, ((struct icmphdr *)
  			skb_transport_header(skb))->type);
  
@@ -24855,7 +24500,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv
  	err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
  		      rt->dst.dev, dst_output);
  	if (err > 0)
-@@ -575,6 +581,16 @@ static int raw_sendmsg(struct kiocb *ioc
+@@ -582,6 +588,16 @@ static int raw_sendmsg(struct kiocb *ioc
  			goto done;
  	}
  
@@ -24872,7 +24517,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv
  	security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
  	rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
  	if (IS_ERR(rt)) {
-@@ -651,17 +667,19 @@ static int raw_bind(struct sock *sk, str
+@@ -658,17 +674,19 @@ static int raw_bind(struct sock *sk, str
  {
  	struct inet_sock *inet = inet_sk(sk);
  	struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
@@ -24895,7 +24540,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv
  	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
  		inet->inet_saddr = 0;  /* Use device */
  	sk_dst_reset(sk);
-@@ -713,7 +731,8 @@ static int raw_recvmsg(struct kiocb *ioc
+@@ -720,7 +738,8 @@ static int raw_recvmsg(struct kiocb *ioc
  	/* Copy the address. */
  	if (sin) {
  		sin->sin_family = AF_INET;
@@ -24905,7 +24550,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv
  		sin->sin_port = 0;
  		memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
  	}
-@@ -909,7 +928,8 @@ static struct sock *raw_get_first(struct
+@@ -916,7 +935,8 @@ static struct sock *raw_get_first(struct
  		struct hlist_node *node;
  
  		sk_for_each(sk, node, &state->h->ht[state->bucket])
@@ -24915,7 +24560,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv
  				goto found;
  	}
  	sk = NULL;
-@@ -925,7 +945,8 @@ static struct sock *raw_get_next(struct 
+@@ -932,7 +952,8 @@ static struct sock *raw_get_next(struct 
  		sk = sk_next(sk);
  try_again:
  		;
@@ -24925,10 +24570,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/raw.c linux-3.4.11-vs2.3.3.8/net/ipv
  
  	if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
  		sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.4.11/net/ipv4/route.c linux-3.4.11-vs2.3.3.8/net/ipv4/route.c
---- linux-3.4.11/net/ipv4/route.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/route.c	2012-05-21 18:15:05.000000000 +0200
-@@ -2696,7 +2696,7 @@ static struct rtable *ip_route_output_sl
+diff -NurpP --minimal linux-3.6/net/ipv4/route.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/route.c
+--- linux-3.6/net/ipv4/route.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/route.c	2012-10-04 18:47:00.000000000 +0200
+@@ -1928,7 +1928,7 @@ struct rtable *__ip_route_output_key(str
  
  
  	if (fl4->flowi4_oif) {
@@ -24937,9 +24582,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/route.c linux-3.4.11-vs2.3.3.8/net/i
  		rth = ERR_PTR(-ENODEV);
  		if (dev_out == NULL)
  			goto out;
-diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp.c linux-3.4.11-vs2.3.3.8/net/ipv4/tcp.c
---- linux-3.4.11/net/ipv4/tcp.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/tcp.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/tcp.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp.c
+--- linux-3.6/net/ipv4/tcp.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp.c	2012-10-04 18:47:00.000000000 +0200
 @@ -268,6 +268,7 @@
  #include <linux/crypto.h>
  #include <linux/time.h>
@@ -24947,11 +24592,11 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp.c linux-3.4.11-vs2.3.3.8/net/ipv
 +#include <linux/in.h>
  
  #include <net/icmp.h>
- #include <net/tcp.h>
-diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/net/ipv4/tcp_ipv4.c
---- linux-3.4.11/net/ipv4/tcp_ipv4.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/tcp_ipv4.c	2012-05-21 18:15:05.000000000 +0200
-@@ -2038,6 +2038,12 @@ static void *listening_get_next(struct s
+ #include <net/inet_common.h>
+diff -NurpP --minimal linux-3.6/net/ipv4/tcp_ipv4.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp_ipv4.c
+--- linux-3.6/net/ipv4/tcp_ipv4.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp_ipv4.c	2012-10-04 18:47:00.000000000 +0200
+@@ -2033,6 +2033,12 @@ static void *listening_get_next(struct s
  		req = req->dl_next;
  		while (1) {
  			while (req) {
@@ -24964,7 +24609,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne
  				if (req->rsk_ops->family == st->family) {
  					cur = req;
  					goto out;
-@@ -2062,6 +2068,10 @@ get_req:
+@@ -2057,6 +2063,10 @@ get_req:
  	}
  get_sk:
  	sk_nulls_for_each_from(sk, node) {
@@ -24975,7 +24620,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne
  		if (!net_eq(sock_net(sk), net))
  			continue;
  		if (sk->sk_family == st->family) {
-@@ -2138,6 +2148,11 @@ static void *established_get_first(struc
+@@ -2133,6 +2143,11 @@ static void *established_get_first(struc
  
  		spin_lock_bh(lock);
  		sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
@@ -24987,7 +24632,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne
  			if (sk->sk_family != st->family ||
  			    !net_eq(sock_net(sk), net)) {
  				continue;
-@@ -2148,6 +2163,11 @@ static void *established_get_first(struc
+@@ -2143,6 +2158,11 @@ static void *established_get_first(struc
  		st->state = TCP_SEQ_STATE_TIME_WAIT;
  		inet_twsk_for_each(tw, node,
  				   &tcp_hashinfo.ehash[st->bucket].twchain) {
@@ -24999,7 +24644,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne
  			if (tw->tw_family != st->family ||
  			    !net_eq(twsk_net(tw), net)) {
  				continue;
-@@ -2177,7 +2197,9 @@ static void *established_get_next(struct
+@@ -2172,7 +2192,9 @@ static void *established_get_next(struct
  		tw = cur;
  		tw = tw_next(tw);
  get_tw:
@@ -25010,7 +24655,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne
  			tw = tw_next(tw);
  		}
  		if (tw) {
-@@ -2201,6 +2223,11 @@ get_tw:
+@@ -2196,6 +2218,11 @@ get_tw:
  		sk = sk_nulls_next(sk);
  
  	sk_nulls_for_each_from(sk, node) {
@@ -25022,7 +24667,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne
  		if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
  			goto found;
  	}
-@@ -2406,9 +2433,9 @@ static void get_openreq4(const struct so
+@@ -2401,9 +2428,9 @@ static void get_openreq4(const struct so
  	seq_printf(f, "%4d: %08X:%04X %08X:%04X"
  		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
  		i,
@@ -25034,7 +24679,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne
  		ntohs(ireq->rmt_port),
  		TCP_SYN_RECV,
  		0, 0, /* could print option size, but that is af dependent. */
-@@ -2430,8 +2457,8 @@ static void get_tcp4_sock(struct sock *s
+@@ -2425,8 +2452,8 @@ static void get_tcp4_sock(struct sock *s
  	const struct tcp_sock *tp = tcp_sk(sk);
  	const struct inet_connection_sock *icsk = inet_csk(sk);
  	const struct inet_sock *inet = inet_sk(sk);
@@ -25045,7 +24690,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne
  	__u16 destp = ntohs(inet->inet_dport);
  	__u16 srcp = ntohs(inet->inet_sport);
  	int rx_queue;
-@@ -2488,8 +2515,8 @@ static void get_timewait4_sock(const str
+@@ -2483,8 +2510,8 @@ static void get_timewait4_sock(const str
  	if (ttd < 0)
  		ttd = 0;
  
@@ -25056,9 +24701,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_ipv4.c linux-3.4.11-vs2.3.3.8/ne
  	destp = ntohs(tw->tw_dport);
  	srcp  = ntohs(tw->tw_sport);
  
-diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_minisocks.c linux-3.4.11-vs2.3.3.8/net/ipv4/tcp_minisocks.c
---- linux-3.4.11/net/ipv4/tcp_minisocks.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/tcp_minisocks.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/tcp_minisocks.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp_minisocks.c
+--- linux-3.6/net/ipv4/tcp_minisocks.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp_minisocks.c	2012-10-04 18:47:00.000000000 +0200
 @@ -23,6 +23,9 @@
  #include <linux/slab.h>
  #include <linux/sysctl.h>
@@ -25069,7 +24714,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_minisocks.c linux-3.4.11-vs2.3.3
  #include <net/tcp.h>
  #include <net/inet_common.h>
  #include <net/xfrm.h>
-@@ -336,6 +339,11 @@ void tcp_time_wait(struct sock *sk, int 
+@@ -287,6 +290,11 @@ void tcp_time_wait(struct sock *sk, int 
  		tcptw->tw_ts_recent	= tp->rx_opt.ts_recent;
  		tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
  
@@ -25081,10 +24726,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/tcp_minisocks.c linux-3.4.11-vs2.3.3
  #if IS_ENABLED(CONFIG_IPV6)
  		if (tw->tw_family == PF_INET6) {
  			struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv4/udp.c
---- linux-3.4.11/net/ipv4/udp.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv4/udp.c	2012-06-28 16:45:36.000000000 +0200
-@@ -298,14 +298,7 @@ fail:
+diff -NurpP --minimal linux-3.6/net/ipv4/udp.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/udp.c
+--- linux-3.6/net/ipv4/udp.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/udp.c	2012-10-04 18:47:00.000000000 +0200
+@@ -300,14 +300,7 @@ fail:
  }
  EXPORT_SYMBOL(udp_lib_get_port);
  
@@ -25100,7 +24745,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  
  static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
  				       unsigned int port)
-@@ -340,6 +333,11 @@ static inline int compute_score(struct s
+@@ -342,6 +335,11 @@ static inline int compute_score(struct s
  			if (inet->inet_rcv_saddr != daddr)
  				return -1;
  			score += 2;
@@ -25112,7 +24757,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  		}
  		if (inet->inet_daddr) {
  			if (inet->inet_daddr != saddr)
-@@ -443,6 +441,7 @@ exact_match:
+@@ -445,6 +443,7 @@ exact_match:
  	return result;
  }
  
@@ -25120,7 +24765,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
   * harder than this. -DaveM
   */
-@@ -488,6 +487,11 @@ begin:
+@@ -490,6 +489,11 @@ begin:
  	sk_nulls_for_each_rcu(sk, node, &hslot->head) {
  		score = compute_score(sk, net, saddr, hnum, sport,
  				      daddr, dport, dif);
@@ -25132,7 +24777,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  		if (score > badness) {
  			result = sk;
  			badness = score;
-@@ -501,6 +505,7 @@ begin:
+@@ -503,6 +507,7 @@ begin:
  	if (get_nulls_value(node) != slot)
  		goto begin;
  
@@ -25140,7 +24785,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  	if (result) {
  		if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
  			result = NULL;
-@@ -510,6 +515,7 @@ begin:
+@@ -512,6 +517,7 @@ begin:
  			goto begin;
  		}
  	}
@@ -25148,7 +24793,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  	rcu_read_unlock();
  	return result;
  }
-@@ -553,8 +559,7 @@ static inline struct sock *udp_v4_mcast_
+@@ -555,8 +561,7 @@ static inline struct sock *udp_v4_mcast_
  		    udp_sk(s)->udp_port_hash != hnum ||
  		    (inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
  		    (inet->inet_dport != rmt_port && inet->inet_dport) ||
@@ -25158,7 +24803,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  		    ipv6_only_sock(s) ||
  		    (s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
  			continue;
-@@ -933,6 +938,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -939,6 +944,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
  				   inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
  				   faddr, saddr, dport, inet->inet_sport);
  
@@ -25175,7 +24820,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  		security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
  		rt = ip_route_output_flow(net, fl4, sk);
  		if (IS_ERR(rt)) {
-@@ -1231,7 +1246,8 @@ try_again:
+@@ -1244,7 +1259,8 @@ try_again:
  	if (sin) {
  		sin->sin_family = AF_INET;
  		sin->sin_port = udp_hdr(skb)->source;
@@ -25185,7 +24830,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  		memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
  	}
  	if (inet->cmsg_flags)
-@@ -1970,6 +1986,8 @@ static struct sock *udp_get_first(struct
+@@ -1992,6 +2008,8 @@ static struct sock *udp_get_first(struct
  		sk_nulls_for_each(sk, node, &hslot->head) {
  			if (!net_eq(sock_net(sk), net))
  				continue;
@@ -25194,7 +24839,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  			if (sk->sk_family == state->family)
  				goto found;
  		}
-@@ -1987,7 +2005,9 @@ static struct sock *udp_get_next(struct 
+@@ -2009,7 +2027,9 @@ static struct sock *udp_get_next(struct 
  
  	do {
  		sk = sk_nulls_next(sk);
@@ -25205,7 +24850,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  
  	if (!sk) {
  		if (state->bucket <= state->udp_table->mask)
-@@ -2083,8 +2103,8 @@ static void udp4_format_sock(struct sock
+@@ -2105,8 +2125,8 @@ static void udp4_format_sock(struct sock
  		int bucket, int *len)
  {
  	struct inet_sock *inet = inet_sk(sp);
@@ -25216,9 +24861,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv4/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  	__u16 destp	  = ntohs(inet->inet_dport);
  	__u16 srcp	  = ntohs(inet->inet_sport);
  
-diff -NurpP --minimal linux-3.4.11/net/ipv6/Kconfig linux-3.4.11-vs2.3.3.8/net/ipv6/Kconfig
---- linux-3.4.11/net/ipv6/Kconfig	2010-08-02 16:52:59.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/Kconfig	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/Kconfig
+--- linux-3.6/net/ipv6/Kconfig	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/Kconfig	2012-10-04 18:47:00.000000000 +0200
 @@ -4,8 +4,8 @@
  
  #   IPv6 as module will cause a CRASH if you try to unload it
@@ -25230,10 +24875,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/Kconfig linux-3.4.11-vs2.3.3.8/net/i
  	---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.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/net/ipv6/addrconf.c
---- linux-3.4.11/net/ipv6/addrconf.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/addrconf.c	2012-05-21 18:15:05.000000000 +0200
-@@ -88,6 +88,8 @@
+diff -NurpP --minimal linux-3.6/net/ipv6/addrconf.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/addrconf.c
+--- linux-3.6/net/ipv6/addrconf.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/addrconf.c	2012-10-04 18:47:00.000000000 +0200
+@@ -92,6 +92,8 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/export.h>
@@ -25242,7 +24887,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  
  /* Set to 3 to get tracing... */
  #define ACONF_DEBUG 2
-@@ -1104,7 +1106,7 @@ out:
+@@ -1095,7 +1097,7 @@ out:
  
  int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
  		       const struct in6_addr *daddr, unsigned int prefs,
@@ -25251,7 +24896,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  {
  	struct ipv6_saddr_score scores[2],
  				*score = &scores[0], *hiscore = &scores[1];
-@@ -1176,6 +1178,8 @@ int ipv6_dev_get_saddr(struct net *net, 
+@@ -1167,6 +1169,8 @@ int ipv6_dev_get_saddr(struct net *net, 
  					       dev->name);
  				continue;
  			}
@@ -25260,7 +24905,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  
  			score->rule = -1;
  			bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -3159,7 +3163,10 @@ static void if6_seq_stop(struct seq_file
+@@ -3150,7 +3154,10 @@ static void if6_seq_stop(struct seq_file
  static int if6_seq_show(struct seq_file *seq, void *v)
  {
  	struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
@@ -25272,7 +24917,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  		   &ifp->addr,
  		   ifp->idev->dev->ifindex,
  		   ifp->prefix_len,
-@@ -3665,6 +3672,11 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3656,6 +3663,11 @@ static int in6_dump_addrs(struct inet6_d
  	struct ifacaddr6 *ifaca;
  	int err = 1;
  	int ip_idx = *p_ip_idx;
@@ -25284,7 +24929,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  
  	read_lock_bh(&idev->lock);
  	switch (type) {
-@@ -3675,6 +3687,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3666,6 +3678,8 @@ static int in6_dump_addrs(struct inet6_d
  		list_for_each_entry(ifa, &idev->addr_list, if_list) {
  			if (++ip_idx < s_ip_idx)
  				continue;
@@ -25293,7 +24938,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  			err = inet6_fill_ifaddr(skb, ifa,
  						NETLINK_CB(cb->skb).pid,
  						cb->nlh->nlmsg_seq,
-@@ -3691,6 +3705,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3682,6 +3696,8 @@ static int in6_dump_addrs(struct inet6_d
  		     ifmca = ifmca->next, ip_idx++) {
  			if (ip_idx < s_ip_idx)
  				continue;
@@ -25302,7 +24947,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  			err = inet6_fill_ifmcaddr(skb, ifmca,
  						  NETLINK_CB(cb->skb).pid,
  						  cb->nlh->nlmsg_seq,
-@@ -3706,6 +3722,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3697,6 +3713,8 @@ static int in6_dump_addrs(struct inet6_d
  		     ifaca = ifaca->aca_next, ip_idx++) {
  			if (ip_idx < s_ip_idx)
  				continue;
@@ -25311,7 +24956,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  			err = inet6_fill_ifacaddr(skb, ifaca,
  						  NETLINK_CB(cb->skb).pid,
  						  cb->nlh->nlmsg_seq,
-@@ -4091,6 +4109,11 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4080,6 +4098,11 @@ static int inet6_dump_ifinfo(struct sk_b
  	struct inet6_dev *idev;
  	struct hlist_head *head;
  	struct hlist_node *node;
@@ -25323,7 +24968,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  
  	s_h = cb->args[0];
  	s_idx = cb->args[1];
-@@ -4102,6 +4125,8 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4091,6 +4114,8 @@ static int inet6_dump_ifinfo(struct sk_b
  		hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
  			if (idx < s_idx)
  				goto cont;
@@ -25332,10 +24977,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/addrconf.c linux-3.4.11-vs2.3.3.8/ne
  			idev = __in6_dev_get(dev);
  			if (!idev)
  				goto cont;
-diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/net/ipv6/af_inet6.c
---- linux-3.4.11/net/ipv6/af_inet6.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/af_inet6.c	2012-09-01 11:15:04.000000000 +0200
-@@ -42,6 +42,8 @@
+diff -NurpP --minimal linux-3.6/net/ipv6/af_inet6.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/af_inet6.c
+--- linux-3.6/net/ipv6/af_inet6.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/af_inet6.c	2012-10-04 18:47:00.000000000 +0200
+@@ -43,6 +43,8 @@
  #include <linux/netdevice.h>
  #include <linux/icmpv6.h>
  #include <linux/netfilter_ipv6.h>
@@ -25344,7 +24989,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne
  
  #include <net/ip.h>
  #include <net/ipv6.h>
-@@ -159,9 +161,12 @@ lookup_protocol:
+@@ -160,9 +162,12 @@ lookup_protocol:
  	}
  
  	err = -EPERM;
@@ -25358,7 +25003,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne
  	sock->ops = answer->ops;
  	answer_prot = answer->prot;
  	answer_no_check = answer->no_check;
-@@ -261,6 +266,7 @@ int inet6_bind(struct socket *sock, stru
+@@ -262,6 +267,7 @@ int inet6_bind(struct socket *sock, stru
  	struct inet_sock *inet = inet_sk(sk);
  	struct ipv6_pinfo *np = inet6_sk(sk);
  	struct net *net = sock_net(sk);
@@ -25366,7 +25011,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne
  	__be32 v4addr = 0;
  	unsigned short snum;
  	int addr_type = 0;
-@@ -276,6 +282,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -277,6 +283,10 @@ int inet6_bind(struct socket *sock, stru
  	if (addr->sin6_family != AF_INET6)
  		return -EAFNOSUPPORT;
  
@@ -25377,7 +25022,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne
  	addr_type = ipv6_addr_type(&addr->sin6_addr);
  	if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
  		return -EINVAL;
-@@ -307,6 +317,7 @@ int inet6_bind(struct socket *sock, stru
+@@ -308,6 +318,7 @@ int inet6_bind(struct socket *sock, stru
  		/* Reproduce AF_INET checks to make the bindings consistent */
  		v4addr = addr->sin6_addr.s6_addr32[3];
  		chk_addr_ret = inet_addr_type(net, v4addr);
@@ -25385,7 +25030,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne
  		if (!sysctl_ip_nonlocal_bind &&
  		    !(inet->freebind || inet->transparent) &&
  		    v4addr != htonl(INADDR_ANY) &&
-@@ -316,6 +327,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -317,6 +328,10 @@ int inet6_bind(struct socket *sock, stru
  			err = -EADDRNOTAVAIL;
  			goto out;
  		}
@@ -25396,7 +25041,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne
  	} else {
  		if (addr_type != IPV6_ADDR_ANY) {
  			struct net_device *dev = NULL;
-@@ -342,6 +357,11 @@ int inet6_bind(struct socket *sock, stru
+@@ -343,6 +358,11 @@ int inet6_bind(struct socket *sock, stru
  				}
  			}
  
@@ -25408,7 +25053,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne
  			/* ipv4 addr of the socket is invalid.  Only the
  			 * unspecified and mapped address have a v4 equivalent.
  			 */
-@@ -358,6 +378,9 @@ int inet6_bind(struct socket *sock, stru
+@@ -359,6 +379,9 @@ int inet6_bind(struct socket *sock, stru
  		}
  	}
  
@@ -25418,7 +25063,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne
  	inet->inet_rcv_saddr = v4addr;
  	inet->inet_saddr = v4addr;
  
-@@ -459,9 +482,11 @@ int inet6_getname(struct socket *sock, s
+@@ -460,9 +483,11 @@ int inet6_getname(struct socket *sock, s
  			return -ENOTCONN;
  		sin->sin6_port = inet->inet_dport;
  		sin->sin6_addr = np->daddr;
@@ -25430,10 +25075,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/af_inet6.c linux-3.4.11-vs2.3.3.8/ne
  		if (ipv6_addr_any(&np->rcv_saddr))
  			sin->sin6_addr = np->saddr;
  		else
-diff -NurpP --minimal linux-3.4.11/net/ipv6/datagram.c linux-3.4.11-vs2.3.3.8/net/ipv6/datagram.c
---- linux-3.4.11/net/ipv6/datagram.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/datagram.c	2012-05-21 18:15:05.000000000 +0200
-@@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, s
+diff -NurpP --minimal linux-3.6/net/ipv6/datagram.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/datagram.c
+--- linux-3.6/net/ipv6/datagram.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/datagram.c	2012-10-04 18:47:00.000000000 +0200
+@@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s
  
  			rcu_read_lock();
  			if (fl6->flowi6_oif) {
@@ -25442,10 +25087,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/datagram.c linux-3.4.11-vs2.3.3.8/ne
  				if (!dev) {
  					rcu_read_unlock();
  					return -ENODEV;
-diff -NurpP --minimal linux-3.4.11/net/ipv6/fib6_rules.c linux-3.4.11-vs2.3.3.8/net/ipv6/fib6_rules.c
---- linux-3.4.11/net/ipv6/fib6_rules.c	2012-03-19 19:47:33.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/fib6_rules.c	2012-05-21 18:15:05.000000000 +0200
-@@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_r
+diff -NurpP --minimal linux-3.6/net/ipv6/fib6_rules.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/fib6_rules.c
+--- linux-3.6/net/ipv6/fib6_rules.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/fib6_rules.c	2012-10-04 18:47:00.000000000 +0200
+@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
  					       ip6_dst_idev(&rt->dst)->dev,
  					       &flp6->daddr,
  					       rt6_flags2srcprefs(flags),
@@ -25454,9 +25099,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/fib6_rules.c linux-3.4.11-vs2.3.3.8/
  				goto again;
  			if (!ipv6_prefix_equal(&saddr, &r->src.addr,
  					       r->src.plen))
-diff -NurpP --minimal linux-3.4.11/net/ipv6/inet6_hashtables.c linux-3.4.11-vs2.3.3.8/net/ipv6/inet6_hashtables.c
---- linux-3.4.11/net/ipv6/inet6_hashtables.c	2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/inet6_hashtables.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/inet6_hashtables.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/inet6_hashtables.c
+--- linux-3.6/net/ipv6/inet6_hashtables.c	2011-10-24 18:45:34.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/inet6_hashtables.c	2012-10-04 18:47:00.000000000 +0200
 @@ -16,6 +16,7 @@
  
  #include <linux/module.h>
@@ -25492,9 +25137,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/inet6_hashtables.c linux-3.4.11-vs2.
  		}
  		if (sk->sk_bound_dev_if) {
  			if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.4.11/net/ipv6/ip6_output.c linux-3.4.11-vs2.3.3.8/net/ipv6/ip6_output.c
---- linux-3.4.11/net/ipv6/ip6_output.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/ip6_output.c	2012-06-28 16:45:07.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/ip6_output.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/ip6_output.c
+--- linux-3.6/net/ipv6/ip6_output.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/ip6_output.c	2012-10-04 18:47:00.000000000 +0200
 @@ -966,7 +966,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,
@@ -25505,10 +25150,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/ip6_output.c linux-3.4.11-vs2.3.3.8/
  		if (err)
  			goto out_err_release;
  	}
-diff -NurpP --minimal linux-3.4.11/net/ipv6/ndisc.c linux-3.4.11-vs2.3.3.8/net/ipv6/ndisc.c
---- linux-3.4.11/net/ipv6/ndisc.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/ndisc.c	2012-05-21 18:15:05.000000000 +0200
-@@ -575,7 +575,7 @@ static void ndisc_send_na(struct net_dev
+diff -NurpP --minimal linux-3.6/net/ipv6/ndisc.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/ndisc.c
+--- linux-3.6/net/ipv6/ndisc.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/ndisc.c	2012-10-04 18:47:00.000000000 +0200
+@@ -517,7 +517,7 @@ static void ndisc_send_na(struct net_dev
  	} else {
  		if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
  				       inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
@@ -25517,9 +25162,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/ndisc.c linux-3.4.11-vs2.3.3.8/net/i
  			return;
  		src_addr = &tmpaddr;
  	}
-diff -NurpP --minimal linux-3.4.11/net/ipv6/raw.c linux-3.4.11-vs2.3.3.8/net/ipv6/raw.c
---- linux-3.4.11/net/ipv6/raw.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/raw.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/raw.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/raw.c
+--- linux-3.6/net/ipv6/raw.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/raw.c	2012-10-04 18:47:00.000000000 +0200
 @@ -30,6 +30,7 @@
  #include <linux/icmpv6.h>
  #include <linux/netfilter.h>
@@ -25528,7 +25173,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/raw.c linux-3.4.11-vs2.3.3.8/net/ipv
  #include <linux/skbuff.h>
  #include <linux/compat.h>
  #include <asm/uaccess.h>
-@@ -285,6 +286,13 @@ static int rawv6_bind(struct sock *sk, s
+@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s
  				goto out_unlock;
  		}
  
@@ -25542,10 +25187,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/raw.c linux-3.4.11-vs2.3.3.8/net/ipv
  		/* ipv4 addr of the socket is invalid.  Only the
  		 * unspecified and mapped address have a v4 equivalent.
  		 */
-diff -NurpP --minimal linux-3.4.11/net/ipv6/route.c linux-3.4.11-vs2.3.3.8/net/ipv6/route.c
---- linux-3.4.11/net/ipv6/route.c	2012-09-16 20:46:17.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/route.c	2012-07-18 00:29:44.000000000 +0200
-@@ -55,6 +55,7 @@
+diff -NurpP --minimal linux-3.6/net/ipv6/route.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/route.c
+--- linux-3.6/net/ipv6/route.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/route.c	2012-10-04 18:47:00.000000000 +0200
+@@ -57,6 +57,7 @@
  #include <net/xfrm.h>
  #include <net/netevent.h>
  #include <net/netlink.h>
@@ -25553,7 +25198,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/route.c linux-3.4.11-vs2.3.3.8/net/i
  
  #include <asm/uaccess.h>
  
-@@ -2144,15 +2145,17 @@ int ip6_route_get_saddr(struct net *net,
+@@ -2111,15 +2112,17 @@ int ip6_route_get_saddr(struct net *net,
  			struct rt6_info *rt,
  			const struct in6_addr *daddr,
  			unsigned int prefs,
@@ -25574,17 +25219,17 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/route.c linux-3.4.11-vs2.3.3.8/net/i
  	return err;
  }
  
-@@ -2483,7 +2486,8 @@ static int rt6_fill_node(struct net *net
- 			NLA_PUT_U32(skb, RTA_IIF, iif);
+@@ -2455,7 +2458,8 @@ static int rt6_fill_node(struct net *net
+ 				goto nla_put_failure;
  	} else if (dst) {
  		struct in6_addr saddr_buf;
--		if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0)
+-		if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
 +		if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
-+					(skb->sk ? skb->sk->sk_nx_info : NULL)) == 0)
- 			NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
++		    (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
+ 		    nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
+ 			goto nla_put_failure;
  	}
- 
-@@ -2710,6 +2714,7 @@ static int rt6_info_route(struct rt6_inf
+@@ -2673,6 +2677,7 @@ static int rt6_info_route(struct rt6_inf
  	struct seq_file *m = p_arg;
  	struct neighbour *n;
  
@@ -25592,9 +25237,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/route.c linux-3.4.11-vs2.3.3.8/net/i
  	seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
  
  #ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.4.11/net/ipv6/tcp_ipv6.c linux-3.4.11-vs2.3.3.8/net/ipv6/tcp_ipv6.c
---- linux-3.4.11/net/ipv6/tcp_ipv6.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/tcp_ipv6.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/tcp_ipv6.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/tcp_ipv6.c
+--- linux-3.6/net/ipv6/tcp_ipv6.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/tcp_ipv6.c	2012-10-04 18:47:00.000000000 +0200
 @@ -71,6 +71,7 @@
  
  #include <linux/crypto.h>
@@ -25603,7 +25248,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/tcp_ipv6.c linux-3.4.11-vs2.3.3.8/ne
  
  static void	tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
  static void	tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
-@@ -163,8 +164,15 @@ static int tcp_v6_connect(struct sock *s
+@@ -175,8 +176,15 @@ static int tcp_v6_connect(struct sock *s
  	 *	connect() to INADDR_ANY means loopback (BSD'ism).
  	 */
  
@@ -25621,10 +25266,10 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/tcp_ipv6.c linux-3.4.11-vs2.3.3.8/ne
  
  	addr_type = ipv6_addr_type(&usin->sin6_addr);
  
-diff -NurpP --minimal linux-3.4.11/net/ipv6/udp.c linux-3.4.11-vs2.3.3.8/net/ipv6/udp.c
---- linux-3.4.11/net/ipv6/udp.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/udp.c	2012-05-21 18:15:05.000000000 +0200
-@@ -45,41 +45,67 @@
+diff -NurpP --minimal linux-3.6/net/ipv6/udp.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/udp.c
+--- linux-3.6/net/ipv6/udp.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/udp.c	2012-10-04 18:56:03.000000000 +0200
+@@ -45,42 +45,68 @@
  #include <net/tcp_states.h>
  #include <net/ip6_checksum.h>
  #include <net/xfrm.h>
@@ -25632,6 +25277,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
+ #include <trace/events/skb.h>
  #include "udp_impl.h"
  
 -int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
@@ -25705,7 +25351,7 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  }
  
  static unsigned int udp6_portaddr_hash(struct net *net,
-@@ -143,6 +169,10 @@ static inline int compute_score(struct s
+@@ -144,6 +170,10 @@ static inline int compute_score(struct s
  			if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
  				return -1;
  			score++;
@@ -25716,9 +25362,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/udp.c linux-3.4.11-vs2.3.3.8/net/ipv
  		}
  		if (!ipv6_addr_any(&np->daddr)) {
  			if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.4.11/net/ipv6/xfrm6_policy.c linux-3.4.11-vs2.3.3.8/net/ipv6/xfrm6_policy.c
---- linux-3.4.11/net/ipv6/xfrm6_policy.c	2012-03-19 19:47:33.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/net/ipv6/xfrm6_policy.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/xfrm6_policy.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/xfrm6_policy.c
+--- linux-3.6/net/ipv6/xfrm6_policy.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/xfrm6_policy.c	2012-10-04 18:47:00.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,
@@ -25728,9 +25374,9 @@ diff -NurpP --minimal linux-3.4.11/net/ipv6/xfrm6_policy.c linux-3.4.11-vs2.3.3.
  	dst_release(dst);
  	return 0;
  }
-diff -NurpP --minimal linux-3.4.11/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.11-vs2.3.3.8/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.4.11/net/netfilter/ipvs/ip_vs_xmit.c	2012-03-19 19:47:33.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/net/netfilter/ipvs/ip_vs_xmit.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/netfilter/ipvs/ip_vs_xmit.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.6/net/netfilter/ipvs/ip_vs_xmit.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/netfilter/ipvs/ip_vs_xmit.c	2012-10-04 18:47:00.000000000 +0200
 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
  		return dst;
  	if (ipv6_addr_any(&fl6.saddr) &&
@@ -25740,9 +25386,9 @@ diff -NurpP --minimal linux-3.4.11/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.11-
  		goto out_err;
  	if (do_xfrm) {
  		dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3.8/net/netlink/af_netlink.c
---- linux-3.4.11/net/netlink/af_netlink.c	2012-05-21 18:07:41.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/netlink/af_netlink.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/netlink/af_netlink.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/netlink/af_netlink.c
+--- linux-3.6/net/netlink/af_netlink.c	2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/netlink/af_netlink.c	2012-10-04 18:47:00.000000000 +0200
 @@ -55,6 +55,9 @@
  #include <linux/types.h>
  #include <linux/audit.h>
@@ -25753,7 +25399,7 @@ diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3
  
  #include <net/net_namespace.h>
  #include <net/sock.h>
-@@ -1926,6 +1929,8 @@ static struct sock *netlink_seq_socket_i
+@@ -1959,6 +1962,8 @@ static struct sock *netlink_seq_socket_i
  			sk_for_each(s, node, &hash->table[j]) {
  				if (sock_net(s) != seq_file_net(seq))
  					continue;
@@ -25762,7 +25408,7 @@ diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3
  				if (off == pos) {
  					iter->link = i;
  					iter->hash_idx = j;
-@@ -1960,7 +1965,8 @@ static void *netlink_seq_next(struct seq
+@@ -1993,7 +1998,8 @@ static void *netlink_seq_next(struct seq
  	s = v;
  	do {
  		s = sk_next(s);
@@ -25772,7 +25418,7 @@ diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3
  	if (s)
  		return s;
  
-@@ -1972,7 +1978,8 @@ static void *netlink_seq_next(struct seq
+@@ -2005,7 +2011,8 @@ static void *netlink_seq_next(struct seq
  
  		for (; j <= hash->mask; j++) {
  			s = sk_head(&hash->table[j]);
@@ -25782,9 +25428,9 @@ diff -NurpP --minimal linux-3.4.11/net/netlink/af_netlink.c linux-3.4.11-vs2.3.3
  				s = sk_next(s);
  			if (s) {
  				iter->link = i;
-diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socket.c
---- linux-3.4.11/net/socket.c	2012-09-16 20:46:18.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/socket.c	2012-09-16 20:49:11.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/socket.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/socket.c
+--- linux-3.6/net/socket.c	2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/socket.c	2012-10-04 18:47:00.000000000 +0200
 @@ -98,6 +98,10 @@
  
  #include <net/sock.h>
@@ -25796,7 +25442,7 @@ diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socke
  
  #include <linux/if_tun.h>
  #include <linux/ipv6_route.h>
-@@ -551,6 +555,7 @@ static inline int __sock_sendmsg_nosec(s
+@@ -552,6 +556,7 @@ static inline int __sock_sendmsg_nosec(s
  				       struct msghdr *msg, size_t size)
  {
  	struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -25804,7 +25450,7 @@ diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socke
  
  	sock_update_classid(sock->sk);
  
-@@ -561,7 +566,22 @@ static inline int __sock_sendmsg_nosec(s
+@@ -560,7 +565,22 @@ static inline int __sock_sendmsg_nosec(s
  	si->msg = msg;
  	si->size = size;
  
@@ -25828,7 +25474,7 @@ diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socke
  }
  
  static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-@@ -717,6 +737,7 @@ static inline int __sock_recvmsg_nosec(s
+@@ -716,6 +736,7 @@ static inline int __sock_recvmsg_nosec(s
  				       struct msghdr *msg, size_t size, int flags)
  {
  	struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -25836,7 +25482,7 @@ diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socke
  
  	sock_update_classid(sock->sk);
  
-@@ -726,7 +747,18 @@ static inline int __sock_recvmsg_nosec(s
+@@ -725,7 +746,18 @@ static inline int __sock_recvmsg_nosec(s
  	si->size = size;
  	si->flags = flags;
  
@@ -25856,7 +25502,7 @@ diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socke
  }
  
  static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-@@ -1211,6 +1243,13 @@ int __sock_create(struct net *net, int f
+@@ -1210,6 +1242,13 @@ int __sock_create(struct net *net, int f
  	if (type < 0 || type >= SOCK_MAX)
  		return -EINVAL;
  
@@ -25870,7 +25516,7 @@ diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socke
  	/* Compatibility.
  
  	   This uglymoron is moved from INET layer to here to avoid
-@@ -1346,6 +1385,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1344,6 +1383,7 @@ SYSCALL_DEFINE3(socket, int, family, int
  	if (retval < 0)
  		goto out;
  
@@ -25878,7 +25524,7 @@ diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socke
  	retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
  	if (retval < 0)
  		goto out_release;
-@@ -1387,10 +1427,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+@@ -1385,10 +1425,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
  	err = sock_create(family, type, protocol, &sock1);
  	if (err < 0)
  		goto out;
@@ -25891,18 +25537,18 @@ diff -NurpP --minimal linux-3.4.11/net/socket.c linux-3.4.11-vs2.3.3.8/net/socke
  
  	err = sock1->ops->socketpair(sock1, sock2);
  	if (err < 0)
-diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth.c linux-3.4.11-vs2.3.3.8/net/sunrpc/auth.c
---- linux-3.4.11/net/sunrpc/auth.c	2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/sunrpc/auth.c	2012-05-21 18:15:05.000000000 +0200
-@@ -14,6 +14,7 @@
- #include <linux/hash.h>
+diff -NurpP --minimal linux-3.6/net/sunrpc/auth.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/auth.c
+--- linux-3.6/net/sunrpc/auth.c	2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/auth.c	2012-10-04 18:47:00.000000000 +0200
+@@ -15,6 +15,7 @@
  #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/gss_api.h>
  #include <linux/spinlock.h>
 +#include <linux/vs_tag.h>
  
  #ifdef RPC_DEBUG
  # define RPCDBG_FACILITY	RPCDBG_AUTH
-@@ -427,6 +428,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
+@@ -481,6 +482,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
  	memset(&acred, 0, sizeof(acred));
  	acred.uid = cred->fsuid;
  	acred.gid = cred->fsgid;
@@ -25910,7 +25556,7 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth.c linux-3.4.11-vs2.3.3.8/net/
  	acred.group_info = get_group_info(((struct cred *)cred)->group_info);
  
  	ret = auth->au_ops->lookup_cred(auth, &acred, flags);
-@@ -467,6 +469,7 @@ rpcauth_bind_root_cred(struct rpc_task *
+@@ -521,6 +523,7 @@ rpcauth_bind_root_cred(struct rpc_task *
  	struct auth_cred acred = {
  		.uid = 0,
  		.gid = 0,
@@ -25918,33 +25564,32 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth.c linux-3.4.11-vs2.3.3.8/net/
  	};
  
  	dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth_unix.c linux-3.4.11-vs2.3.3.8/net/sunrpc/auth_unix.c
---- linux-3.4.11/net/sunrpc/auth_unix.c	2012-01-09 16:15:04.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/net/sunrpc/auth_unix.c	2012-05-21 18:15:05.000000000 +0200
-@@ -12,12 +12,14 @@
- #include <linux/module.h>
+diff -NurpP --minimal linux-3.6/net/sunrpc/auth_unix.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/auth_unix.c
+--- linux-3.6/net/sunrpc/auth_unix.c	2012-07-22 23:39:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/auth_unix.c	2012-10-04 18:47:00.000000000 +0200
+@@ -13,11 +13,13 @@
  #include <linux/sunrpc/clnt.h>
  #include <linux/sunrpc/auth.h>
+ #include <linux/user_namespace.h>
 +#include <linux/vs_tag.h>
  
  #define NFS_NGROUPS	16
  
  struct unx_cred {
  	struct rpc_cred		uc_base;
- 	gid_t			uc_gid;
 +	tag_t			uc_tag;
+ 	gid_t			uc_gid;
  	gid_t			uc_gids[NFS_NGROUPS];
  };
- #define uc_uid			uc_base.cr_uid
-@@ -78,6 +80,7 @@ unx_create_cred(struct rpc_auth *auth, s
+@@ -79,6 +81,7 @@ unx_create_cred(struct rpc_auth *auth, s
  		groups = NFS_NGROUPS;
  
  	cred->uc_gid = acred->gid;
 +	cred->uc_tag = acred->tag;
- 	for (i = 0; i < groups; i++)
- 		cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
- 	if (i < NFS_NGROUPS)
-@@ -119,7 +122,9 @@ unx_match(struct auth_cred *acred, struc
+ 	for (i = 0; i < groups; i++) {
+ 		gid_t gid;
+ 		gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
+@@ -123,7 +126,9 @@ unx_match(struct auth_cred *acred, struc
  	unsigned int i;
  
  
@@ -25955,7 +25600,7 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth_unix.c linux-3.4.11-vs2.3.3.8
  		return 0;
  
  	if (acred->group_info != NULL)
-@@ -145,7 +150,7 @@ unx_marshal(struct rpc_task *task, __be3
+@@ -152,7 +157,7 @@ unx_marshal(struct rpc_task *task, __be3
  	struct rpc_clnt	*clnt = task->tk_client;
  	struct unx_cred	*cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
  	__be32		*base, *hold;
@@ -25964,7 +25609,7 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth_unix.c linux-3.4.11-vs2.3.3.8
  
  	*p++ = htonl(RPC_AUTH_UNIX);
  	base = p++;
-@@ -155,9 +160,12 @@ unx_marshal(struct rpc_task *task, __be3
+@@ -162,9 +167,12 @@ unx_marshal(struct rpc_task *task, __be3
  	 * Copy the UTS nodename captured when the client was created.
  	 */
  	p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
@@ -25979,9 +25624,9 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/auth_unix.c linux-3.4.11-vs2.3.3.8
  	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.4.11/net/sunrpc/clnt.c linux-3.4.11-vs2.3.3.8/net/sunrpc/clnt.c
---- linux-3.4.11/net/sunrpc/clnt.c	2012-09-16 20:46:18.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/sunrpc/clnt.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/sunrpc/clnt.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/clnt.c
+--- linux-3.6/net/sunrpc/clnt.c	2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/clnt.c	2012-10-04 18:47:00.000000000 +0200
 @@ -31,6 +31,7 @@
  #include <linux/in6.h>
  #include <linux/un.h>
@@ -25990,7 +25635,7 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/clnt.c linux-3.4.11-vs2.3.3.8/net/
  
  #include <linux/sunrpc/clnt.h>
  #include <linux/sunrpc/rpc_pipe_fs.h>
-@@ -483,6 +484,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
+@@ -481,6 +482,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
  	if (!(args->flags & RPC_CLNT_CREATE_QUIET))
  		clnt->cl_chatty = 1;
  
@@ -26000,9 +25645,9 @@ diff -NurpP --minimal linux-3.4.11/net/sunrpc/clnt.c linux-3.4.11-vs2.3.3.8/net/
  	return clnt;
  }
  EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.4.11/net/unix/af_unix.c linux-3.4.11-vs2.3.3.8/net/unix/af_unix.c
---- linux-3.4.11/net/unix/af_unix.c	2012-05-21 18:07:41.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/net/unix/af_unix.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/unix/af_unix.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/unix/af_unix.c
+--- linux-3.6/net/unix/af_unix.c	2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/unix/af_unix.c	2012-10-04 18:59:36.000000000 +0200
 @@ -114,6 +114,8 @@
  #include <linux/mount.h>
  #include <net/checksum.h>
@@ -26010,9 +25655,9 @@ diff -NurpP --minimal linux-3.4.11/net/unix/af_unix.c linux-3.4.11-vs2.3.3.8/net
 +#include <linux/vs_context.h>
 +#include <linux/vs_limit.h>
  
- struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
+ struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
  EXPORT_SYMBOL_GPL(unix_socket_table);
-@@ -261,6 +263,8 @@ static struct sock *__unix_find_socket_b
+@@ -271,6 +273,8 @@ static struct sock *__unix_find_socket_b
  		if (!net_eq(sock_net(s), net))
  			continue;
  
@@ -26021,28 +25666,27 @@ diff -NurpP --minimal linux-3.4.11/net/unix/af_unix.c linux-3.4.11-vs2.3.3.8/net
  		if (u->addr->len == len &&
  		    !memcmp(u->addr->name, sunname, len))
  			goto found;
-@@ -2266,6 +2270,8 @@ static struct sock *unix_seq_idx(struct 
- 	for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
- 		if (sock_net(s) != seq_file_net(seq))
+@@ -2258,6 +2262,8 @@ static struct sock *unix_from_bucket(str
+ 	for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
+ 		if (sock_net(sk) != seq_file_net(seq))
  			continue;
-+		if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 +			continue;
- 		if (off == pos)
- 			return s;
- 		++off;
-@@ -2290,7 +2296,8 @@ static void *unix_seq_next(struct seq_fi
- 		sk = first_unix_socket(&iter->i);
- 	else
- 		sk = next_unix_socket(&iter->i, sk);
--	while (sk && (sock_net(sk) != seq_file_net(seq)))
-+	while (sk && (sock_net(sk) != seq_file_net(seq) ||
-+		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)))
- 		sk = next_unix_socket(&iter->i, sk);
- 	return sk;
- }
-diff -NurpP --minimal linux-3.4.11/scripts/checksyscalls.sh linux-3.4.11-vs2.3.3.8/scripts/checksyscalls.sh
---- linux-3.4.11/scripts/checksyscalls.sh	2012-03-19 19:47:34.000000000 +0100
-+++ linux-3.4.11-vs2.3.3.8/scripts/checksyscalls.sh	2012-05-21 18:15:05.000000000 +0200
+ 		if (++count == offset)
+ 			break;
+ 	}
+@@ -2275,6 +2281,8 @@ static struct sock *unix_next_socket(str
+ 		sk = sk_next(sk);
+ 		if (!sk)
+ 			goto next_bucket;
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (sock_net(sk) == seq_file_net(seq))
+ 			return sk;
+ 	}
+diff -NurpP --minimal linux-3.6/scripts/checksyscalls.sh linux-3.6-vs2.3.4.3-noxfs-nocow/scripts/checksyscalls.sh
+--- linux-3.6/scripts/checksyscalls.sh	2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/scripts/checksyscalls.sh	2012-10-04 18:47:00.000000000 +0200
 @@ -193,7 +193,6 @@ cat << EOF
  #define __IGNORE_afs_syscall
  #define __IGNORE_getpmsg
@@ -26051,9 +25695,9 @@ diff -NurpP --minimal linux-3.4.11/scripts/checksyscalls.sh linux-3.4.11-vs2.3.3
  EOF
  }
  
-diff -NurpP --minimal linux-3.4.11/security/commoncap.c linux-3.4.11-vs2.3.3.8/security/commoncap.c
---- linux-3.4.11/security/commoncap.c	2012-05-21 18:07:41.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/security/commoncap.c	2012-05-21 18:15:05.000000000 +0200
+diff -NurpP --minimal linux-3.6/security/commoncap.c linux-3.6-vs2.3.4.3-noxfs-nocow/security/commoncap.c
+--- linux-3.6/security/commoncap.c	2012-07-22 23:39:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/security/commoncap.c	2012-10-04 18:47:00.000000000 +0200
 @@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st
  int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
  		int cap, int audit)
@@ -26061,14 +25705,14 @@ diff -NurpP --minimal linux-3.4.11/security/commoncap.c linux-3.4.11-vs2.3.3.8/s
 +	struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
 +
  	for (;;) {
- 		/* The creator of the user namespace has all caps. */
- 		if (targ_ns != &init_user_ns && targ_ns->creator == cred->user)
+ 		/* The owner of the user namespace has all caps. */
+ 		if (targ_ns != &init_user_ns && uid_eq(targ_ns->owner, cred->euid))
  			return 0;
  
  		/* Do we have the necessary capabilities? */
--		if (targ_ns == cred->user->user_ns)
+-		if (targ_ns == cred->user_ns)
 -			return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
-+		if (targ_ns == cred->user->user_ns) {
++		if (targ_ns == cred->user_ns) {
 +			if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
 +			    cap_raised(cred->cap_effective, cap))
 +				return 0;
@@ -26077,7 +25721,7 @@ diff -NurpP --minimal linux-3.4.11/security/commoncap.c linux-3.4.11-vs2.3.3.8/s
  
  		/* Have we tried all of the parent namespaces? */
  		if (targ_ns == &init_user_ns)
-@@ -612,7 +618,7 @@ int cap_inode_setxattr(struct dentry *de
+@@ -619,7 +625,7 @@ int cap_inode_setxattr(struct dentry *de
  
  	if (!strncmp(name, XATTR_SECURITY_PREFIX,
  		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
@@ -26086,7 +25730,7 @@ diff -NurpP --minimal linux-3.4.11/security/commoncap.c linux-3.4.11-vs2.3.3.8/s
  		return -EPERM;
  	return 0;
  }
-@@ -638,7 +644,7 @@ int cap_inode_removexattr(struct dentry 
+@@ -645,7 +651,7 @@ int cap_inode_removexattr(struct dentry 
  
  	if (!strncmp(name, XATTR_SECURITY_PREFIX,
  		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
@@ -26095,9 +25739,9 @@ diff -NurpP --minimal linux-3.4.11/security/commoncap.c linux-3.4.11-vs2.3.3.8/s
  		return -EPERM;
  	return 0;
  }
-diff -NurpP --minimal linux-3.4.11/security/selinux/hooks.c linux-3.4.11-vs2.3.3.8/security/selinux/hooks.c
---- linux-3.4.11/security/selinux/hooks.c	2012-09-16 20:46:18.000000000 +0200
-+++ linux-3.4.11-vs2.3.3.8/security/selinux/hooks.c	2012-09-01 10:50:49.000000000 +0200
+diff -NurpP --minimal linux-3.6/security/selinux/hooks.c linux-3.6-vs2.3.4.3-noxfs-nocow/security/selinux/hooks.c
+--- linux-3.6/security/selinux/hooks.c	2012-10-04 15:27:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/security/selinux/hooks.c	2012-10-04 18:47:00.000000000 +0200
 @@ -66,7 +66,6 @@
  #include <linux/dccp.h>
  #include <linux/quota.h>
author	Natanael Copa <ncopa@alpinelinux.org>	2012-10-22 09:49:02 +0000
committer	Natanael Copa <ncopa@alpinelinux.org>	2012-10-22 13:13:20 +0000
commit	605fc412762b96bd7c11eb0493af6a0da2f96a7a (patch)
tree	ed0543060b50e3076a4cc13d72bfbc86e4d642ab /main/linux-vserver
parent	ce95a5b57de16d961d1f8be7eb4ef12b440b4e9e (diff)
download	aports-605fc412762b96bd7c11eb0493af6a0da2f96a7a.tar.bz2 aports-605fc412762b96bd7c11eb0493af6a0da2f96a7a.tar.xz