[kernel] r6287 - in dists/trunk/linux-2.6: . debian debian/arch/arm
debian/arch/armeb debian/lib/python/debian_linux
debian/patches debian/patches/series debian/templates
Bastian Blank
waldi at costa.debian.org
Sun Mar 26 18:37:50 UTC 2006
Author: waldi
Date: Sun Mar 26 18:37:44 2006
New Revision: 6287
Added:
dists/trunk/linux-2.6/debian/patches/series/3-extra
dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc14-update.patch
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/arch/arm/config
dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
dists/trunk/linux-2.6/debian/arch/armeb/config
dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
dists/trunk/linux-2.6/debian/templates/control.main.in
Log:
Merge /dists/sid/linux-2.6.
Modified: dists/trunk/linux-2.6/debian/arch/arm/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config Sun Mar 26 18:37:44 2006
@@ -2,7 +2,6 @@
# CONFIG_CIFS_EXPERIMENTAL is not set
CONFIG_SLIP_SMART=y
CONFIG_SUNRPC_GSS=m
-# CONFIG_NFSD_V4 is not set
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CODA_FS_OLD_API is not set
CONFIG_CIFS_STATS=y
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge Sun Mar 26 18:37:44 2006
@@ -663,7 +663,7 @@
# CONFIG_E100 is not set
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
-CONFIG_NE2K_PCI=y
+CONFIG_NE2K_PCI=m
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.nslu2 (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.nslu2 Sun Mar 26 18:37:44 2006
@@ -1369,14 +1369,24 @@
#
# Network File Systems
#
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
CONFIG_SUNRPC=m
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CIFS is not set
Modified: dists/trunk/linux-2.6/debian/arch/armeb/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/armeb/config (original)
+++ dists/trunk/linux-2.6/debian/arch/armeb/config Sun Mar 26 18:37:44 2006
@@ -2,7 +2,6 @@
# CONFIG_CIFS_EXPERIMENTAL is not set
CONFIG_SLIP_SMART=y
CONFIG_SUNRPC_GSS=m
-# CONFIG_NFSD_V4 is not set
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CODA_FS_OLD_API is not set
CONFIG_CIFS_STATS=y
Modified: dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2 (original)
+++ dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2 Sun Mar 26 18:37:44 2006
@@ -142,7 +142,7 @@
# Processor Features
#
# CONFIG_ARM_THUMB is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_BIG_ENDIAN=y
CONFIG_XSCALE_PMU=y
CONFIG_DMABOUNCE=y
@@ -1369,14 +1369,24 @@
#
# Network File Systems
#
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
CONFIG_SUNRPC=m
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CIFS is not set
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Sun Mar 26 18:37:44 2006
@@ -14,7 +14,15 @@
2.6.16 uppercase hex in Kconfig and new IDE sysfs naming, and VIA
IDE on powerpc).
- -- Frederik Schüler <fs at debian.org> Thu, 23 Mar 2006 18:47:46 +0100
+ [ Martin Michlmayr ]
+ * [arm/armeb] Enable CONFIG_NFSD on NSLU2 again. Closes: #358709.
+ * [arm/footbridge] CONFIG_NE2K_PCI should be a module, not built-in.
+
+ [ Bastian Blank ]
+ * Update vserver patch to 2.0.2-rc14.
+ - Fix sendfile. (closes: #358391, #358752)
+
+ -- Bastian Blank <waldi at debian.org> Fri, 24 Mar 2006 12:49:46 +0100
linux-2.6 (2.6.16-2) unstable; urgency=low
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Sun Mar 26 18:37:44 2006
@@ -211,6 +211,7 @@
ret[1] = vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
vars['upstreamversion'] = version['upstream']
vars['version'] = version['version']
+ vars['source_upstream'] = version['source_upstream']
vars['major'] = version['major']
ret[2] = vars
return ret
Added: dists/trunk/linux-2.6/debian/patches/series/3-extra
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/series/3-extra Sun Mar 26 18:37:44 2006
@@ -0,0 +1 @@
++ vserver-vs2.0.2-rc14-update.patch *_vserver
Added: dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc14-update.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc14-update.patch Sun Mar 26 18:37:44 2006
@@ -0,0 +1,44 @@
+--- linux-2.6.16-vs2.0.2-rc13/fs/ioprio.c 2006-03-20 17:34:49 +0100
++++ linux-2.6.16-vs2.0.2-rc14/fs/ioprio.c 2006-03-23 19:35:17 +0100
+@@ -96,7 +96,7 @@
+ if (!who)
+ user = current->user;
+ else
+- user = find_user(who, vx_current_xid());
++ user = find_user(vx_current_xid(), who);
+
+ if (!user)
+ break;
+@@ -150,7 +150,7 @@
+ if (!who)
+ user = current->user;
+ else
+- user = find_user(who, vx_current_xid());
++ user = find_user(vx_current_xid(), who);
+
+ if (!user)
+ break;
+--- linux-2.6.16-vs2.0.2-rc13/fs/read_write.c 2006-03-20 17:34:49 +0100
++++ linux-2.6.16/fs/read_write.c 2006-03-20 17:33:14 +0100
+@@ -667,8 +667,9 @@
+ if (!(in_file->f_mode & FMODE_PREAD))
+ goto fput_in;
+ retval = rw_verify_area(READ, in_file, ppos, count);
++ if (retval < 0)
+- if (retval)
+ goto fput_in;
++ count = retval;
+
+ retval = security_file_permission (in_file, MAY_READ);
+ if (retval)
+@@ -688,8 +689,9 @@
+ goto fput_out;
+ out_inode = out_file->f_dentry->d_inode;
+ retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
++ if (retval < 0)
+- if (retval)
+ goto fput_out;
++ count = retval;
+
+ retval = security_file_permission (out_file, MAY_WRITE);
+ if (retval)
Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in (original)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in Sun Mar 26 18:37:44 2006
@@ -64,7 +64,4 @@
linux-source- at version@ package, as well as architecture-specific
patches. Note that these patches do NOT apply against a pristine
Linux @version@ kernel but only against the kernel tarball
- linux-source- at version@_ at version@.orig.tar.gz from the Debian archive.
- .
- This packages is produced using an updated kernel packaging system
- and replaces older kernel-patch-debian packages
+ linux- at major@_ at source_upstream@.orig.tar.gz from the Debian archive.
More information about the Kernel-svn-changes
mailing list