rpms/kernel/devel patch-2.6.14-git11.bz2.sign, NONE, 1.1 .cvsignore, 1.268, 1.269 kernel-2.6.spec, 1.1654, 1.1655 linux-2.6-NFSD-ctlbits.patch, 1.1, 1.2 linux-2.6-serial-tickle-nmi.patch, 1.1, 1.2 sources, 1.210, 1.211 upstream, 1.195, 1.196 linux-2.6-alsa-maestro-hang.patch, 1.1, NONE linux-2.6-compile-fixes.patch, 1.35, NONE linux-2.6.14-powerpc-i8259.patch, 1.1, NONE linux-2.6.14-ppc-initrd.patch, 1.2, NONE patch-2.6.14-git10.bz2.sign, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Nov 8 10:25:46 UTC 2005 

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30571

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-NFSD-ctlbits.patch 
	linux-2.6-serial-tickle-nmi.patch sources upstream 
Added Files:
	patch-2.6.14-git11.bz2.sign 
Removed Files:
	linux-2.6-alsa-maestro-hang.patch 
	linux-2.6-compile-fixes.patch linux-2.6.14-powerpc-i8259.patch 
	linux-2.6.14-ppc-initrd.patch patch-2.6.14-git10.bz2.sign 
Log Message:
Do the -git11 merge since it's largely ppc again, and a few mtd bits


--- NEW FILE patch-2.6.14-git11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBDcFxLyGugalF9Dw4RAmiQAJ91eow8ApgnJo3yOyMt6t36dGhHVACfWTr3
hSGOMfP6+QrMwaJjJntoqxg=
=WORo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- .cvsignore	8 Nov 2005 03:28:58 -0000	1.268
+++ .cvsignore	8 Nov 2005 10:25:42 -0000	1.269
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.14
 linux-2.6.14.tar.bz2
-patch-2.6.14-git10.bz2
+patch-2.6.14-git11.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1654
retrieving revision 1.1655
diff -u -r1.1654 -r1.1655
--- kernel-2.6.spec	8 Nov 2005 04:03:32 -0000	1.1654
+++ kernel-2.6.spec	8 Nov 2005 10:25:42 -0000	1.1655
@@ -81,6 +81,7 @@
 %define image_install_path boot
 %define signmodules 1
 %define make_target vmlinux
+%define kernel_image vmlinux
 %endif
 
 %ifarch s390
@@ -153,7 +154,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -201,7 +202,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.14-git10.bz2
+Patch1: patch-2.6.14-git11.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -217,9 +218,7 @@
 Patch300: linux-2.6-ppc64-build.patch
 Patch301: linux-2.6-ppc64-eeh-panic.patch
 Patch302: linux-2.6-serial-of.patch
-Patch303: linux-2.6.14-ppc-initrd.patch
-Patch304: linux-2.6.14-powerpc-i8259.patch
-Patch305: linux-2.6.14-powerpc-pmac-smp.patch
+Patch303: linux-2.6.14-powerpc-pmac-smp.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -328,7 +327,6 @@
 Patch1710: linux-2.6-radeon-backlight.patch
 Patch1720: linux-2.6-ide-tune-locking.patch
 Patch1730: linux-2.6-autofs-pathlookup.patch
-Patch1740: linux-2.6-alsa-maestro-hang.patch
 Patch1750: linux-2.6-selinux-hush.patch
 
 # ACPI patches.
@@ -355,8 +353,6 @@
 # Not patches you're too lazy for to put in the proper place.
 #
 
-Patch10000: linux-2.6-compile-fixes.patch
-
 Patch10001: linux-2.6-kdump-needs-not-embedded.patch
 Patch10002: linux-2.6-proc-vmcore-needs-not-embedded.patch
 
@@ -600,8 +596,6 @@
 # Don't probe serial ports if they don't exist
 %patch302 -p1
 %patch303 -p1
-%patch304 -p1
-%patch305 -p1
 
 #
 # Xen
@@ -777,8 +771,6 @@
 %patch1720 -p1
 # autofs4 looks up wrong path element when ghosting is enabled
 %patch1730 -p1
-# Fix maestro driver hangs
-%patch1740 -p1
 # Silence some selinux messages.
 %patch1750 -p1
 
@@ -817,7 +809,6 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-%patch10000 -p1
 %patch10001 -p1
 %patch10002 -p1
 
@@ -1298,6 +1289,9 @@
 %endif
 
 %changelog
+* Tue Nov 08 2005 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.14-git11
+
 * Mon Nov 07 2005 Dave Jones <davej at redhat.com>
 - 2.6.14-git10
 

linux-2.6-NFSD-ctlbits.patch:
 fs/nfsd/nfs4state.c          |    3 ++
 fs/nfsd/nfsctl.c             |   60 ++++++++++++++++++++++++++++++++++++++++++-
 fs/nfsd/nfssvc.c             |   12 ++++++--
 include/linux/nfsd/nfsd.h    |    2 -
 include/linux/nfsd/syscall.h |   14 ++++++++--
 5 files changed, 84 insertions(+), 7 deletions(-)

Index: linux-2.6-NFSD-ctlbits.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-NFSD-ctlbits.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-NFSD-ctlbits.patch	16 Oct 2005 22:23:45 -0000	1.1
+++ linux-2.6-NFSD-ctlbits.patch	8 Nov 2005 10:25:42 -0000	1.2
@@ -1,88 +1,42 @@
---- linux-2.6.13/fs/nfsd/nfs4state.c.ctlbits	2005-09-23 11:47:27.817646000 -0400
-+++ linux-2.6.13/fs/nfsd/nfs4state.c	2005-09-23 11:47:40.413006000 -0400
-@@ -3319,6 +3319,9 @@ __nfs4_state_shutdown(void)
- void
- nfs4_state_shutdown(void)
- {
-+	if (!nfs4_init)
-+		return;
-+
- 	nfs4_lock_state();
- 	nfs4_release_reclaim();
- 	__nfs4_state_shutdown();
---- linux-2.6.13/fs/nfsd/nfsctl.c.ctlbits	2005-08-28 19:41:01.000000000 -0400
-+++ linux-2.6.13/fs/nfsd/nfsctl.c	2005-09-23 11:47:40.419006000 -0400
-@@ -23,6 +23,7 @@
- #include <linux/seq_file.h>
- #include <linux/pagemap.h>
- #include <linux/init.h>
-+#include <linux/string.h>
- 
- #include <linux/nfs.h>
- #include <linux/nfsd_idmap.h>
-@@ -35,6 +36,10 @@
+--- linux-2.6.14/fs/nfsd/nfsctl.c.aa1	2005-11-08 09:31:44.000000000 +0000
++++ linux-2.6.14/fs/nfsd/nfsctl.c	2005-11-08 09:32:14.000000000 +0000
+@@ -36,7 +36,9 @@
  
  #include <asm/uaccess.h>
  
 +int nfsd_port = 2049;
 +unsigned int nfsd_portbits = 0;
-+unsigned int nfsd_versbits = 0;
-+
+ unsigned int nfsd_versbits = ~0;
+ 
  /*
   *	We have a single directory with 9 nodes in it.
-  */
-@@ -51,6 +56,8 @@ enum {
+@@ -53,6 +55,7 @@ enum {
  	NFSD_Fh,
  	NFSD_Threads,
- 	NFSD_Leasetime,
+ 	NFSD_Versions,
 +	NFSD_Ports,
-+	NFSD_Versions,
- 	NFSD_RecoveryDir,
- };
- 
-@@ -67,6 +74,8 @@ static ssize_t write_getfs(struct file *
+ 	/*
+ 	 * The below MUST come last.  Otherwise we leave a hole in nfsd_files[]
+ 	 * with !CONFIG_NFSD_V4 and simple_fill_super() goes oops
+@@ -76,7 +73,7 @@ static ssize_t write_getfd(struct file *
+ static ssize_t write_getfs(struct file *file, char *buf, size_t size);
  static ssize_t write_filehandle(struct file *file, char *buf, size_t size);
  static ssize_t write_threads(struct file *file, char *buf, size_t size);
- static ssize_t write_leasetime(struct file *file, char *buf, size_t size);
+-static ssize_t write_versions(struct file *file, char *buf, size_t size);
 +static ssize_t write_ports(struct file *file, char *buf, size_t size);
-+static ssize_t write_versions(struct file *file, char *buf, size_t size);
+ #ifdef CONFIG_NFSD_V4
+ static ssize_t write_leasetime(struct file *file, char *buf, size_t size);
  static ssize_t write_recoverydir(struct file *file, char *buf, size_t size);
- 
- static ssize_t (*write_op[])(struct file *, char *, size_t) = {
-@@ -80,6 +89,8 @@ static ssize_t (*write_op[])(struct file
+@@ -92,7 +88,8 @@ static ssize_t (*write_op[])(struct file
+ 	[NFSD_Getfs] = write_getfs,
  	[NFSD_Fh] = write_filehandle,
  	[NFSD_Threads] = write_threads,
- 	[NFSD_Leasetime] = write_leasetime,
+ 	[NFSD_Versions] = write_versions,
 +	[NFSD_Ports] = write_ports,
-+	[NFSD_Versions] = write_versions,
+ #ifdef CONFIG_NFSD_V4
+ 	[NFSD_Leasetime] = write_leasetime,
  	[NFSD_RecoveryDir] = write_recoverydir,
- };
- 
-@@ -88,14 +99,12 @@ static ssize_t nfsctl_transaction_write(
- 	ino_t ino =  file->f_dentry->d_inode->i_ino;
- 	char *data;
- 	ssize_t rv;
--
- 	if (ino >= sizeof(write_op)/sizeof(write_op[0]) || !write_op[ino])
- 		return -EINVAL;
- 
- 	data = simple_transaction_get(file, buf, size);
- 	if (IS_ERR(data))
- 		return PTR_ERR(data);
--
- 	rv =  write_op[ino](file, data, size);
- 	if (rv>0) {
- 		simple_transaction_set(file, rv);
-@@ -259,7 +268,7 @@ static ssize_t write_filehandle(struct f
- 	 * qword quoting is used, so filehandle will be \x....
- 	 */
- 	char *dname, *path;
--	int maxsize;
-+	int maxsize = 0;
- 	char *mesg = buf;
- 	int len;
- 	struct auth_domain *dom;
-@@ -328,6 +337,102 @@ static ssize_t write_threads(struct file
+@@ -358,7 +351,60 @@ static ssize_t write_threads(struct file
  	sprintf(buf, "%d\n", nfsd_nrthreads());
  	return strlen(buf);
  }
@@ -100,7 +54,7 @@
 +	if (buf[size-1] != '\n')
 +		return -EINVAL;
 +	buf[size-1] = 0;
-+
+ 
 +	family = mesg;
 +	len = qword_get(&mesg, family, size);
 +	if (len <= 0) return -EINVAL;
@@ -140,145 +94,61 @@
 +
 +	return tlen;
 +}
-+static ssize_t write_versions(struct file *file, char *buf, size_t size)
-+{
-+	/*
-+	 * Format:
-+	 *   [-/+]vers [-/+]vers ...
-+	 */
-+	char *mesg = buf;
-+	char *vers, sign;
-+	int len, num;
-+	ssize_t tlen = 0;
-+
-+	if (buf[size-1] != '\n')
-+		return -EINVAL;
-+	buf[size-1] = 0;
-+
-+	vers = mesg;
-+	len = qword_get(&mesg, vers, size);
-+	if (len <= 0) return -EINVAL;
-+	do {
-+		sign = *vers;
-+		if (sign == '+' || sign == '-')
-+			num = simple_strtol((vers+1), NULL, 0);
-+		else
-+			num = simple_strtol(vers, NULL, 0);
-+		switch(num) {
-+		case 2:
-+		case 3:
-+		case 4:
-+			if (sign != '-')
-+				NFSCTL_VERSET(nfsd_versbits, num);
-+			else
-+				NFSCTL_VERUNSET(nfsd_versbits, num);
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+		vers += len + 1;
-+		tlen += len;
-+	} while ((len = qword_get(&mesg, vers, size)) > 0);
-+
-+	return tlen;
-+}
- 
- extern time_t nfs4_leasetime(void);
- 
-@@ -393,6 +498,8 @@ static int nfsd_fill_super(struct super_
+ static ssize_t write_versions(struct file *file, char *buf, size_t size)
+ {
+ 	/*
+@@ -484,6 +508,7 @@ static int nfsd_fill_super(struct super_
+ 		[NFSD_Fh] = {"filehandle", &transaction_ops, S_IWUSR|S_IRUSR},
+ 		[NFSD_Threads] = {"threads", &transaction_ops, S_IWUSR|S_IRUSR},
+ 		[NFSD_Versions] = {"versions", &transaction_ops, S_IWUSR|S_IRUSR},
++		[NFSD_Ports] = {"ports", &transaction_ops, S_IWUSR|S_IRUSR},
+ #ifdef CONFIG_NFSD_V4
  		[NFSD_Leasetime] = {"nfsv4leasetime", &transaction_ops, S_IWUSR|S_IRUSR},
  		[NFSD_RecoveryDir] = {"nfsv4recoverydir", &transaction_ops, S_IWUSR|S_IRUSR},
- #endif
-+		[NFSD_Ports] = {"ports", &transaction_ops, S_IWUSR|S_IRUSR},
-+		[NFSD_Versions] = {"versions", &transaction_ops, S_IWUSR|S_IRUSR},
- 		/* last one */ {""}
- 	};
- 	return simple_fill_super(sb, 0x6e667364, nfsd_files);
---- linux-2.6.13/fs/nfsd/nfssvc.c.ctlbits	2005-08-28 19:41:01.000000000 -0400
-+++ linux-2.6.13/fs/nfsd/nfssvc.c	2005-09-27 09:04:40.273630000 -0400
-@@ -30,6 +30,7 @@
- #include <linux/nfsd/nfsd.h>
- #include <linux/nfsd/stats.h>
- #include <linux/nfsd/cache.h>
-+#include <linux/nfsd/syscall.h>
- #include <linux/lockd/bind.h>
- #include <linux/nfsacl.h>
- 
-@@ -63,6 +64,33 @@ struct nfsd_list {
+--- linux-2.6.14/fs/nfsd/nfs4state.c.aa1	2005-11-08 09:31:51.000000000 +0000
++++ linux-2.6.14/fs/nfsd/nfs4state.c	2005-11-08 09:32:14.000000000 +0000
+@@ -3319,6 +3319,9 @@ __nfs4_state_shutdown(void)
+ void
+ nfs4_state_shutdown(void)
+ {
++	if (!nfs4_init)
++		return;
++
+ 	nfs4_lock_state();
+ 	nfs4_release_reclaim();
+ 	__nfs4_state_shutdown();
+--- linux-2.6.14/fs/nfsd/nfssvc.c.aa1	2005-11-08 09:31:44.000000000 +0000
++++ linux-2.6.14/fs/nfsd/nfssvc.c	2005-11-08 09:32:14.000000000 +0000
+@@ -53,7 +53,7 @@
+ extern struct svc_program	nfsd_program;
+ static void			nfsd(struct svc_rqst *rqstp);
+ struct timeval			nfssvc_boot;
+-       struct svc_serv 		*nfsd_serv;
++static struct svc_serv 		*nfsd_serv;
+ static atomic_t			nfsd_busy;
+ static unsigned long		nfsd_last_call;
+ static DEFINE_SPINLOCK(nfsd_call_lock);
+@@ -64,6 +64,8 @@ struct nfsd_list {
  };
  static struct list_head nfsd_list = LIST_HEAD_INIT(nfsd_list);
  
 +extern struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;
 +
-+static struct svc_version *	nfsd_version[] = {
-+	[2] = &nfsd_version2,
-+#if defined(CONFIG_NFSD_V3)
-+	[3] = &nfsd_version3,
-+#endif
-+#if defined(CONFIG_NFSD_V4)
-+	[4] = &nfsd_version4,
-+#endif
-+};
-+
-+#define NFSD_MINVERS    	2
-+#define NFSD_NRVERS		(sizeof(nfsd_version)/sizeof(nfsd_version[0]))
-+static struct svc_version *nfsd_versions[NFSD_NRVERS];
-+
-+struct svc_program		nfsd_program = {
-+	.pg_prog		= NFS_PROGRAM,		/* program number */
-+	.pg_nvers		= NFSD_NRVERS,		/* nr of entries in nfsd_version */
-+	.pg_vers		= nfsd_versions,	/* version table */
-+	.pg_name		= "nfsd",		/* program name */
-+	.pg_class		= "nfsd",		/* authentication class */
-+	.pg_stats		= &nfsd_svcstats,	/* version table */
-+	.pg_authenticate	= &svc_set_client,	/* export authentication */
-+
-+};
-+
- /*
-  * Maximum number of nfsd processes
-  */
-@@ -80,17 +108,37 @@ int
- nfsd_svc(unsigned short port, int nrservs)
- {
- 	int	error;
--	int	none_left;	
-+	int	none_left, found_one, i;
+ static struct svc_version *	nfsd_version[] = {
+ 	[2] = &nfsd_version2,
+ #if defined(CONFIG_NFSD_V3)
+@@ -110,8 +112,8 @@ nfsd_svc(unsigned short port, int nrserv
  	struct list_head *victim;
  	
  	lock_kernel();
--	dprintk("nfsd: creating service\n");
+-	dprintk("nfsd: creating service: vers 0x%x\n",
+-		nfsd_versbits);
 +	dprintk("nfsd: creating service: port %d vers 0x%x proto 0x%x\n",
 +		nfsd_port, nfsd_versbits, nfsd_portbits);
  	error = -EINVAL;
  	if (nrservs <= 0)
  		nrservs = 0;
- 	if (nrservs > NFSD_MAXSERVS)
- 		nrservs = NFSD_MAXSERVS;
- 	
-+	/*
-+	 * If set, use the nfsd_ctlbits to define which
-+	 * versions that will be advertised
-+	 */
-+	found_one = 0;
-+	if (nfsd_versbits) {
-+		for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++) {
-+			if (NFSCTL_VERISSET(nfsd_versbits, i)) {
-+				nfsd_program.pg_vers[i] = nfsd_version[i];
-+				found_one = 1;
-+			} else
-+				nfsd_program.pg_vers[i] = NULL;	
-+		}
-+	}
-+	if (!found_one) {
-+		for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++)
-+			nfsd_program.pg_vers[i] = nfsd_version[i];
-+	}
-+
- 	/* Readahead param cache - will no-op if it already exists */
- 	error =	nfsd_racache_init(2*nrservs);
- 	if (error<0)
-@@ -104,11 +152,14 @@ nfsd_svc(unsigned short port, int nrserv
+@@ -126,11 +147,15 @@ nfsd_svc(unsigned short port, int nrserv
  		nfsd_serv = svc_create(&nfsd_program, NFSD_BUFSIZE);
  		if (nfsd_serv == NULL)
  			goto out;
@@ -287,54 +157,33 @@
  		error = svc_makesock(nfsd_serv, IPPROTO_UDP, port);
  		if (error < 0)
  			goto failure;
--
+ 
  #ifdef CONFIG_NFSD_TCP
 +		if (NFSCTL_TCPISSET(nfsd_portbits))
 +			port = nfsd_port;
  		error = svc_makesock(nfsd_serv, IPPROTO_TCP, port);
  		if (error < 0)
  			goto failure;
-@@ -389,28 +440,3 @@ static struct svc_stat	nfsd_acl_svcstats
- #else
- #define nfsd_acl_program_p	NULL
- #endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */
--
--extern struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;
--
--static struct svc_version *	nfsd_version[] = {
--	[2] = &nfsd_version2,
--#if defined(CONFIG_NFSD_V3)
--	[3] = &nfsd_version3,
--#endif
--#if defined(CONFIG_NFSD_V4)
--	[4] = &nfsd_version4,
--#endif
--};
--
--#define NFSD_NRVERS		(sizeof(nfsd_version)/sizeof(nfsd_version[0]))
--struct svc_program		nfsd_program = {
--	.pg_next		= nfsd_acl_program_p,
--	.pg_prog		= NFS_PROGRAM,		/* program number */
--	.pg_nvers		= NFSD_NRVERS,		/* nr of entries in nfsd_version */
--	.pg_vers		= nfsd_version,		/* version table */
--	.pg_name		= "nfsd",		/* program name */
--	.pg_class		= "nfsd",		/* authentication class */
--	.pg_stats		= &nfsd_svcstats,	/* version table */
--	.pg_authenticate	= &svc_set_client,	/* export authentication */
--
--};
---- linux-2.6.13/include/linux/nfsd/syscall.h.ctlbits	2005-08-28 19:41:01.000000000 -0400
-+++ linux-2.6.13/include/linux/nfsd/syscall.h	2005-09-23 11:47:40.430008000 -0400
-@@ -39,6 +39,22 @@
- #define NFSCTL_GETFD		7	/* get an fh by path (used by mountd) */
+--- linux-2.6.14/include/linux/nfsd/syscall.h.aa1	2005-11-08 09:31:44.000000000 +0000
++++ linux-2.6.14/include/linux/nfsd/syscall.h	2005-11-08 09:32:14.000000000 +0000
+@@ -40,19 +40,28 @@
  #define	NFSCTL_GETFS		8	/* get an fh by path with max FH len */
  
-+/*
+ /*
+- * Macros used to set version
 + * Macros used to set version and protocol
-+ */
-+#define NFSCTL_VERSET(_cltbits, _v)   ((_cltbits) |=  (1 << ((_v) - 1)))
-+#define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << ((_v) - 1)))
-+#define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << ((_v) - 1)))
+  */
+ #define NFSCTL_VERSET(_cltbits, _v)   ((_cltbits) |=  (1 << (_v)))
+ #define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << (_v)))
+ #define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << (_v)))
+ 
+ #if defined(CONFIG_NFSD_V4)
+ #define	NFSCTL_VERALL	(0x1c /* 0b011100 */)
+ #elif defined(CONFIG_NFSD_V3)
+ #define	NFSCTL_VERALL	(0x0c /* 0b001100 */)
+ #else
+ #define	NFSCTL_VERALL	(0x04 /* 0b000100 */)
+ #endif
 +
 +#define NFSCTL_UDPSET(_cltbits)       ((_cltbits) |=  (1 << (17 - 1)))
 +#define NFSCTL_UDPUNSET(_cltbits)     ((_cltbits) &= ~(1 << (17 - 1)))
@@ -344,17 +193,27 @@
 +#define NFSCTL_TCPUNSET(_cltbits)     ((_cltbits) &= ~(1 << (18 - 1)))
 +#define NFSCTL_TCPISSET(_cltbits)     ((_cltbits) & (1 << (18 - 1)))
 +
-+
+ 
  /* SVC */
  struct nfsctl_svc {
- 	unsigned short		svc_port;
-@@ -120,6 +136,9 @@ extern int		exp_delclient(struct nfsctl_
+@@ -135,7 +136,8 @@ extern int		exp_delclient(struct nfsctl_
  extern int		exp_export(struct nfsctl_export *nxp);
  extern int		exp_unexport(struct nfsctl_export *nxp);
  
+-extern unsigned int nfsd_versbits;
 +extern int nfsd_port;
 +extern unsigned int nfsd_versbits, nfsd_portbits;
-+
+ 
  #endif /* __KERNEL__ */
  
- #endif /* NFSD_SYSCALL_H */
+--- linux-2.6.14/include/linux/nfsd/nfsd.h.aa1	2005-11-08 09:31:44.000000000 +0000
++++ linux-2.6.14/include/linux/nfsd/nfsd.h	2005-11-08 09:31:48.000000000 +0000
+@@ -60,7 +60,7 @@ typedef int (*nfsd_dirop_t)(struct inode
+ extern struct svc_program	nfsd_program;
+ extern struct svc_version	nfsd_version2, nfsd_version3,
+ 				nfsd_version4;
+-extern struct svc_serv		*nfsd_serv;
++
+ /*
+  * Function prototypes.
+  */

linux-2.6-serial-tickle-nmi.patch:
 8250.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Index: linux-2.6-serial-tickle-nmi.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-serial-tickle-nmi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-serial-tickle-nmi.patch	16 Oct 2005 22:23:46 -0000	1.1
+++ linux-2.6-serial-tickle-nmi.patch	8 Nov 2005 10:25:42 -0000	1.2
@@ -28,14 +28,6 @@
 
 --- linux-2.6.11/drivers/serial/8250.c~	2005-05-14 02:49:02.000000000 -0400
 +++ linux-2.6.11/drivers/serial/8250.c	2005-05-14 02:54:30.000000000 -0400
-@@ -40,6 +40,7 @@
- #include <linux/serial_core.h>
- #include <linux/serial.h>
- #include <linux/serial_8250.h>
-+#include <linux/nmi.h>
- 
- #include <asm/io.h>
- #include <asm/irq.h>
 @@ -2098,9 +2098,11 @@ static inline void wait_for_xmitr(struct
  	/* Wait up to 1s for flow control if necessary */
  	if (up->port.flags & UPF_CONS_FLOW) {


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- sources	8 Nov 2005 03:28:58 -0000	1.210
+++ sources	8 Nov 2005 10:25:42 -0000	1.211
@@ -1,2 +1,2 @@
 66d02cbd723876c6d69846a067875a22  linux-2.6.14.tar.bz2
-92fb5c0cbe30b1fa6c7a4cb6d366951e  patch-2.6.14-git10.bz2
+efc17f5e6adb5297c6bf46cceb5d7b57  patch-2.6.14-git11.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- upstream	8 Nov 2005 03:28:58 -0000	1.195
+++ upstream	8 Nov 2005 10:25:42 -0000	1.196
@@ -1,2 +1,2 @@
 linux-2.6.14.tar.bz2
-patch-2.6.14-git10.bz2
+patch-2.6.14-git11.bz2


--- linux-2.6-alsa-maestro-hang.patch DELETED ---


--- linux-2.6-compile-fixes.patch DELETED ---


--- linux-2.6.14-powerpc-i8259.patch DELETED ---


--- linux-2.6.14-ppc-initrd.patch DELETED ---


--- patch-2.6.14-git10.bz2.sign DELETED ---

More information about the fedora-cvs-commits mailing list