r3996 - in trunk/kernel/linux-2.6/debian: arch arch/s390 patches-debian patches-debian/series

[Bastian Blank]

Author: waldi
Date: 2005-08-19 23:13:40 +0000 (Fri, 19 Aug 2005)
New Revision: 3996

Added:
   trunk/kernel/linux-2.6/debian/patches-debian/drivers-s390-net-klist.patch
Modified:
   trunk/kernel/linux-2.6/debian/arch/config
   trunk/kernel/linux-2.6/debian/arch/s390/config
   trunk/kernel/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1
Log:
* debian/arch/config: Enable ACL support for NFS.
* debian/arch/s390/config: Update.
* debian/patches-debian/drivers-s390-net-klist.patch: Add.
* debian/patches-debian/series/2.6.12+2.6.13-rc6-1: Add drivers-s390-net-klist.patch.


Modified: trunk/kernel/linux-2.6/debian/arch/config
===================================================================
--- trunk/kernel/linux-2.6/debian/arch/config	2005-08-19 23:11:47 UTC (rev 3995)
+++ trunk/kernel/linux-2.6/debian/arch/config	2005-08-19 23:13:40 UTC (rev 3996)
@@ -145,8 +145,10 @@
 CONFIG_CRAMFS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y

Modified: trunk/kernel/linux-2.6/debian/arch/s390/config
===================================================================
--- trunk/kernel/linux-2.6/debian/arch/s390/config	2005-08-19 23:11:47 UTC (rev 3995)
+++ trunk/kernel/linux-2.6/debian/arch/s390/config	2005-08-19 23:13:40 UTC (rev 3996)
@@ -92,6 +92,7 @@
 CONFIG_S390_TAPE_BLOCK=y
 CONFIG_S390_TAPE_34XX=m
 CONFIG_VMLOGRDR=m
+CONFIG_VMCP=m
 CONFIG_MONREADER=m
 CONFIG_Z90CRYPT=m
 CONFIG_PACKET=y
@@ -107,6 +108,7 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_IP_TCPDIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_IP_TCPDIAG_IPV6=y
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
@@ -208,6 +210,7 @@
 # CONFIG_NETCONSOLE is not set
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_JBD=y
@@ -218,6 +221,7 @@
 # CONFIG_XFS_SECURITY is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
@@ -331,3 +335,4 @@
 # CONFIG_CRYPTO_TEST is not set
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC32=m
+CONFIG_KEXEC=y

Added: trunk/kernel/linux-2.6/debian/patches-debian/drivers-s390-net-klist.patch
===================================================================
(Binary files differ)


Property changes on: trunk/kernel/linux-2.6/debian/patches-debian/drivers-s390-net-klist.patch
___________________________________________________________________
Name: svn:mime-type
   + message/rfc822

Modified: trunk/kernel/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1
===================================================================
--- trunk/kernel/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1	2005-08-19 23:11:47 UTC (rev 3995)
+++ trunk/kernel/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1	2005-08-19 23:13:40 UTC (rev 3996)
@@ -1,6 +1,7 @@
 + amd64-int3-fix.patch
 + drivers-ide-dma-blacklist-toshiba.patch
 + drivers-scsi-megaraid_splitup.patch
++ drivers-s390-net-klist.patch
 + fbdev-radeon-noaccel.patch
 + fs-asfs-2.patch
 + ia64-irq-affinity-upfix.patch