Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/kernel into rawhide/user/steved/pnfs-rawhide

Conflicts:
	kernel.spec

Signed-off-by: Steve Dickson <steved@redhat.com>

config-generic

@@ -3607,6 +3607,18 @@ CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+# Enable pNFS
+CONFIG_PNFS=y
+CONFIG_PNFSD=y
+CONFIG_PNFSD_LOCAL_EXPORT=y
+CONFIG_SPNFS=y
+CONFIG_SPNFS_LAYOUTSEGMENTS=y
+CONFIG_SPNFS_BLOCK=y
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_PANLAYOUT=m
+CONFIG_PNFS_FILE_LAYOUT=m
+#
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set

kernel.spec

@@ -23,7 +23,7 @@ Summary: The Linux kernel
 #
 # (Uncomment the '#' and both spaces below to set the buildid.)
 #
-# % define buildid .local
+%define buildid .pnfs_wave3_20110203
 ###################################################################
 
 # The buildid can also be specified on the rpmbuild command line
@@ -106,21 +106,21 @@ Summary: The Linux kernel
 # kernel-PAE (only valid for i686)
 %define with_pae       %{?_without_pae:       0} %{?!_without_pae:       1}
 # kernel-debug
-%define with_debug     %{?_without_debug:     0} %{?!_without_debug:     1}
+%define with_debug     %{?_without_debug:     0} %{?!_without_debug:     0}
 # kernel-doc
-%define with_doc       %{?_without_doc:       0} %{?!_without_doc:       1}
+%define with_doc       %{?_without_doc:       0} %{?!_without_doc:       0}
 # kernel-headers
-%define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
+%define with_headers   %{?_without_headers:   0} %{?!_without_headers:   0}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:     1} %{?!_with_firmware:     0}
+%define with_firmware  %{?_with_firmware:     1} %{?!_with_firmware:     1}
 # tools/perf
-%define with_perf      %{?_without_perf:      0} %{?!_without_perf:      1}
+%define with_perf      %{?_without_perf:      0} %{?!_without_perf:      0}
 # kernel-debuginfo
-%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
+%define with_debuginfo %{?_without_debuginfo: 1} %{?!_without_debuginfo: 1}
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
 %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
 # Want to build a the vsdo directories installed
-%define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
+%define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 0}
 
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
@@ -725,6 +725,16 @@ Patch12205: runtime_pm_fixups.patch
 
 Patch12303: dmar-disable-when-ricoh-multifunction.patch
 
+Patch12305: xhci_hcd-suspend-resume.patch
+
+Patch30000: pnfs-all-2.6.38-rc3-2011-02-03.patch
+Patch30001: linux-2.6-pnfs-compile.patch
+Patch30002: linux-2.6.35-inline.patch
+
+Patch30000: pnfs-all-2.6.38-rc3-2011-02-03.patch
+Patch30001: linux-2.6-pnfs-compile.patch
+Patch30002: linux-2.6.35-inline.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1348,6 +1358,16 @@ ApplyPatch acpi_reboot.patch
 # rhbz#605888
 ApplyPatch dmar-disable-when-ricoh-multifunction.patch
 
+ApplyPatch xhci_hcd-suspend-resume.patch
+
+ApplyPatch pnfs-all-2.6.38-rc3-2011-02-03.patch
+ApplyPatch linux-2.6-pnfs-compile.patch
+ApplyPatch linux-2.6.35-inline.patch
+
+ApplyPatch pnfs-all-2.6.38-rc3-2011-02-03.patch
+ApplyPatch linux-2.6-pnfs-compile.patch
+ApplyPatch linux-2.6.35-inline.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2104,6 +2124,9 @@ fi
 - Linux 2.6.38-rc3-git3
 - Enable Advansys SCSI driver on x86_64 (#589115)
 
+* Thu Feb  3 2011 Steve Dickson <steved@redhat.com> 2.6.38-0.rc3.git2.1
+- Updated to the latest pNFS tag: pnfs-all-2.6.38-rc3-2011-02-03
+
 * Thu Feb 03 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc3.git2.1
 - Linux 2.6.38-rc3-git2 snapshot
 - [sgruszka] ath5k: fix fast channel change (#672778)
@@ -2134,6 +2157,9 @@ fi
 * Fri Jan 28 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc2.git7.1
 - Linux 2.6.38-rc2-git7
 
+* Fri Jan 28 2011  Steve Dickson <steved@redhat.com> 2.6.38-0.rc2.git5.1
+- Updated to the latest pNFS tag: pnfs-all-2.6.38-rc2-2011-01-27
+
 * Wed Jan 26 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git5.1
 - Linux 2.6.38-rc2-git5
 - [x86] Re-enable TRANSPARENT_HUGEPAGE, should be fixed by cacf061c.
@@ -2401,6 +2427,9 @@ fi
 * Mon Nov 08 2010 Kyle McMartin <kyle@redhat.com>
 - Cherry-pick utrace-ptrace fixes from mayoung. Thanks!
 
+* Mon Nov 08 2010 Steve Dickson <steved@redhat.com> 
+- Updated to the latest pNFS tag: pnfs-all-2.6.36-2010-11-03
+
 * Tue Nov 02 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.1.rc1.git0
 - Linux 2.6.37-rc1
 
@@ -2475,6 +2504,9 @@ fi
 * Thu Sep 30 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.30.rc6
 - Collection of patches to make intel_ips work properly.
 
+* Thu Sep 30 2010  Steve Dickson <steved@redhat.com>
+- Updated to the latest pNFS tag: pnfs-all-latest.v2.6.36-rc6
+
 * Wed Sep 29 2010 Dave Jones <davej@redhat.com>
 - Add back an old hack to make an SDV e1000e variant work.
 
@@ -2583,6 +2615,9 @@ fi
 * Wed Sep 01 2010 Kyle McMartin <kyle@redhat.com> - 2.6.36-0.13.rc3.git0
 - Swap back to roland's auto-updated utrace patches.
 
+* Wed Sep  1 2010  Steve Dickson <steved@redhat.com>
+- Updated to the latest pNFS tag: pnfs-all-2.6.36-rc3-2010-08-30
+
 * Mon Aug 30 2010 Kyle McMartin <kyle@redhat.com> - 2.6.36-0.12.rc3.git0
 - Linux 2.6.36-rc3
 

linux-2.6-pnfs-compile.patch

@@ -0,0 +1,13 @@
+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

linux-2.6.35-inline.patch

@@ -0,0 +1,11 @@
+diff -up linux-2.6.34.noarch/arch/x86/Makefile.orig linux-2.6.34.noarch/arch/x86/Makefile
+--- linux-2.6.34.noarch/arch/x86/Makefile.orig	2010-07-01 13:33:21.859627499 -0400
++++ linux-2.6.34.noarch/arch/x86/Makefile	2010-07-01 13:36:26.751576450 -0400
+@@ -81,6 +81,7 @@ ifdef CONFIG_CC_STACKPROTECTOR
+                 $(warning stack protector enabled but no compiler support)
+         endif
+ endif
++KBUILD_CFLAGS += -fno-inline-functions-called-once
+ 
+ # Don't unroll struct assignments with kmemcheck enabled
+ ifeq ($(CONFIG_KMEMCHECK),y)