Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-09-14
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
9f73d83bc4
commit
5d0f2f53b5
13
kernel.spec
13
kernel.spec
|
@ -23,7 +23,7 @@ Summary: The Linux kernel
|
|||
#
|
||||
# (Uncomment the '#' and both spaces below to set the buildid.)
|
||||
#
|
||||
%define buildid .pnfs35.2010.08.24
|
||||
%define buildid .pnfs35.2010.09.14
|
||||
###################################################################
|
||||
|
||||
# The buildid can also be specified on the rpmbuild command line
|
||||
|
@ -778,7 +778,7 @@ Patch13650: drm-i915-sanity-check-pread-pwrite.patch
|
|||
Patch13651: kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch
|
||||
Patch13652: v4l1-fix-32-bit-compat-microcode-loading-translation.patch
|
||||
|
||||
Patch13000: pnfs-all-2.6.35-2010-08-24-f14.patch
|
||||
Patch13000: pnfs-all-2.6.35-2010-09-14-f14.patch
|
||||
Patch13001: linux-2.6-pnfs-compile.patch
|
||||
Patch13002: linux-2.6.35-inline.patch
|
||||
|
||||
|
@ -1431,6 +1431,7 @@ ApplyPatch libata-it821x-dump-stack-on-cache-flush.patch
|
|||
# temporary fix for typo in Xen -stable patch
|
||||
ApplyPatch xen-fix-typo-in-xen-irq-fix.patch
|
||||
|
||||
<<<<<<< HEAD
|
||||
# rhbz#641468
|
||||
ApplyPatch pnpacpi-cope-with-invalid-device-ids.patch
|
||||
|
||||
|
@ -1463,6 +1464,9 @@ ApplyPatch kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch
|
|||
ApplyPatch v4l1-fix-32-bit-compat-microcode-loading-translation.patch
|
||||
|
||||
ApplyPatch pnfs-all-2.6.35-2010-08-24-f14.patch
|
||||
=======
|
||||
ApplyPatch pnfs-all-2.6.35-2010-09-14-f14.patch
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-09-14
|
||||
ApplyPatch linux-2.6-pnfs-compile.patch
|
||||
ApplyPatch linux-2.6.35-inline.patch
|
||||
|
||||
|
@ -2052,6 +2056,7 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
<<<<<<< HEAD
|
||||
* Tue Nov 02 2010 Ben Skeggs <bskeggs@redhat.com> 2.6.35.6-50
|
||||
- nouveau: add potential workaround for NV86 hardware quirk
|
||||
- fix issue that occurs in certain dual-head configurations (rhbz#641524)
|
||||
|
@ -2160,6 +2165,10 @@ fi
|
|||
|
||||
* Wed Sep 29 2010 Dave Jones <davej@redhat.com> 2.6.35.6-35
|
||||
- Add back an old hack to make an SDV e1000e variant work.
|
||||
=======
|
||||
* Thu Sep 30 2010 Steve Dickson <steved@redhat.com>
|
||||
- Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-09-14
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-09-14
|
||||
|
||||
* Wed Sep 29 2010 Dave Jones <davej@redhat.com>
|
||||
- Enable IB700 watchdog (used by qemu/kvm). (#637152)
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue