diff --git a/config-generic b/config-generic
index 03656b55e..e320aeffa 100644
--- a/config-generic
+++ b/config-generic
@@ -3704,6 +3704,7 @@ CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
 # CONFIG_NFSD_DEPRECATED is not set
 CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_PNFS_BLOCK=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 8533d92bd..5e1ddf74d 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -159,7 +159,7 @@ CONFIG_IDE_TASK_IOCTL=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLK_DEV_IDE_PMAC=y
+CONFIG_BLK_DEV_IDE_PMAC=m
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_BLK_DEV_HD is not set
diff --git a/kernel.spec b/kernel.spec
index 8a1368bc9..91839efb9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 3
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -1898,6 +1898,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Aug 11 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux-3.1-rc1-git6
+- Make ide_pmac a module (rhbz 730039)
+
 * Thu Aug 11 2011 Josh Boyer <jwboyer@redhat.com>
 - Linux-3.1-rc1-git3
 
diff --git a/sources b/sources
index 87dbae939..380713b1b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
 9246c18f0f001dcb9a4c761541594655  patch-3.1-rc1.bz2
-86a3a311076fff8efa00cf7730de5030  patch-3.1-rc1-git3.bz2
+ebb0b7c5b76a812f0e7f64e2b6bbc211  patch-3.1-rc1-git6.bz2