rpms/kernel/devel patch-2.6.34-rc5.bz2.sign, NONE, 1.1 .cvsignore, 1.1186, 1.1187 drm-intel-make-lvds-work.patch, 1.1, 1.2 kernel.spec, 1.1972, 1.1973 sources, 1.1146, 1.1147 upstream, 1.1059, 1.1060 patch-2.6.34-rc4-git4.bz2.sign, 1.1, NONE patch-2.6.34-rc4.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Tue Apr 20 01:45:12 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15819
Modified Files:
.cvsignore drm-intel-make-lvds-work.patch kernel.spec sources
upstream
Added Files:
patch-2.6.34-rc5.bz2.sign
Removed Files:
patch-2.6.34-rc4-git4.bz2.sign patch-2.6.34-rc4.bz2.sign
Log Message:
* Mon Apr 19 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.38.rc5.git0
- Linux 2.6.34-rc5
--- NEW FILE patch-2.6.34-rc5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBLzOzeyGugalF9Dw4RAruAAJ41okT/So6gMb1sutPrIWutlGS69wCfcDla
izUOrzn/ZlrKSGXZy4DeE10=
=5dFX
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1186
retrieving revision 1.1187
diff -u -p -r1.1186 -r1.1187
--- .cvsignore 17 Apr 2010 00:46:12 -0000 1.1186
+++ .cvsignore 20 Apr 2010 01:45:09 -0000 1.1187
@@ -5,5 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.33
linux-2.6.33.tar.bz2
-patch-2.6.34-rc4.bz2
-patch-2.6.34-rc4-git4.bz2
+patch-2.6.34-rc5.bz2
drm-intel-make-lvds-work.patch:
intel_display.c | 2 --
1 file changed, 2 deletions(-)
Index: drm-intel-make-lvds-work.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-make-lvds-work.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-intel-make-lvds-work.patch 31 Mar 2010 21:02:58 -0000 1.1
+++ drm-intel-make-lvds-work.patch 20 Apr 2010 01:45:09 -0000 1.2
@@ -2,16 +2,16 @@ diff -up linux-2.6.33.noarch/drivers/gpu
--- linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c.orig 2010-03-31 16:59:39.901995671 -0400
+++ linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c 2010-03-31 17:01:05.416996744 -0400
@@ -3757,7 +3757,6 @@ struct drm_crtc *intel_get_load_detect_p
- void intel_release_load_detect_pipe(struct intel_output *intel_output, int dpms_mode)
+ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, int dpms_mode)
{
- struct drm_encoder *encoder = &intel_output->enc;
+ struct drm_encoder *encoder = &intel_encoder->enc;
- struct drm_device *dev = encoder->dev;
struct drm_crtc *crtc = encoder->crtc;
struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
@@ -3767,7 +3766,6 @@ void intel_release_load_detect_pipe(stru
- intel_output->base.encoder = NULL;
- intel_output->load_detect_temp = false;
+ intel_encoder->base.encoder = NULL;
+ intel_encoder->load_detect_temp = false;
crtc->enabled = drm_helper_crtc_in_use(crtc);
- drm_helper_disable_unused_functions(dev);
}
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1972
retrieving revision 1.1973
diff -u -p -r1.1972 -r1.1973
--- kernel.spec 19 Apr 2010 19:53:27 -0000 1.1972
+++ kernel.spec 20 Apr 2010 01:45:09 -0000 1.1973
@@ -80,9 +80,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 4
+%define rcrev 5
# The git snapshot level
-%define gitrev 4
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -2016,6 +2016,9 @@ fi
# || ||
%changelog
+* Mon Apr 19 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.38.rc5.git0
+- Linux 2.6.34-rc5
+
* Mon Apr 19 2010 Matthew Garrett <mjg at redhat.com>
- linux-2.6-acpi-sleep-live-sci-live.patch: Try harder to switch to ACPI mode
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1146
retrieving revision 1.1147
diff -u -p -r1.1146 -r1.1147
--- sources 17 Apr 2010 00:46:13 -0000 1.1146
+++ sources 20 Apr 2010 01:45:10 -0000 1.1147
@@ -1,3 +1,2 @@
c3883760b18d50e8d78819c54d579b00 linux-2.6.33.tar.bz2
-c103b3168ad6128272c347f15822c77a patch-2.6.34-rc4.bz2
-22dfd474c72504137d06300295161a8d patch-2.6.34-rc4-git4.bz2
+85a5a5e2251b85cb50ef1a68906b0a3c patch-2.6.34-rc5.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1059
retrieving revision 1.1060
diff -u -p -r1.1059 -r1.1060
--- upstream 17 Apr 2010 00:46:13 -0000 1.1059
+++ upstream 20 Apr 2010 01:45:11 -0000 1.1060
@@ -1,3 +1,2 @@
linux-2.6.33.tar.bz2
-patch-2.6.34-rc4.bz2
-patch-2.6.34-rc4-git4.bz2
+patch-2.6.34-rc5.bz2
--- patch-2.6.34-rc4-git4.bz2.sign DELETED ---
--- patch-2.6.34-rc4.bz2.sign DELETED ---
More information about the scm-commits
mailing list