rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Conflicts:
	kernel.spec

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2010-08-31 20:30:47 -04:00
parent e4d5325720 2380b040ab
commit 17fde2a710
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel.spec
View File

@ -714,6 +714,10 @@ Patch13000: pnfs-all-2.6.35-2010-08-19.patch
Patch13001: linux-2.6-pnfs-compile.patch
Patch13002: linux-2.6.35-inline.patch
Patch13000: pnfs-all-2.6.35-2010-08-19.patch
Patch13001: linux-2.6-pnfs-compile.patch
Patch13002: linux-2.6.35-inline.patch
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@ -1318,6 +1322,10 @@ ApplyPatch pnfs-all-2.6.35-2010-08-19.patch
ApplyPatch linux-2.6-pnfs-compile.patch
ApplyPatch linux-2.6.35-inline.patch
ApplyPatch pnfs-all-2.6.35-2010-08-19.patch
ApplyPatch linux-2.6-pnfs-compile.patch
ApplyPatch linux-2.6.35-inline.patch
# END OF PATCH APPLICATIONS
%endif
@ -1924,6 +1932,7 @@ fi
- Drop merged patches:
mm-fix-page-table-unmap-for-stack-guard-page-properly.patch
mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
* Thu Aug 19 2010 Steve Dickson <steved@redhat.com>
- Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19