diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 706530ebd95edb9795f6319733b5ee8ab59d4a6f..c1596b962d7e77161aaecb7dfd980af437aa0ee7 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -3,7 +3,7 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * Support for kernels:
         2.6.5-7.283 (SLES 9)
         2.6.9-55.EL (RHEL 4)
-        2.6.16.27-0.9 (SLES 10)
+        2.6.16.46-0.14 (SLES 10)
         2.6.18.8 vanilla (kernel.org)
        * Client support for unpatched kernels:
         (see http://wiki.lustre.org/index.php?title=Patchless_Client)
@@ -13,6 +13,12 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * Recommended e2fsprogs version: 1.39.cfs8
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
 
+Severity   : normal
+Frequency  : only for sles10
+Bugzilla   : 12771
+Description: Update patches for SLES 10 SP1 kernel.
+Details    : Update patch vfs_intent-2.6-sles10.patch.
+
 Severity   : normal
 Frequency  : rare
 Bugzilla   : 12543
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config
index b35a129d8f5b57c8411a50f19ab1b2e91b974f81..013ad4368ceb9f21c9b3f7efadb5085960c92663 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.27
-# Mon Mar 12 22:26:47 2007
+# Linux kernel version: 2.6.16.46
+# Tue Jul  3 17:56:03 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -25,6 +25,9 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SUSE_KERNEL=y
+CONFIG_SLE_VERSION=10
+CONFIG_SLE_SP=1
+CONFIG_SLE_SP_SUBLEVEL=0
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -32,12 +35,14 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASKSTATS=y
+CONFIG_TASK_XACCT=y
 CONFIG_SYSCTL=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CPUSETS=y
+CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 CONFIG_VM86=y
@@ -79,6 +84,7 @@ CONFIG_STOP_MACHINE=y
 # Block layer
 #
 CONFIG_LBD=y
+CONFIG_BLK_DEV_IO_TRACE=y
 
 #
 # IO Schedulers
@@ -205,6 +211,7 @@ CONFIG_KEXEC=y
 CONFIG_PHYSICAL_START=0x100000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_DOUBLEFAULT=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
 # Power management options (ACPI, APM)
@@ -858,6 +865,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -1163,6 +1171,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
+CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -1185,15 +1194,15 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 
 #
-# SCSI Transports
+# SCSI Transport Attributes
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_ISCSI_TARGET=m
-CONFIG_SCSI_SAS_DOMAIN_ATTRS=m
-CONFIG_SCSI_SAS_DOMAIN_DEBUG=y
 
 #
 # SCSI low-level drivers
@@ -1223,29 +1232,15 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 CONFIG_SCSI_AIC94XX=m
 CONFIG_AIC94XX_DEBUG=y
 CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_ARCMSR=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=m
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-# CONFIG_SCSI_SATA_ULI is not set
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_ACPI=y
+CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_DMX3191D=m
@@ -1271,7 +1266,7 @@ CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
@@ -1282,8 +1277,7 @@ CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
-# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
-CONFIG_SCSI_QLA4XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
@@ -1300,12 +1294,75 @@ CONFIG_SCSI_DEBUG=m
 #
 # PCMCIA SCSI adapter support
 #
-CONFIG_PCMCIA_AHA152X=m
+# CONFIG_PCMCIA_AHA152X is not set
 CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_NINJA_SCSI=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+CONFIG_ATA_ACPI=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CYPRESS is not set
+CONFIG_PATA_EFAR=m
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_TRIFLEX is not set
+CONFIG_PATA_MARVELL=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+CONFIG_PATA_NETCELL=m
+# CONFIG_PATA_NS87410 is not set
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_OPTIDMA=m
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_QDI is not set
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RZ1000=m
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+CONFIG_PATA_SIL680=m
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+
 #
 # Old CD-ROM drivers (not SCSI, not IDE)
 #
@@ -1338,6 +1395,8 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_HP_SW=m
+CONFIG_DM_MULTIPATH_RDAC=m
 CONFIG_DM_NL_EVT=y
 
 #
@@ -1348,6 +1407,7 @@ CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_MAX_FC_SGE=256
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
 
@@ -1548,6 +1608,7 @@ CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_QLA3XXX=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1557,6 +1618,7 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
+CONFIG_NETXEN_NIC=m
 
 #
 # Token Ring devices
@@ -2004,6 +2066,7 @@ CONFIG_SPECIALIX=m
 # CONFIG_SPECIALIX_RTSCTS is not set
 CONFIG_SX=m
 CONFIG_STALDRV=y
+CONFIG_NOZOMI=m
 
 #
 # Serial drivers
@@ -2154,6 +2217,7 @@ CONFIG_HANGCHECK_TIMER=m
 # TPM devices
 #
 CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
@@ -2260,6 +2324,7 @@ CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS1621=m
@@ -2281,12 +2346,15 @@ CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT8231=m
 CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
@@ -2683,6 +2751,18 @@ CONFIG_SND_CS4281=m
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ENS1370=m
@@ -2690,6 +2770,7 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_FM801_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSP=m
@@ -2985,6 +3066,7 @@ CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_XIRCOM=m
@@ -3001,6 +3083,7 @@ CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_PHIDGETKIT=m
@@ -3089,7 +3172,6 @@ CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_EXPORT=y
 CONFIG_XFS_QUOTA=m
 CONFIG_XFS_DMAPI=m
 CONFIG_XFS_SECURITY=y
@@ -3102,6 +3184,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_MINIX_FS=y
 CONFIG_ROMFS_FS=m
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 CONFIG_DMAPI=m
 # CONFIG_DMAPI_DEBUG is not set
 CONFIG_QUOTA=y
@@ -3146,7 +3229,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
-CONFIG_RELAYFS_FS=m
 CONFIG_CONFIGFS_FS=m
 
 #
@@ -3395,6 +3477,7 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_REED_SOLOMON=m
@@ -3410,5 +3493,4 @@ CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_TRAMPOLINE=y
-CONFIG_X86_SYSENTER=y
 CONFIG_KTIME_SCALAR=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config
index 1f4b63c03f6e14ca7d7f8b583e5287f2251ff9c3..3d04f51795a189137711506ce936df4fa0ca5f0c 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.27
-# Mon Mar 12 22:26:27 2007
+# Linux kernel version: 2.6.16.46
+# Tue Jul  3 17:46:57 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -25,6 +25,9 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SUSE_KERNEL=y
+CONFIG_SLE_VERSION=10
+CONFIG_SLE_SP=1
+CONFIG_SLE_SP_SUBLEVEL=0
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -32,12 +35,14 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASKSTATS=y
+CONFIG_TASK_XACCT=y
 CONFIG_SYSCTL=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CPUSETS=y
+CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 CONFIG_VM86=y
@@ -79,6 +84,7 @@ CONFIG_STOP_MACHINE=y
 # Block layer
 #
 CONFIG_LBD=y
+CONFIG_BLK_DEV_IO_TRACE=y
 
 #
 # IO Schedulers
@@ -205,6 +211,7 @@ CONFIG_KEXEC=y
 CONFIG_PHYSICAL_START=0x100000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_DOUBLEFAULT=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
 # Power management options (ACPI, APM)
@@ -858,6 +865,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -1163,6 +1171,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
+CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -1185,15 +1194,15 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 
 #
-# SCSI Transports
+# SCSI Transport Attributes
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_ISCSI_TARGET=m
-CONFIG_SCSI_SAS_DOMAIN_ATTRS=m
-CONFIG_SCSI_SAS_DOMAIN_DEBUG=y
 
 #
 # SCSI low-level drivers
@@ -1223,29 +1232,15 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 CONFIG_SCSI_AIC94XX=m
 CONFIG_AIC94XX_DEBUG=y
 CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_ARCMSR=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=m
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-# CONFIG_SCSI_SATA_ULI is not set
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_ACPI=y
+CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_DMX3191D=m
@@ -1271,7 +1266,7 @@ CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
@@ -1282,8 +1277,7 @@ CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
-# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
-CONFIG_SCSI_QLA4XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
@@ -1300,12 +1294,75 @@ CONFIG_SCSI_DEBUG=m
 #
 # PCMCIA SCSI adapter support
 #
-CONFIG_PCMCIA_AHA152X=m
+# CONFIG_PCMCIA_AHA152X is not set
 CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_NINJA_SCSI=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+CONFIG_ATA_ACPI=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CYPRESS is not set
+CONFIG_PATA_EFAR=m
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_TRIFLEX is not set
+CONFIG_PATA_MARVELL=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+CONFIG_PATA_NETCELL=m
+# CONFIG_PATA_NS87410 is not set
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_OPTIDMA=m
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_QDI is not set
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RZ1000=m
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+CONFIG_PATA_SIL680=m
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+
 #
 # Old CD-ROM drivers (not SCSI, not IDE)
 #
@@ -1338,6 +1395,8 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_HP_SW=m
+CONFIG_DM_MULTIPATH_RDAC=m
 CONFIG_DM_NL_EVT=y
 
 #
@@ -1348,6 +1407,7 @@ CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_MAX_FC_SGE=256
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
 
@@ -1548,6 +1608,7 @@ CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_QLA3XXX=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1557,6 +1618,7 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
+CONFIG_NETXEN_NIC=m
 
 #
 # Token Ring devices
@@ -2004,6 +2066,7 @@ CONFIG_SPECIALIX=m
 # CONFIG_SPECIALIX_RTSCTS is not set
 CONFIG_SX=m
 CONFIG_STALDRV=y
+CONFIG_NOZOMI=m
 
 #
 # Serial drivers
@@ -2154,6 +2217,7 @@ CONFIG_HANGCHECK_TIMER=m
 # TPM devices
 #
 CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
@@ -2260,6 +2324,7 @@ CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS1621=m
@@ -2281,12 +2346,15 @@ CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT8231=m
 CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
@@ -2683,6 +2751,18 @@ CONFIG_SND_CS4281=m
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ENS1370=m
@@ -2690,6 +2770,7 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_FM801_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSP=m
@@ -2985,6 +3066,7 @@ CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_XIRCOM=m
@@ -3001,6 +3083,7 @@ CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_PHIDGETKIT=m
@@ -3089,7 +3172,6 @@ CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_EXPORT=y
 CONFIG_XFS_QUOTA=m
 CONFIG_XFS_DMAPI=m
 CONFIG_XFS_SECURITY=y
@@ -3102,6 +3184,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_MINIX_FS=y
 CONFIG_ROMFS_FS=m
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 CONFIG_DMAPI=m
 # CONFIG_DMAPI_DEBUG is not set
 CONFIG_QUOTA=y
@@ -3146,7 +3229,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
-CONFIG_RELAYFS_FS=m
 CONFIG_CONFIGFS_FS=m
 
 #
@@ -3395,6 +3477,7 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_REED_SOLOMON=m
@@ -3410,5 +3493,4 @@ CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_TRAMPOLINE=y
-CONFIG_X86_SYSENTER=y
 CONFIG_KTIME_SCALAR=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config
index 75921038123dcca5c40daf35e29ff7285e20df2e..73918274b73709d4681a5bad1757ad0397b0e270 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.27
-# Mon Mar 12 22:27:05 2007
+# Linux kernel version: 2.6.16.46
+# Tue Jul  3 18:35:09 2007
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -16,6 +16,7 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_DMI=y
+CONFIG_AUDIT_ARCH=y
 
 #
 # Code maturity level options
@@ -30,6 +31,9 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SUSE_KERNEL=y
+CONFIG_SLE_VERSION=10
+CONFIG_SLE_SP=1
+CONFIG_SLE_SP_SUBLEVEL=0
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -37,12 +41,14 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASKSTATS=y
+CONFIG_TASK_XACCT=y
 CONFIG_SYSCTL=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CPUSETS=y
+CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 CONFIG_VM86=y
@@ -84,6 +90,7 @@ CONFIG_STOP_MACHINE=y
 # Block layer
 #
 CONFIG_LBD=y
+CONFIG_BLK_DEV_IO_TRACE=y
 
 #
 # IO Schedulers
@@ -145,9 +152,12 @@ CONFIG_MIGRATION=y
 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
 CONFIG_NR_CPUS=128
 CONFIG_HOTPLUG_CPU=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_GART_IOMMU=y
+CONFIG_CALGARY_IOMMU=y
+# CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set
 CONFIG_SWIOTLB=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
@@ -776,6 +786,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -1055,6 +1066,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
+CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -1077,15 +1089,15 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 
 #
-# SCSI Transports
+# SCSI Transport Attributes
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_ISCSI_TARGET=m
-CONFIG_SCSI_SAS_DOMAIN_ATTRS=m
-CONFIG_SCSI_SAS_DOMAIN_DEBUG=y
 
 #
 # SCSI low-level drivers
@@ -1111,28 +1123,13 @@ CONFIG_AIC79XX_DEBUG_MASK=0
 CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 CONFIG_SCSI_AIC94XX=m
 CONFIG_AIC94XX_DEBUG=y
+CONFIG_SCSI_ARCMSR=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=m
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_ULI=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_ACPI=y
+CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_DMX3191D=m
@@ -1153,14 +1150,13 @@ CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
-# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
-CONFIG_SCSI_QLA4XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
@@ -1173,6 +1169,64 @@ CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+CONFIG_ATA_ACPI=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+CONFIG_PATA_EFAR=m
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_HPT3X3 is not set
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_TRIFLEX is not set
+CONFIG_PATA_MARVELL=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+CONFIG_PATA_NETCELL=m
+# CONFIG_PATA_NS87410 is not set
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_OPTIDMA=m
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC_OLD is not set
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RZ1000=m
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+CONFIG_PATA_SIL680=m
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
 #
 # Multi-device support (RAID and LVM)
 #
@@ -1193,6 +1247,8 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_HP_SW=m
+CONFIG_DM_MULTIPATH_RDAC=m
 CONFIG_DM_NL_EVT=y
 
 #
@@ -1203,6 +1259,7 @@ CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_MAX_FC_SGE=256
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
 
@@ -1365,6 +1422,7 @@ CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_QLA3XXX=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1374,6 +1432,7 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
+CONFIG_NETXEN_NIC=m
 
 #
 # Token Ring devices
@@ -1718,6 +1777,7 @@ CONFIG_SPECIALIX=m
 # CONFIG_SPECIALIX_RTSCTS is not set
 CONFIG_SX=m
 CONFIG_STALDRV=y
+CONFIG_NOZOMI=m
 
 #
 # Serial drivers
@@ -1840,7 +1900,7 @@ CONFIG_HANGCHECK_TIMER=m
 # TPM devices
 #
 CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
+CONFIG_TCG_TIS=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TELCLOCK=m
 CONFIG_CRASHER=m
@@ -1942,6 +2002,7 @@ CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS1621=m
@@ -1963,12 +2024,15 @@ CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT8231=m
 CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
@@ -2305,6 +2369,18 @@ CONFIG_SND_CMIPCI=m
 CONFIG_SND_CS4281=m
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ENS1370=m
@@ -2312,6 +2388,7 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_FM801_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSP=m
@@ -2571,6 +2648,7 @@ CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_XIRCOM=m
@@ -2587,6 +2665,7 @@ CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_PHIDGETKIT=m
@@ -2677,7 +2756,6 @@ CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_EXPORT=y
 CONFIG_XFS_QUOTA=m
 CONFIG_XFS_DMAPI=m
 CONFIG_XFS_SECURITY=y
@@ -2690,6 +2768,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_MINIX_FS=y
 CONFIG_ROMFS_FS=m
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 CONFIG_DMAPI=m
 # CONFIG_DMAPI_DEBUG is not set
 CONFIG_QUOTA=y
@@ -2734,7 +2813,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
-CONFIG_RELAYFS_FS=m
 CONFIG_CONFIGFS_FS=m
 
 #
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config
index 0020d17979d191e1f82f06a466891bdcb0179102..d5e00e788c3c653e2ac992f54523a5eb95e2fdf7 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.27
-# Mon Mar 12 22:27:14 2007
+# Linux kernel version: 2.6.16.46
+# Tue Jul  3 18:30:50 2007
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -16,6 +16,7 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_DMI=y
+CONFIG_AUDIT_ARCH=y
 
 #
 # Code maturity level options
@@ -30,6 +31,9 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SUSE_KERNEL=y
+CONFIG_SLE_VERSION=10
+CONFIG_SLE_SP=1
+CONFIG_SLE_SP_SUBLEVEL=0
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -37,11 +41,13 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASKSTATS=y
+CONFIG_TASK_XACCT=y
 CONFIG_SYSCTL=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 CONFIG_VM86=y
@@ -82,6 +88,7 @@ CONFIG_KMOD=y
 # Block layer
 #
 CONFIG_LBD=y
+CONFIG_BLK_DEV_IO_TRACE=y
 
 #
 # IO Schedulers
@@ -129,9 +136,12 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_GART_IOMMU=y
+CONFIG_CALGARY_IOMMU=y
+# CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set
 CONFIG_SWIOTLB=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
@@ -757,6 +767,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -1036,6 +1047,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
+CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -1058,15 +1070,15 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 
 #
-# SCSI Transports
+# SCSI Transport Attributes
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_ISCSI_TARGET=m
-CONFIG_SCSI_SAS_DOMAIN_ATTRS=m
-CONFIG_SCSI_SAS_DOMAIN_DEBUG=y
 
 #
 # SCSI low-level drivers
@@ -1092,28 +1104,13 @@ CONFIG_AIC79XX_DEBUG_MASK=0
 CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 CONFIG_SCSI_AIC94XX=m
 CONFIG_AIC94XX_DEBUG=y
+CONFIG_SCSI_ARCMSR=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=m
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_ULI=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_ACPI=y
+CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_DMX3191D=m
@@ -1134,14 +1131,13 @@ CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
-# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
-CONFIG_SCSI_QLA4XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
@@ -1154,6 +1150,64 @@ CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+CONFIG_ATA_ACPI=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+CONFIG_PATA_EFAR=m
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_HPT3X3 is not set
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_TRIFLEX is not set
+CONFIG_PATA_MARVELL=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+CONFIG_PATA_NETCELL=m
+# CONFIG_PATA_NS87410 is not set
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_OPTIDMA=m
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC_OLD is not set
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RZ1000=m
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+CONFIG_PATA_SIL680=m
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
 #
 # Multi-device support (RAID and LVM)
 #
@@ -1174,6 +1228,8 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_HP_SW=m
+CONFIG_DM_MULTIPATH_RDAC=m
 CONFIG_DM_NL_EVT=y
 
 #
@@ -1184,6 +1240,7 @@ CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_MAX_FC_SGE=256
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
 
@@ -1347,6 +1404,7 @@ CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_QLA3XXX=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1356,6 +1414,7 @@ CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
+CONFIG_NETXEN_NIC=m
 
 #
 # Token Ring devices
@@ -1705,6 +1764,7 @@ CONFIG_SX=m
 CONFIG_STALDRV=y
 # CONFIG_STALLION is not set
 # CONFIG_ISTALLION is not set
+CONFIG_NOZOMI=m
 
 #
 # Serial drivers
@@ -1828,7 +1888,7 @@ CONFIG_HANGCHECK_TIMER=m
 # TPM devices
 #
 CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
+CONFIG_TCG_TIS=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TELCLOCK=m
 CONFIG_CRASHER=m
@@ -1930,6 +1990,7 @@ CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS1621=m
@@ -1951,12 +2012,15 @@ CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT8231=m
 CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
@@ -2293,6 +2357,18 @@ CONFIG_SND_CMIPCI=m
 CONFIG_SND_CS4281=m
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ENS1370=m
@@ -2300,6 +2376,7 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_FM801_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSP=m
@@ -2559,6 +2636,7 @@ CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_XIRCOM=m
@@ -2575,6 +2653,7 @@ CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_PHIDGETKIT=m
@@ -2665,7 +2744,6 @@ CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_EXPORT=y
 CONFIG_XFS_QUOTA=m
 CONFIG_XFS_DMAPI=m
 CONFIG_XFS_SECURITY=y
@@ -2678,6 +2756,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_MINIX_FS=y
 CONFIG_ROMFS_FS=m
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 CONFIG_DMAPI=m
 # CONFIG_DMAPI_DEBUG is not set
 CONFIG_QUOTA=y
@@ -2722,7 +2801,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
-CONFIG_RELAYFS_FS=m
 CONFIG_CONFIGFS_FS=m
 
 #
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6-sles10.patch b/lustre/kernel_patches/patches/vfs_intent-2.6-sles10.patch
index 6514e2a14212c2b39042bb5a407db88199a405fb..907131414d6d855f56750942e3c6160d3cf8a07a 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.6-sles10.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.6-sles10.patch
@@ -1,6 +1,7 @@
-diff -urNp linux-2.6.16.21-0.8.orig/fs/9p/vfs_inode.c linux-2.6.16.21-0.8/fs/9p/vfs_inode.c
---- linux-2.6.16.21-0.8.orig/fs/9p/vfs_inode.c	2006-10-04 02:18:10.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/9p/vfs_inode.c	2007-01-29 18:20:42.000000000 +0200
+Index: LINUX-SRC-TREE/fs/9p/vfs_inode.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/9p/vfs_inode.c
++++ LINUX-SRC-TREE/fs/9p/vfs_inode.c
 @@ -469,7 +469,7 @@ v9fs_vfs_create(struct inode *dir, struc
  	perm = unixmode2p9mode(v9ses, mode);
  
@@ -10,22 +11,27 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/9p/vfs_inode.c linux-2.6.16.21-0.8/fs/9p/
  	else
  		flags = O_RDWR;
  
-diff -urNp linux-2.6.16.21-0.8.orig/fs/cifs/dir.c linux-2.6.16.21-0.8/fs/cifs/dir.c
---- linux-2.6.16.21-0.8.orig/fs/cifs/dir.c	2006-10-04 02:18:10.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/cifs/dir.c	2007-01-29 18:20:42.000000000 +0200
-@@ -147,7 +147,7 @@ cifs_create(struct inode *inode, struct 
- 	}
+Index: LINUX-SRC-TREE/fs/cifs/dir.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/cifs/dir.c
++++ LINUX-SRC-TREE/fs/cifs/dir.c
+@@ -157,11 +157,7 @@ cifs_create(struct inode *inode, struct 
  
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)
  	if(nd && (nd->flags & LOOKUP_OPEN)) {
+-#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,5) /* SUSE included Lustre patch */
+ 		int oflags = nd->intent.it_flags;
+-#else
 -		int oflags = nd->intent.open.flags;
-+		int oflags = nd->intent.flags;
+-#endif
  
  		desiredAccess = 0;
  		if (oflags & FMODE_READ)
-diff -urNp linux-2.6.16.21-0.8.orig/fs/exec.c linux-2.6.16.21-0.8/fs/exec.c
---- linux-2.6.16.21-0.8.orig/fs/exec.c	2006-10-04 02:18:10.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/exec.c	2007-01-29 18:20:42.000000000 +0200
-@@ -128,7 +128,9 @@ asmlinkage long sys_uselib(const char __
+Index: LINUX-SRC-TREE/fs/exec.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/exec.c
++++ LINUX-SRC-TREE/fs/exec.c
+@@ -129,7 +129,9 @@ asmlinkage long sys_uselib(const char __
  	struct nameidata nd;
  	int error;
  
@@ -36,7 +42,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/exec.c linux-2.6.16.21-0.8/fs/exec.c
  	if (error)
  		goto out;
  
-@@ -478,7 +480,9 @@ struct file *open_exec(const char *name)
+@@ -481,7 +483,9 @@ struct file *open_exec(const char *name)
  	int err;
  	struct file *file;
  
@@ -47,7 +53,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/exec.c linux-2.6.16.21-0.8/fs/exec.c
  	file = ERR_PTR(err);
  
  	if (!err) {
-@@ -1520,7 +1524,7 @@ int do_coredump(long signr, int exit_cod
+@@ -1543,7 +1547,7 @@ int do_coredump(long signr, int exit_cod
  		goto close_fail;
  	if (!file->f_op->write)
  		goto close_fail;
@@ -56,9 +62,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/exec.c linux-2.6.16.21-0.8/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
-diff -urNp linux-2.6.16.21-0.8.orig/fs/fuse/dir.c linux-2.6.16.21-0.8/fs/fuse/dir.c
---- linux-2.6.16.21-0.8.orig/fs/fuse/dir.c	2006-10-04 02:18:11.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/fuse/dir.c	2007-01-29 18:20:42.000000000 +0200
+Index: LINUX-SRC-TREE/fs/fuse/dir.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/fuse/dir.c
++++ LINUX-SRC-TREE/fs/fuse/dir.c
 @@ -242,7 +242,7 @@ static int fuse_create_open(struct inode
  	struct fuse_entry_out outentry;
  	struct fuse_file *ff;
@@ -68,9 +75,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/fuse/dir.c linux-2.6.16.21-0.8/fs/fuse/di
  
  	err = -ENOSYS;
  	if (fc->no_create)
-diff -urNp linux-2.6.16.21-0.8.orig/fs/inode.c linux-2.6.16.21-0.8/fs/inode.c
---- linux-2.6.16.21-0.8.orig/fs/inode.c	2006-10-04 02:18:11.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/inode.c	2007-01-29 18:20:42.000000000 +0200
+Index: LINUX-SRC-TREE/fs/inode.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/inode.c
++++ LINUX-SRC-TREE/fs/inode.c
 @@ -236,6 +236,7 @@ void __iget(struct inode * inode)
  	inodes_stat.nr_unused--;
  }
@@ -79,9 +87,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/inode.c linux-2.6.16.21-0.8/fs/inode.c
  /**
   * clear_inode - clear an inode
   * @inode: inode to clear
-diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
---- linux-2.6.16.21-0.8.orig/fs/namei.c	2006-10-04 02:18:11.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/namei.c	2007-01-29 18:21:10.000000000 +0200
+Index: LINUX-SRC-TREE/fs/namei.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/namei.c
++++ LINUX-SRC-TREE/fs/namei.c
 @@ -337,8 +337,19 @@ int deny_write_access(struct file * file
  	return 0;
  }
@@ -253,8 +262,8 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  				unsigned int flags, struct nameidata *nd)
  {
  	int retval = 0;
-@@ -1133,10 +1203,23 @@ unlock_fail:
- 	return retval;
+@@ -1134,10 +1204,23 @@ fput_fail:
+ 	goto out_fail;
  }
  
 -int fastcall path_lookup(const char *name, unsigned int flags,
@@ -279,7 +288,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  }
  
  static int __path_lookup_intent_open(int dfd, const char *name,
-@@ -1148,13 +1231,13 @@ static int __path_lookup_intent_open(int
+@@ -1149,13 +1232,13 @@ static int __path_lookup_intent_open(int
  
  	if (filp == NULL)
  		return -ENFILE;
@@ -299,7 +308,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  			path_release(nd);
  		}
  	} else if (err != 0)
-@@ -1171,10 +1254,10 @@ static int __path_lookup_intent_open(int
+@@ -1172,10 +1255,10 @@ static int __path_lookup_intent_open(int
   * @open_flags: open intent flags
   */
  int path_lookup_open(int dfd, const char *name, unsigned int lookup_flags,
@@ -312,7 +321,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  }
  
  /**
-@@ -1257,7 +1340,7 @@ struct dentry * lookup_hash(struct namei
+@@ -1258,7 +1341,7 @@ struct dentry * lookup_hash(struct namei
  }
  
  /* SMP-safe */
@@ -321,7 +330,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  {
  	unsigned long hash;
  	struct qstr this;
-@@ -1277,11 +1360,17 @@ struct dentry * lookup_one_len(const cha
+@@ -1278,11 +1361,17 @@ struct dentry * lookup_one_len(const cha
  	}
  	this.hash = end_name_hash(hash);
  
@@ -340,7 +349,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  /*
   *	namei()
   *
-@@ -1293,22 +1382,36 @@ access:
+@@ -1294,22 +1383,36 @@ access:
   * that namei follows links, while lnamei does not.
   * SMP-safe
   */
@@ -381,7 +390,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  }
  
  /*
-@@ -1543,7 +1646,7 @@ int may_open(struct nameidata *nd, int a
+@@ -1545,7 +1648,7 @@ int may_open(struct nameidata *nd, int a
  		if (!error) {
  			DQUOT_INIT(inode);
  			
@@ -390,7 +399,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  		}
  		put_write_access(inode);
  		if (error)
-@@ -1593,7 +1696,7 @@ int open_namei(int dfd, const char *path
+@@ -1595,7 +1698,7 @@ int open_namei(int dfd, const char *path
  	 */
  	if (!(flag & O_CREAT)) {
  		error = path_lookup_open(dfd, pathname, lookup_flags(flag),
@@ -399,7 +408,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  		if (error)
  			return error;
  		goto ok;
-@@ -1602,6 +1705,7 @@ int open_namei(int dfd, const char *path
+@@ -1604,6 +1707,7 @@ int open_namei(int dfd, const char *path
  	/*
  	 * Create - we need to know the parent.
  	 */
@@ -407,7 +416,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	error = path_lookup_create(dfd,pathname,LOOKUP_PARENT,nd,flag,mode);
  	if (error)
  		return error;
-@@ -1618,7 +1722,9 @@ int open_namei(int dfd, const char *path
+@@ -1620,7 +1724,9 @@ int open_namei(int dfd, const char *path
  	dir = nd->dentry;
  	nd->flags &= ~LOOKUP_PARENT;
  	mutex_lock(&dir->d_inode->i_mutex);
@@ -417,7 +426,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	path.mnt = nd->mnt;
  
  do_last:
-@@ -1628,9 +1734,9 @@ do_last:
+@@ -1630,9 +1736,9 @@ do_last:
  		goto exit;
  	}
  
@@ -429,7 +438,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  		goto exit_dput;
  	}
  
-@@ -1683,7 +1789,7 @@ ok:
+@@ -1687,7 +1793,7 @@ ok:
  exit_dput:
  	dput_path(&path, nd);
  exit:
@@ -438,7 +447,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  		release_open_intent(nd);
  	path_release(nd);
  	return error;
-@@ -1726,7 +1832,9 @@ do_link:
+@@ -1736,7 +1842,9 @@ do_link:
  	}
  	dir = nd->dentry;
  	mutex_lock(&dir->d_inode->i_mutex);
@@ -448,7 +457,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	path.mnt = nd->mnt;
  	__putname(nd->last.name);
  	goto do_last;
-@@ -1811,15 +1919,26 @@ asmlinkage long sys_mknodat(int dfd, con
+@@ -1821,15 +1929,26 @@ asmlinkage long sys_mknodat(int dfd, con
  	struct dentry * dentry;
  	struct nameidata nd;
  
@@ -476,7 +485,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	dentry = lookup_create(&nd, 0);
  	error = PTR_ERR(dentry);
  
-@@ -1846,6 +1965,7 @@ asmlinkage long sys_mknodat(int dfd, con
+@@ -1856,6 +1975,7 @@ asmlinkage long sys_mknodat(int dfd, con
  		dput(dentry);
  	}
  	mutex_unlock(&nd.dentry->d_inode->i_mutex);
@@ -484,7 +493,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1891,9 +2011,18 @@ asmlinkage long sys_mkdirat(int dfd, con
+@@ -1901,9 +2021,18 @@ asmlinkage long sys_mkdirat(int dfd, con
  		struct dentry *dentry;
  		struct nameidata nd;
  
@@ -504,7 +513,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  		dentry = lookup_create(&nd, 1);
  		error = PTR_ERR(dentry);
  		if (!IS_ERR(dentry)) {
-@@ -1903,6 +2032,7 @@ asmlinkage long sys_mkdirat(int dfd, con
+@@ -1913,6 +2042,7 @@ asmlinkage long sys_mkdirat(int dfd, con
  			dput(dentry);
  		}
  		mutex_unlock(&nd.dentry->d_inode->i_mutex);
@@ -512,7 +521,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  		path_release(&nd);
  out:
  		putname(tmp);
-@@ -1987,8 +2117,9 @@ static long do_rmdir(int dfd, const char
+@@ -1997,8 +2127,9 @@ static long do_rmdir(int dfd, const char
  	name = getname(pathname);
  	if(IS_ERR(name))
  		return PTR_ERR(name);
@@ -524,7 +533,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	if (error)
  		goto exit;
  
-@@ -2003,6 +2134,14 @@ static long do_rmdir(int dfd, const char
+@@ -2013,6 +2144,14 @@ static long do_rmdir(int dfd, const char
  			error = -EBUSY;
  			goto exit1;
  	}
@@ -539,7 +548,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	mutex_lock(&nd.dentry->d_inode->i_mutex);
  	dentry = lookup_hash(&nd);
  	error = PTR_ERR(dentry);
-@@ -2071,12 +2210,20 @@ static long do_unlinkat(int dfd, const c
+@@ -2081,12 +2220,20 @@ static long do_unlinkat(int dfd, const c
  	if(IS_ERR(name))
  		return PTR_ERR(name);
  
@@ -561,7 +570,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	mutex_lock(&nd.dentry->d_inode->i_mutex);
  	dentry = lookup_hash(&nd);
  	error = PTR_ERR(dentry);
-@@ -2159,9 +2306,17 @@ asmlinkage long sys_symlinkat(const char
+@@ -2169,9 +2316,17 @@ asmlinkage long sys_symlinkat(const char
  		struct dentry *dentry;
  		struct nameidata nd;
  
@@ -580,7 +589,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  		dentry = lookup_create(&nd, 0);
  		error = PTR_ERR(dentry);
  		if (!IS_ERR(dentry)) {
-@@ -2169,6 +2324,7 @@ asmlinkage long sys_symlinkat(const char
+@@ -2179,6 +2334,7 @@ asmlinkage long sys_symlinkat(const char
  			dput(dentry);
  		}
  		mutex_unlock(&nd.dentry->d_inode->i_mutex);
@@ -588,7 +597,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  		path_release(&nd);
  out:
  		putname(to);
-@@ -2245,15 +2401,25 @@ asmlinkage long sys_linkat(int olddfd, c
+@@ -2255,15 +2411,25 @@ asmlinkage long sys_linkat(int olddfd, c
  	if (IS_ERR(to))
  		return PTR_ERR(to);
  
@@ -616,7 +625,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	new_dentry = lookup_create(&nd, 0);
  	error = PTR_ERR(new_dentry);
  	if (!IS_ERR(new_dentry)) {
-@@ -2430,12 +2596,14 @@ static int do_rename(int olddfd, const c
+@@ -2440,12 +2606,14 @@ static int do_rename(int olddfd, const c
  	struct dentry * old_dentry, *new_dentry;
  	struct dentry * trap;
  	struct nameidata oldnd, newnd;
@@ -635,7 +644,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	if (error)
  		goto exit1;
  
-@@ -2452,6 +2620,13 @@ static int do_rename(int olddfd, const c
+@@ -2462,6 +2630,13 @@ static int do_rename(int olddfd, const c
  	if (newnd.last_type != LAST_NORM)
  		goto exit2;
  
@@ -649,7 +658,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  	trap = lock_rename(new_dir, old_dir);
  
  	old_dentry = lookup_hash(&oldnd);
-@@ -2483,8 +2658,7 @@ static int do_rename(int olddfd, const c
+@@ -2493,8 +2668,7 @@ static int do_rename(int olddfd, const c
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -659,7 +668,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  exit5:
  	dput(new_dentry);
  exit4:
-@@ -2690,6 +2864,7 @@ EXPORT_SYMBOL(__page_symlink);
+@@ -2700,6 +2874,7 @@ EXPORT_SYMBOL(__page_symlink);
  EXPORT_SYMBOL(page_symlink);
  EXPORT_SYMBOL(page_symlink_inode_operations);
  EXPORT_SYMBOL(path_lookup);
@@ -667,9 +676,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namei.c linux-2.6.16.21-0.8/fs/namei.c
  EXPORT_SYMBOL(path_release);
  EXPORT_SYMBOL(path_walk);
  EXPORT_SYMBOL(permission);
-diff -urNp linux-2.6.16.21-0.8.orig/fs/namespace.c linux-2.6.16.21-0.8/fs/namespace.c
---- linux-2.6.16.21-0.8.orig/fs/namespace.c	2006-10-04 02:18:11.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/namespace.c	2007-01-29 18:20:42.000000000 +0200
+Index: LINUX-SRC-TREE/fs/namespace.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/namespace.c
++++ LINUX-SRC-TREE/fs/namespace.c
 @@ -75,6 +75,7 @@ struct vfsmount *alloc_vfsmnt(const char
  		INIT_LIST_HEAD(&mnt->mnt_share);
  		INIT_LIST_HEAD(&mnt->mnt_slave_list);
@@ -743,10 +753,11 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/namespace.c linux-2.6.16.21-0.8/fs/namesp
  	if (retval)
  		return retval;
  
-diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/dir.c linux-2.6.16.21-0.8/fs/nfs/dir.c
---- linux-2.6.16.21-0.8.orig/fs/nfs/dir.c	2006-10-04 02:18:11.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/nfs/dir.c	2007-01-29 18:20:42.000000000 +0200
-@@ -831,7 +831,7 @@ int nfs_is_exclusive_create(struct inode
+Index: LINUX-SRC-TREE/fs/nfs/dir.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/nfs/dir.c
++++ LINUX-SRC-TREE/fs/nfs/dir.c
+@@ -834,7 +834,7 @@ int nfs_is_exclusive_create(struct inode
  		return 0;
  	if (nd == NULL || nfs_lookup_check_intent(nd, LOOKUP_CREATE) == 0)
  		return 0;
@@ -755,7 +766,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/dir.c linux-2.6.16.21-0.8/fs/nfs/dir.
  }
  
  static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
-@@ -902,7 +902,7 @@ static int is_atomic_open(struct inode *
+@@ -911,7 +911,7 @@ static int is_atomic_open(struct inode *
  	if (nd->flags & LOOKUP_DIRECTORY)
  		return 0;
  	/* Are we trying to write to a read only partition? */
@@ -764,7 +775,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/dir.c linux-2.6.16.21-0.8/fs/nfs/dir.
  		return 0;
  	return 1;
  }
-@@ -923,7 +923,7 @@ static struct dentry *nfs_atomic_lookup(
+@@ -932,7 +932,7 @@ static struct dentry *nfs_atomic_lookup(
  	dentry->d_op = NFS_PROTO(dir)->dentry_ops;
  
  	/* Let vfs_create() deal with O_EXCL */
@@ -773,7 +784,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/dir.c linux-2.6.16.21-0.8/fs/nfs/dir.
  		d_add(dentry, NULL);
  		goto out;
  	}
-@@ -938,7 +938,7 @@ static struct dentry *nfs_atomic_lookup(
+@@ -947,7 +947,7 @@ static struct dentry *nfs_atomic_lookup(
  		goto out;
  	}
  
@@ -782,7 +793,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/dir.c linux-2.6.16.21-0.8/fs/nfs/dir.
  		nfs_begin_data_update(dir);
  		res = nfs4_atomic_open(dir, dentry, nd);
  		nfs_end_data_update(dir);
-@@ -957,7 +957,7 @@ static struct dentry *nfs_atomic_lookup(
+@@ -966,7 +966,7 @@ static struct dentry *nfs_atomic_lookup(
  			case -ENOTDIR:
  				goto no_open;
  			case -ELOOP:
@@ -791,7 +802,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/dir.c linux-2.6.16.21-0.8/fs/nfs/dir.
  					goto no_open;
  			/* case -EINVAL: */
  			default:
-@@ -993,7 +993,7 @@ static int nfs_open_revalidate(struct de
+@@ -1002,7 +1002,7 @@ static int nfs_open_revalidate(struct de
  	/* NFS only supports OPEN on regular files */
  	if (!S_ISREG(inode->i_mode))
  		goto no_open;
@@ -800,7 +811,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/dir.c linux-2.6.16.21-0.8/fs/nfs/dir.
  	/* We cannot do exclusive creation on a positive dentry */
  	if ((openflags & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL))
  		goto no_open;
-@@ -1126,7 +1126,7 @@ static int nfs_create(struct inode *dir,
+@@ -1138,7 +1138,7 @@ static int nfs_create(struct inode *dir,
  	attr.ia_valid = ATTR_MODE;
  
  	if (nd && (nd->flags & LOOKUP_CREATE))
@@ -809,9 +820,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/dir.c linux-2.6.16.21-0.8/fs/nfs/dir.
  
  	lock_kernel();
  	nfs_begin_data_update(dir);
-diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/nfs4proc.c linux-2.6.16.21-0.8/fs/nfs/nfs4proc.c
---- linux-2.6.16.21-0.8.orig/fs/nfs/nfs4proc.c	2006-10-04 02:18:11.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/nfs/nfs4proc.c	2007-01-29 18:20:42.000000000 +0200
+Index: LINUX-SRC-TREE/fs/nfs/nfs4proc.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/nfs/nfs4proc.c
++++ LINUX-SRC-TREE/fs/nfs/nfs4proc.c
 @@ -1220,7 +1220,7 @@ static void nfs4_intent_set_file(struct 
  		ctx = (struct nfs_open_context *)filp->private_data;
  		ctx->state = state;
@@ -844,9 +856,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/nfs/nfs4proc.c linux-2.6.16.21-0.8/fs/nfs
  	put_rpccred(cred);
  	if (IS_ERR(state)) {
  		if (PTR_ERR(state) == -ENOENT)
-diff -urNp linux-2.6.16.21-0.8.orig/fs/nfsctl.c linux-2.6.16.21-0.8/fs/nfsctl.c
---- linux-2.6.16.21-0.8.orig/fs/nfsctl.c	2006-10-04 02:18:11.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/nfsctl.c	2007-01-29 18:20:42.000000000 +0200
+Index: LINUX-SRC-TREE/fs/nfsctl.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/nfsctl.c
++++ LINUX-SRC-TREE/fs/nfsctl.c
 @@ -26,6 +26,7 @@ static struct file *do_open(char *name, 
  	struct nameidata nd;
  	int error;
@@ -855,10 +868,11 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/nfsctl.c linux-2.6.16.21-0.8/fs/nfsctl.c
  	nd.mnt = do_kern_mount("nfsd", 0, "nfsd", NULL);
  
  	if (IS_ERR(nd.mnt))
-diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
---- linux-2.6.16.21-0.8.orig/fs/open.c	2006-10-04 02:18:12.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/open.c	2007-01-29 18:20:42.000000000 +0200
-@@ -197,9 +197,10 @@ out:
+Index: LINUX-SRC-TREE/fs/open.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/open.c
++++ LINUX-SRC-TREE/fs/open.c
+@@ -198,9 +198,10 @@ out:
  }
  
  int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@@ -870,7 +884,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	struct iattr newattrs;
  
  	/* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
-@@ -214,7 +215,17 @@ int do_truncate(struct dentry *dentry, l
+@@ -215,7 +216,17 @@ int do_truncate(struct dentry *dentry, l
  	}
  
  	mutex_lock(&dentry->d_inode->i_mutex);
@@ -889,7 +903,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	mutex_unlock(&dentry->d_inode->i_mutex);
  	return err;
  }
-@@ -224,12 +235,12 @@ static long do_sys_truncate(const char _
+@@ -225,12 +236,12 @@ static long do_sys_truncate(const char _
  	struct nameidata nd;
  	struct inode * inode;
  	int error;
@@ -904,7 +918,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	if (error)
  		goto out;
  	inode = nd.dentry->d_inode;
-@@ -269,7 +280,7 @@ static long do_sys_truncate(const char _
+@@ -270,7 +281,7 @@ static long do_sys_truncate(const char _
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error) {
  		DQUOT_INIT(inode);
@@ -913,7 +927,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	}
  	put_write_access(inode);
  
-@@ -321,7 +332,7 @@ static long do_sys_ftruncate(unsigned in
+@@ -322,7 +333,7 @@ static long do_sys_ftruncate(unsigned in
  
  	error = locks_verify_truncate(inode, file, length);
  	if (!error)
@@ -922,7 +936,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  out_putf:
  	fput(file);
  out:
-@@ -406,9 +417,20 @@ asmlinkage long sys_utime(char __user * 
+@@ -407,9 +418,20 @@ asmlinkage long sys_utime(char __user * 
  		    (error = vfs_permission(&nd, MAY_WRITE)) != 0)
  			goto dput_and_out;
  	}
@@ -946,7 +960,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  dput_and_out:
  	path_release(&nd);
  out:
-@@ -494,6 +516,7 @@ asmlinkage long sys_faccessat(int dfd, c
+@@ -495,6 +517,7 @@ asmlinkage long sys_faccessat(int dfd, c
  	int old_fsuid, old_fsgid;
  	kernel_cap_t old_cap;
  	int res;
@@ -954,7 +968,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  
  	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
  		return -EINVAL;
-@@ -518,7 +541,7 @@ asmlinkage long sys_faccessat(int dfd, c
+@@ -519,7 +542,7 @@ asmlinkage long sys_faccessat(int dfd, c
  	else
  		current->cap_effective = current->cap_permitted;
  
@@ -963,7 +977,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	if (!res) {
  		res = vfs_permission(&nd, mode);
  		/* SuS v2 requires we report a read only fs too */
-@@ -544,8 +567,9 @@ asmlinkage long sys_chdir(const char __u
+@@ -545,8 +568,9 @@ asmlinkage long sys_chdir(const char __u
  {
  	struct nameidata nd;
  	int error;
@@ -974,7 +988,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	if (error)
  		goto out;
  
-@@ -595,8 +619,9 @@ asmlinkage long sys_chroot(const char __
+@@ -596,8 +620,9 @@ asmlinkage long sys_chroot(const char __
  {
  	struct nameidata nd;
  	int error;
@@ -985,81 +999,80 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	if (error)
  		goto out;
  
-@@ -617,36 +642,52 @@ out:
+@@ -618,38 +643,55 @@ out:
  	return error;
  }
  
+-asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
 +int chmod_common(struct dentry *dentry, mode_t mode)
-+{
-+      struct inode * inode = dentry->d_inode;
-+      struct iattr newattrs;
-+      int error = -EROFS;
-+
-+      if (IS_RDONLY(inode))
-+              goto out;
-+
-+      if (inode->i_op->setattr_raw) {
-+              struct inode_operations *op = dentry->d_inode->i_op;
-+
-+              newattrs.ia_mode = mode;
-+              newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
-+              newattrs.ia_valid |= ATTR_RAW;
-+              error = op->setattr_raw(inode, &newattrs);
-+              /* the file system wants to use normal vfs path now */
-+              if (error != -EOPNOTSUPP)
-+                    goto out;
-+      }
-+
-+      error = -EPERM;
-+      if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-+              goto out;
-+
-+      mutex_lock(&inode->i_mutex);
-+      if (mode == (mode_t) -1)
-+              mode = inode->i_mode;
-+      newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
-+      newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
-+      error = notify_change(dentry, &newattrs);
-+      mutex_unlock(&inode->i_mutex);
-+out:
-+      return error;
-+}
-+
- asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
  {
 -	struct inode * inode;
 -	struct dentry * dentry;
- 	struct file * file;
- 	int err = -EBADF;
--	struct iattr newattrs;
+-	struct file * file;
+-	int err = -EBADF;
++	struct inode * inode = dentry->d_inode;
+ 	struct iattr newattrs;
++	int error = -EROFS;
  
- 	file = fget(fd);
- 	if (!file)
+-	file = fget(fd);
+-	if (!file)
++	if (IS_RDONLY(inode))
  		goto out;
  
 -	dentry = file->f_dentry;
 -	inode = dentry->d_inode;
--
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = dentry->d_inode->i_op;
+ 
+-	audit_inode(NULL, inode);
++		newattrs.ia_mode = mode;
++		newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto out;
++	}
+ 
 -	err = -EROFS;
 -	if (IS_RDONLY(inode))
 -		goto out_putf;
 -	err = -EPERM;
--	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
++	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
 -		goto out_putf;
--	mutex_lock(&inode->i_mutex);
--	if (mode == (mode_t) -1)
--		mode = inode->i_mode;
--	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
--	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
++		goto out;
++
+ 	mutex_lock(&inode->i_mutex);
+ 	if (mode == (mode_t) -1)
+ 		mode = inode->i_mode;
+ 	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
+ 	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
 -	err = notify_change(dentry, &newattrs);
--	mutex_unlock(&inode->i_mutex);
--
++	error = notify_change(dentry, &newattrs);
+ 	mutex_unlock(&inode->i_mutex);
++out:
++	return error;
++}
++
++asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
++{
++	struct file * file;
++	int err = -EBADF;
++
++	file = fget(fd);
++	if (!file)
++		goto out;
++
++	audit_inode(NULL, file->f_dentry->d_inode);
++
++	err = chmod_common(file->f_dentry, mode);
+ 
 -out_putf:
-+        err = chmod_common(file->f_dentry, mode);
  	fput(file);
  out:
  	return err;
-@@ -656,32 +697,12 @@ asmlinkage long sys_fchmodat(int dfd, co
+@@ -659,32 +701,12 @@ asmlinkage long sys_fchmodat(int dfd, co
  			     mode_t mode)
  {
  	struct nameidata nd;
@@ -1093,7 +1106,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	path_release(&nd);
  out:
  	return error;
-@@ -707,6 +728,18 @@ static int chown_common(struct dentry * 
+@@ -710,6 +732,18 @@ static int chown_common(struct dentry * 
  	if (IS_RDONLY(inode))
  		goto out;
  	error = -EPERM;
@@ -1112,7 +1125,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  		goto out;
  	newattrs.ia_valid =  ATTR_CTIME;
-@@ -817,6 +850,7 @@ static struct file *__dentry_open(struct
+@@ -823,6 +857,7 @@ static struct file *__dentry_open(struct
  		error = open(inode, f);
  		if (error)
  			goto cleanup_all;
@@ -1120,7 +1133,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	}
  
  	f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
-@@ -843,6 +877,7 @@ cleanup_all:
+@@ -849,6 +884,7 @@ cleanup_all:
  	f->f_dentry = NULL;
  	f->f_vfsmnt = NULL;
  cleanup_file:
@@ -1128,7 +1141,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	put_filp(f);
  	dput(dentry);
  	mntput(mnt);
-@@ -868,6 +903,7 @@ static struct file *do_filp_open(int dfd
+@@ -874,6 +910,7 @@ static struct file *do_filp_open(int dfd
  {
  	int namei_flags, error;
  	struct nameidata nd;
@@ -1136,7 +1149,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  
  	namei_flags = flags;
  	if ((namei_flags+1) & O_ACCMODE)
-@@ -904,19 +940,19 @@ EXPORT_SYMBOL(filp_open);
+@@ -910,19 +947,19 @@ EXPORT_SYMBOL(filp_open);
  struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
  		int (*open)(struct inode *, struct file *))
  {
@@ -1162,7 +1175,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	goto out;
  }
  EXPORT_SYMBOL_GPL(lookup_instantiate_filp);
-@@ -933,7 +969,8 @@ struct file *nameidata_to_filp(struct na
+@@ -939,7 +976,8 @@ struct file *nameidata_to_filp(struct na
  	struct file *filp;
  
  	/* Pick up the filp from the open intent */
@@ -1172,9 +1185,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/open.c linux-2.6.16.21-0.8/fs/open.c
  	/* Has the filesystem initialised the file for us? */
  	if (filp->f_dentry == NULL)
  		filp = __dentry_open(nd->dentry, nd->mnt, flags, filp, NULL);
-diff -urNp linux-2.6.16.21-0.8.orig/fs/stat.c linux-2.6.16.21-0.8/fs/stat.c
---- linux-2.6.16.21-0.8.orig/fs/stat.c	2006-10-04 02:18:12.000000000 +0300
-+++ linux-2.6.16.21-0.8/fs/stat.c	2007-01-29 18:20:42.000000000 +0200
+Index: LINUX-SRC-TREE/fs/stat.c
+===================================================================
+--- LINUX-SRC-TREE.orig/fs/stat.c
++++ LINUX-SRC-TREE/fs/stat.c
 @@ -38,7 +38,7 @@ void generic_fillattr(struct inode *inod
  
  EXPORT_SYMBOL(generic_fillattr);
@@ -1245,9 +1259,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/fs/stat.c linux-2.6.16.21-0.8/fs/stat.c
  		fput(f);
  	}
  	return error;
-diff -urNp linux-2.6.16.21-0.8.orig/include/linux/dcache.h linux-2.6.16.21-0.8/include/linux/dcache.h
---- linux-2.6.16.21-0.8.orig/include/linux/dcache.h	2006-10-04 02:18:15.000000000 +0300
-+++ linux-2.6.16.21-0.8/include/linux/dcache.h	2007-01-29 18:20:42.000000000 +0200
+Index: LINUX-SRC-TREE/include/linux/dcache.h
+===================================================================
+--- LINUX-SRC-TREE.orig/include/linux/dcache.h
++++ LINUX-SRC-TREE/include/linux/dcache.h
 @@ -36,6 +36,9 @@ struct qstr {
  	const unsigned char *name;
  };
@@ -1258,10 +1273,11 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/dcache.h linux-2.6.16.21-0.8/i
  struct dentry_stat_t {
  	int nr_dentry;
  	int nr_unused;
-diff -urNp linux-2.6.16.21-0.8.orig/include/linux/fs.h linux-2.6.16.21-0.8/include/linux/fs.h
---- linux-2.6.16.21-0.8.orig/include/linux/fs.h	2006-10-04 02:18:16.000000000 +0300
-+++ linux-2.6.16.21-0.8/include/linux/fs.h	2007-01-29 18:20:42.000000000 +0200
-@@ -59,6 +59,7 @@ extern int dir_notify_enable;
+Index: LINUX-SRC-TREE/include/linux/fs.h
+===================================================================
+--- LINUX-SRC-TREE.orig/include/linux/fs.h
++++ LINUX-SRC-TREE/include/linux/fs.h
+@@ -61,6 +61,7 @@ extern int dir_notify_enable;
  
  #define FMODE_READ 1
  #define FMODE_WRITE 2
@@ -1269,7 +1285,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/fs.h linux-2.6.16.21-0.8/inclu
  
  /* Internal kernel extensions */
  #define FMODE_LSEEK	4
-@@ -265,6 +266,8 @@ typedef void (dio_iodone_t)(struct kiocb
+@@ -272,6 +273,8 @@ typedef void (dio_iodone_t)(struct kiocb
  #define ATTR_KILL_SUID	2048
  #define ATTR_KILL_SGID	4096
  #define ATTR_FILE	8192
@@ -1278,7 +1294,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/fs.h linux-2.6.16.21-0.8/inclu
  #define ATTR_NO_BLOCK	32768	/* Return EAGAIN and don't block on long truncates */
  
  /*
-@@ -500,6 +503,7 @@ struct inode {
+@@ -517,6 +520,7 @@ struct inode {
  	struct block_device	*i_bdev;
  	struct cdev		*i_cdev;
  	int			i_cindex;
@@ -1286,7 +1302,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/fs.h linux-2.6.16.21-0.8/inclu
  
  	__u32			i_generation;
  
-@@ -647,6 +651,7 @@ struct file {
+@@ -664,6 +668,7 @@ struct file {
  	spinlock_t		f_ep_lock;
  #endif /* #ifdef CONFIG_EPOLL */
  	struct address_space	*f_mapping;
@@ -1294,7 +1310,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/fs.h linux-2.6.16.21-0.8/inclu
  };
  extern spinlock_t files_lock;
  #define file_list_lock() spin_lock(&files_lock);
-@@ -1036,20 +1041,29 @@ struct inode_operations {
+@@ -1059,20 +1064,29 @@ struct inode_operations {
  	int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
  	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
  	int (*link) (struct dentry *,struct inode *,struct dentry *);
@@ -1324,7 +1340,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/fs.h linux-2.6.16.21-0.8/inclu
  	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
  	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
  	ssize_t (*listxattr) (struct dentry *, char *, size_t);
-@@ -1090,6 +1104,7 @@ struct super_operations {
+@@ -1113,6 +1127,7 @@ struct super_operations {
  	int (*remount_fs) (struct super_block *, int *, char *);
  	void (*clear_inode) (struct inode *);
  	void (*umount_begin) (struct super_block *);
@@ -1332,7 +1348,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/fs.h linux-2.6.16.21-0.8/inclu
  
  	int (*show_options)(struct seq_file *, struct vfsmount *);
  
-@@ -1292,6 +1307,7 @@ extern int may_umount_tree(struct vfsmou
+@@ -1322,6 +1337,7 @@ extern int may_umount_tree(struct vfsmou
  extern int may_umount(struct vfsmount *);
  extern void umount_tree(struct vfsmount *, int, struct list_head *);
  extern void release_mounts(struct list_head *);
@@ -1340,7 +1356,7 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/fs.h linux-2.6.16.21-0.8/inclu
  extern long do_mount(char *, char *, char *, unsigned long, void *);
  extern struct vfsmount *copy_tree(struct vfsmount *, struct dentry *, int);
  extern void mnt_set_mountpoint(struct vfsmount *, struct dentry *,
-@@ -1348,11 +1364,12 @@ static inline int break_lease(struct ino
+@@ -1378,11 +1394,12 @@ static inline int break_lease(struct ino
  /* fs/open.c */
  
  extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
@@ -1354,9 +1370,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/fs.h linux-2.6.16.21-0.8/inclu
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char __user *);
  
-diff -urNp linux-2.6.16.21-0.8.orig/include/linux/mount.h linux-2.6.16.21-0.8/include/linux/mount.h
---- linux-2.6.16.21-0.8.orig/include/linux/mount.h	2006-10-04 02:18:16.000000000 +0300
-+++ linux-2.6.16.21-0.8/include/linux/mount.h	2007-01-29 18:20:42.000000000 +0200
+Index: LINUX-SRC-TREE/include/linux/mount.h
+===================================================================
+--- LINUX-SRC-TREE.orig/include/linux/mount.h
++++ LINUX-SRC-TREE/include/linux/mount.h
 @@ -46,6 +46,8 @@ struct vfsmount {
  	struct list_head mnt_slave;	/* slave list entry */
  	struct vfsmount *mnt_master;	/* slave is on master->mnt_slave_list */
@@ -1366,9 +1383,10 @@ diff -urNp linux-2.6.16.21-0.8.orig/include/linux/mount.h linux-2.6.16.21-0.8/in
  	int mnt_pinned;
  };
  
-diff -urNp linux-2.6.16.21-0.8.orig/include/linux/namei.h linux-2.6.16.21-0.8/include/linux/namei.h
---- linux-2.6.16.21-0.8.orig/include/linux/namei.h	2006-10-04 02:18:16.000000000 +0300
-+++ linux-2.6.16.21-0.8/include/linux/namei.h	2007-01-29 18:20:49.000000000 +0200
+Index: LINUX-SRC-TREE/include/linux/namei.h
+===================================================================
+--- LINUX-SRC-TREE.orig/include/linux/namei.h
++++ LINUX-SRC-TREE/include/linux/namei.h
 @@ -5,10 +5,39 @@
  
  struct vfsmount;
diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index cff6a5f497b39335879089b940019e72645d8760..4dc2ba443b4759077fb9f91e6cdbad3185676c07 100644
--- a/lustre/kernel_patches/targets/2.6-sles10.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles10.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.16"
-lnxrel="27-0.9"
+lnxrel="46-0.14"
 
 KERNEL=linux-$lnxmaj.$lnxrel.tar.bz2
 SERIES=2.6-sles10.series
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 044d242718ba597b2921e565ba8bc7b9bed06933..9783682715ef447eedd9b5ababa4199755b056ef 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -4,7 +4,7 @@ SUPPORTED KERNELS:
 2.6-suse           SLES9 before SP1         already in SLES9 SP1 kernel
 2.6-suse-newer     SLES9: 2.6.5-7.282       extra patches for SLES9 after SP1
 2.6-rhel4          RHEL4: 2.6.9-55.EL
-2.6-sles10         SLES10: 2.6.16.21-0.8
+2.6-sles10         SLES10: 2.6.16.46-0.14
 
 CLIENT SUPPORT FOR UNPATCHED KERNELS:
                    kernel.org 2.6.16-2.6.19