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>
This commit is contained in:
commit
5c33d3c5c6
|
@ -731,6 +731,10 @@ Patch30000: pnfs-all-2.6.38-rc3-2011-02-03.patch
|
||||||
Patch30001: linux-2.6-pnfs-compile.patch
|
Patch30001: linux-2.6-pnfs-compile.patch
|
||||||
Patch30002: linux-2.6.35-inline.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
|
%endif
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
||||||
|
@ -1360,6 +1364,10 @@ ApplyPatch pnfs-all-2.6.38-rc3-2011-02-03.patch
|
||||||
ApplyPatch linux-2.6-pnfs-compile.patch
|
ApplyPatch linux-2.6-pnfs-compile.patch
|
||||||
ApplyPatch linux-2.6.35-inline.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
|
# END OF PATCH APPLICATIONS
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
Loading…
Reference in New Issue