[kernel/f14/user/steved/pnfs-f14: 91/106] - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24

Steve Dickson steved at fedoraproject.org
Fri Jan 28 17:14:04 UTC 2011


commit cf1662d8fb82feb46a6e71d829711b4d8187df11
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Aug 31 21:17:17 2010 -0400

    - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 kernel.spec |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index f5aa203..2bda576 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -23,7 +23,11 @@ Summary: The Linux kernel
 #
 # (Uncomment the '#' and both spaces below to set the buildid.)
 #
+<<<<<<< HEAD
 %define buildid .pnfs35.2010.09.14
+=======
+%define buildid .pnfs35.2010.08.24
+>>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
 ###################################################################
 
 # The buildid can also be specified on the rpmbuild command line
@@ -751,6 +755,11 @@ Patch12040: only-use-alpha2-regulatory-information-from-country-IE.patch
 
 Patch12080: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
 # rhbz #622149
 Patch12085: fix-rcu_deref_check-warning.patch
 Patch12086: linux-2.6-cgroups-rcu.patch
@@ -788,6 +797,7 @@ Patch13646: tpm-fix-stall-on-boot.patch
 
 Patch13651: kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch
 
+<<<<<<< HEAD
 Patch13652: fix-i8k-inline-asm.patch
 
 Patch13653: inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch
@@ -832,6 +842,14 @@ Patch13703: btrfs-fix-typo-in-fallocate-to-make-it-honor-actual-size.patch
 Patch13704: hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
 
 Patch13000: pnfs-all-2.6.35-2010-09-14-f14.patch
+=======
+=======
+>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
+Patch13000: pnfs-all-2.6.35-2010-08-19.patch
+=======
+Patch13000: pnfs-all-2.6.35-2010-08-24-f14.patch
+>>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
+>>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
 Patch13001: linux-2.6-pnfs-compile.patch
 Patch13002: linux-2.6.35-inline.patch
 
@@ -1487,6 +1505,7 @@ ApplyPatch only-use-alpha2-regulatory-information-from-country-IE.patch
 # bz 610941
 ApplyPatch kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 
+<<<<<<< HEAD
 # bz 622149
 ApplyPatch fix-rcu_deref_check-warning.patch
 ApplyPatch linux-2.6-cgroups-rcu.patch
@@ -1533,6 +1552,7 @@ ApplyPatch tpm-fix-stall-on-boot.patch
 # CVE-2010-3698
 ApplyPatch kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch
 
+<<<<<<< HEAD
 ApplyPatch fix-i8k-inline-asm.patch
 
 # rhbz#651264 (CVE-2010-3880)
@@ -1573,6 +1593,12 @@ ApplyPatch block-check-for-proper-length-of-iov-entries-earlier-in-blk_rq_map_us
 ApplyPatch hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
 
 ApplyPatch pnfs-all-2.6.35-2010-09-14-f14.patch
+=======
+ApplyPatch pnfs-all-2.6.35-2010-08-19.patch
+=======
+ApplyPatch pnfs-all-2.6.35-2010-08-24-f14.patch
+>>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
+>>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
 ApplyPatch linux-2.6-pnfs-compile.patch
 ApplyPatch linux-2.6.35-inline.patch
 


More information about the scm-commits mailing list