rpms/kernel/devel linux-2.6-pnfs-compile.patch, NONE, 1.1.4.2 kernel.spec, 1.1980.2.1, 1.1980.2.2

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24089

Modified Files:
      Tag: private-pnfs-all-2_6_34-rc6-2010-05-06
	kernel.spec 
Added Files:
      Tag: private-pnfs-all-2_6_34-rc6-2010-05-06
	linux-2.6-pnfs-compile.patch 
Log Message:
Added linux-2.6-pnfs-compile.patch to fix compilation error


linux-2.6-pnfs-compile.patch:
 inet_connection_sock.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-pnfs-compile.patch ---
diff -up linux-2.6.32.x86_64/fs/nfs/objlayout/pnfs_osd_xdr.h.orig linux-2.6.32.x86_64/fs/nfs/objlayout/pnfs_osd_xdr.h
diff -up linux-2.6.32.x86_64/include/net/inet_connection_sock.h.orig linux-2.6.32.x86_64/include/net/inet_connection_sock.h
--- linux-2.6.32.x86_64/include/net/inet_connection_sock.h.orig	2009-12-02 22:51:21.000000000 -0500
+++ linux-2.6.32.x86_64/include/net/inet_connection_sock.h	2010-04-21 14:26:24.475659551 -0400
@@ -23,7 +23,7 @@
 #include <net/inet_sock.h>
 #include <net/request_sock.h>
 
-#define INET_CSK_DEBUG 1
+//#define INET_CSK_DEBUG 1
 
 /* Cancel timers, when they are not required. */
 #undef INET_CSK_CLEAR_TIMERS


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1980.2.1
retrieving revision 1.1980.2.2
diff -u -p -r1.1980.2.1 -r1.1980.2.2
--- kernel.spec	7 May 2010 11:19:29 -0000	1.1980.2.1
+++ kernel.spec	7 May 2010 11:53:11 -0000	1.1980.2.2
@@ -754,6 +754,7 @@ Patch12020: coredump-uid-pipe-check.patc
 
 Patch30000: linux-2.6.33-inline.patch
 Patch30001: pnfs-all-2.6.34-rc6-2010-05-06.patch
+Patch30002: linux-2.6-pnfs-compile.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1362,6 +1363,7 @@ ApplyPatch neuter_intel_microcode_load.p
 
 ApplyPatch linux-2.6.33-inline.patch 
 ApplyPatch pnfs-all-2.6.34-rc6-2010-05-06.patch
+ApplyPatch linux-2.6-pnfs-compile.patch
 
 %endif