rpms/kernel/devel patch-2.6.31-rc8-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.1121, 1.1122 config-generic, 1.322, 1.323 drm-intel-next.patch, 1.10, 1.11 kernel.spec, 1.1757, 1.1758 sources, 1.1079, 1.1080 upstream, 1.993, 1.994 patch-2.6.31-rc8-git1.bz2.sign, 1.1, NONE

Chuck Ebbert cebbert at fedoraproject.org
Tue Sep 1 17:08:26 UTC 2009 

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8822

Modified Files:
	.cvsignore config-generic drm-intel-next.patch kernel.spec 
	sources upstream 
Added Files:
	patch-2.6.31-rc8-git2.bz2.sign 
Removed Files:
	patch-2.6.31-rc8-git1.bz2.sign 
Log Message:
2.6.31-rc8-git2
Blank out drm-intel-next: entire contents are now upstream.


--- NEW FILE patch-2.6.31-rc8-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKnRA2yGugalF9Dw4RAloiAJ9bTv62NKVqJomI1RZifqbpGJ+FYgCfQVBT
on7r6znNdTxyK09vneVQsdI=
=rRWa
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1121
retrieving revision 1.1122
diff -u -p -r1.1121 -r1.1122
--- .cvsignore	30 Aug 2009 15:23:08 -0000	1.1121
+++ .cvsignore	1 Sep 2009 17:08:26 -0000	1.1122
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc8.bz2
-patch-2.6.31-rc8-git1.bz2
+patch-2.6.31-rc8-git2.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- config-generic	28 Aug 2009 16:43:03 -0000	1.322
+++ config-generic	1 Sep 2009 17:08:26 -0000	1.323
@@ -2362,8 +2362,9 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_BT8XX=m
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_SIANO_SMS1XXX=m
-CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_DVB_USB_DTV5100=m
 CONFIG_DVB_USB_AF9015=m

drm-intel-next.patch:
 0 files changed

Index: drm-intel-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-next.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- drm-intel-next.patch	26 Aug 2009 13:58:24 -0000	1.10
+++ drm-intel-next.patch	1 Sep 2009 17:08:26 -0000	1.11
@@ -1,362 +1 @@
-diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
-index 4cf8e2e..d129497 100644
---- a/drivers/gpu/drm/i915/intel_crt.c
-+++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -537,6 +537,10 @@ void intel_crt_init(struct drm_device *dev)
- 	}
- 
- 	intel_output->type = INTEL_OUTPUT_ANALOG;
-+	intel_output->clone_mask = (1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
-+				   (1 << INTEL_ANALOG_CLONE_BIT) |
-+				   (1 << INTEL_SDVO_LVDS_CLONE_BIT);
-+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 	connector->interlace_allowed = 0;
- 	connector->doublescan_allowed = 0;
- 
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index d6fce21..3fadb53 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -666,7 +666,7 @@ intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
- 	intel_clock_t clock;
- 	int err = target;
- 
--	if (IS_I9XX(dev) && intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
-+	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
- 	    (I915_READ(LVDS)) != 0) {
- 		/*
- 		 * For LVDS, if the panel is on, just rely on its current
-@@ -2396,7 +2396,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
- 		if (is_sdvo) {
- 			dpll |= DPLL_DVO_HIGH_SPEED;
- 			sdvo_pixel_multiply = adjusted_mode->clock / mode->clock;
--			if (IS_I945G(dev) || IS_I945GM(dev))
-+			if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
- 				dpll |= (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
- 			else if (IS_IGDNG(dev))
- 				dpll |= (sdvo_pixel_multiply - 1) << PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT;
-@@ -3170,7 +3170,7 @@ static int intel_connector_clones(struct drm_device *dev, int type_mask)
- 
-         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
- 		struct intel_output *intel_output = to_intel_output(connector);
--		if (type_mask & (1 << intel_output->type))
-+		if (type_mask & intel_output->clone_mask)
- 			index_mask |= (1 << entry);
- 		entry++;
- 	}
-@@ -3218,30 +3218,30 @@ static void intel_setup_outputs(struct drm_device *dev)
- 			intel_dp_init(dev, PCH_DP_D);
- 
- 	} else if (IS_I9XX(dev)) {
--		int found;
--		u32 reg;
-+		bool found = false;
- 
- 		if (I915_READ(SDVOB) & SDVO_DETECTED) {
- 			found = intel_sdvo_init(dev, SDVOB);
- 			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
- 				intel_hdmi_init(dev, SDVOB);
-+
- 			if (!found && SUPPORTS_INTEGRATED_DP(dev))
- 				intel_dp_init(dev, DP_B);
- 		}
- 
- 		/* Before G4X SDVOC doesn't have its own detect register */
--		if (IS_G4X(dev))
--			reg = SDVOC;
--		else
--			reg = SDVOB;
- 
--		if (I915_READ(reg) & SDVO_DETECTED) {
-+		if (I915_READ(SDVOB) & SDVO_DETECTED)
- 			found = intel_sdvo_init(dev, SDVOC);
--			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
-+
-+		if (!found && (I915_READ(SDVOC) & SDVO_DETECTED)) {
-+
-+			if (SUPPORTS_INTEGRATED_HDMI(dev))
- 				intel_hdmi_init(dev, SDVOC);
--			if (!found && SUPPORTS_INTEGRATED_DP(dev))
-+			if (SUPPORTS_INTEGRATED_DP(dev))
- 				intel_dp_init(dev, DP_C);
- 		}
-+
- 		if (SUPPORTS_INTEGRATED_DP(dev) && (I915_READ(DP_D) & DP_DETECTED))
- 			intel_dp_init(dev, DP_D);
- 	} else
-@@ -3253,51 +3253,10 @@ static void intel_setup_outputs(struct drm_device *dev)
- 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
- 		struct intel_output *intel_output = to_intel_output(connector);
- 		struct drm_encoder *encoder = &intel_output->enc;
--		int crtc_mask = 0, clone_mask = 0;
- 
--		/* valid crtcs */
--		switch(intel_output->type) {
--		case INTEL_OUTPUT_HDMI:
--			crtc_mask = ((1 << 0)|
--				     (1 << 1));
--			clone_mask = ((1 << INTEL_OUTPUT_HDMI));
--			break;
--		case INTEL_OUTPUT_DVO:
--		case INTEL_OUTPUT_SDVO:
--			crtc_mask = ((1 << 0)|
--				     (1 << 1));
--			clone_mask = ((1 << INTEL_OUTPUT_ANALOG) |
--				      (1 << INTEL_OUTPUT_DVO) |
--				      (1 << INTEL_OUTPUT_SDVO));
--			break;
--		case INTEL_OUTPUT_ANALOG:
--			crtc_mask = ((1 << 0)|
--				     (1 << 1));
--			clone_mask = ((1 << INTEL_OUTPUT_ANALOG) |
--				      (1 << INTEL_OUTPUT_DVO) |
--				      (1 << INTEL_OUTPUT_SDVO));
--			break;
--		case INTEL_OUTPUT_LVDS:
--			crtc_mask = (1 << 1);
--			clone_mask = (1 << INTEL_OUTPUT_LVDS);
--			break;
--		case INTEL_OUTPUT_TVOUT:
--			crtc_mask = ((1 << 0) |
--				     (1 << 1));
--			clone_mask = (1 << INTEL_OUTPUT_TVOUT);
--			break;
--		case INTEL_OUTPUT_DISPLAYPORT:
--			crtc_mask = ((1 << 0) |
--				     (1 << 1));
--			clone_mask = (1 << INTEL_OUTPUT_DISPLAYPORT);
--			break;
--		case INTEL_OUTPUT_EDP:
--			crtc_mask = (1 << 1);
--			clone_mask = (1 << INTEL_OUTPUT_EDP);
--			break;
--		}
--		encoder->possible_crtcs = crtc_mask;
--		encoder->possible_clones = intel_connector_clones(dev, clone_mask);
-+		encoder->possible_crtcs = intel_output->crtc_mask;
-+		encoder->possible_clones = intel_connector_clones(dev,
-+						intel_output->clone_mask);
- 	}
- }
- 
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index a6ff15a..f2afc4a 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1254,6 +1254,18 @@ intel_dp_init(struct drm_device *dev, int output_reg)
- 	else
- 		intel_output->type = INTEL_OUTPUT_DISPLAYPORT;
- 
-+	if (output_reg == DP_B)
-+		intel_output->clone_mask = (1 << INTEL_DP_B_CLONE_BIT);
-+	else if (output_reg == DP_C)
-+		intel_output->clone_mask = (1 << INTEL_DP_C_CLONE_BIT);
-+	else if (output_reg == DP_D)
-+		intel_output->clone_mask = (1 << INTEL_DP_D_CLONE_BIT);
-+
-+	if (IS_eDP(intel_output)) {
-+		intel_output->crtc_mask = (1 << 1);
-+		intel_output->clone_mask = (1 << INTEL_OUTPUT_EDP);
-+	} else
-+		intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 	connector->interlace_allowed = true;
- 	connector->doublescan_allowed = 0;
- 
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index d6f92ea..25aa6fa 100644
---- a/drivers/gpu/drm/i915/intel_drv.h
-+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -57,6 +57,24 @@
- #define INTEL_OUTPUT_DISPLAYPORT 7
- #define INTEL_OUTPUT_EDP 8
- 
-+/* Intel Pipe Clone Bit */
-+#define INTEL_HDMIB_CLONE_BIT 1
-+#define INTEL_HDMIC_CLONE_BIT 2
-+#define INTEL_HDMID_CLONE_BIT 3
-+#define INTEL_HDMIE_CLONE_BIT 4
-+#define INTEL_HDMIF_CLONE_BIT 5
-+#define INTEL_SDVO_NON_TV_CLONE_BIT 6
-+#define INTEL_SDVO_TV_CLONE_BIT 7
-+#define INTEL_SDVO_LVDS_CLONE_BIT 8
-+#define INTEL_ANALOG_CLONE_BIT 9
-+#define INTEL_TV_CLONE_BIT 10
-+#define INTEL_DP_B_CLONE_BIT 11
-+#define INTEL_DP_C_CLONE_BIT 12
-+#define INTEL_DP_D_CLONE_BIT 13
-+#define INTEL_LVDS_CLONE_BIT 14
-+#define INTEL_DVO_TMDS_CLONE_BIT 15
-+#define INTEL_DVO_LVDS_CLONE_BIT 16
-+
- #define INTEL_DVO_CHIP_NONE 0
- #define INTEL_DVO_CHIP_LVDS 1
- #define INTEL_DVO_CHIP_TMDS 2
-@@ -86,6 +104,8 @@ struct intel_output {
- 	bool needs_tv_clock;
- 	void *dev_priv;
- 	void (*hot_plug)(struct intel_output *);
-+	int crtc_mask;
-+	int clone_mask;
- };
- 
- struct intel_crtc {
-diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
-index 13bff20..a4d2606 100644
---- a/drivers/gpu/drm/i915/intel_dvo.c
-+++ b/drivers/gpu/drm/i915/intel_dvo.c
-@@ -435,14 +435,20 @@ void intel_dvo_init(struct drm_device *dev)
- 			continue;
- 
- 		intel_output->type = INTEL_OUTPUT_DVO;
-+		intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 		switch (dvo->type) {
- 		case INTEL_DVO_CHIP_TMDS:
-+			intel_output->clone_mask =
-+				(1 << INTEL_DVO_TMDS_CLONE_BIT) |
-+				(1 << INTEL_ANALOG_CLONE_BIT);
- 			drm_connector_init(dev, connector,
- 					   &intel_dvo_connector_funcs,
- 					   DRM_MODE_CONNECTOR_DVII);
- 			encoder_type = DRM_MODE_ENCODER_TMDS;
- 			break;
- 		case INTEL_DVO_CHIP_LVDS:
-+			intel_output->clone_mask =
-+				(1 << INTEL_DVO_LVDS_CLONE_BIT);
- 			drm_connector_init(dev, connector,
- 					   &intel_dvo_connector_funcs,
- 					   DRM_MODE_CONNECTOR_LVDS);
-diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
-index 1842290..fa304e1 100644
---- a/drivers/gpu/drm/i915/intel_hdmi.c
-+++ b/drivers/gpu/drm/i915/intel_hdmi.c
-@@ -230,22 +230,28 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
- 
- 	connector->interlace_allowed = 0;
- 	connector->doublescan_allowed = 0;
-+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 
- 	/* Set up the DDC bus. */
--	if (sdvox_reg == SDVOB)
-+	if (sdvox_reg == SDVOB) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIB_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "HDMIB");
--	else if (sdvox_reg == SDVOC)
-+	} else if (sdvox_reg == SDVOC) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIC_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, GPIOD, "HDMIC");
--	else if (sdvox_reg == HDMIB)
-+	} else if (sdvox_reg == HDMIB) {
-+		intel_output->clone_mask = (1 << INTEL_HDMID_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOE,
- 								"HDMIB");
--	else if (sdvox_reg == HDMIC)
-+	} else if (sdvox_reg == HDMIC) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIE_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOD,
- 								"HDMIC");
--	else if (sdvox_reg == HDMID)
-+	} else if (sdvox_reg == HDMID) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIF_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOF,
- 								"HDMID");
--
-+	}
- 	if (!intel_output->ddc_bus)
- 		goto err_connector;
- 
-diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index 3f445a8..8df02ef 100644
---- a/drivers/gpu/drm/i915/intel_lvds.c
-+++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -916,6 +916,8 @@ void intel_lvds_init(struct drm_device *dev)
- 	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
- 	intel_output->type = INTEL_OUTPUT_LVDS;
- 
-+	intel_output->clone_mask = (1 << INTEL_LVDS_CLONE_BIT);
-+	intel_output->crtc_mask = (1 << 1);
- 	drm_encoder_helper_add(encoder, &intel_lvds_helper_funcs);
- 	drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs);
- 	connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
-index 5371d93..d3b74ba 100644
---- a/drivers/gpu/drm/i915/intel_sdvo.c
-+++ b/drivers/gpu/drm/i915/intel_sdvo.c
-@@ -1458,7 +1458,7 @@ intel_sdvo_multifunc_encoder(struct intel_output *intel_output)
- 		(SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1))
- 		caps++;
- 	if (sdvo_priv->caps.output_flags &
--		(SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_SVID0))
-+		(SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_SVID1))
- 		caps++;
- 	if (sdvo_priv->caps.output_flags &
- 		(SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_CVBS1))
-@@ -1967,6 +1967,9 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 			intel_sdvo_set_colorimetry(intel_output,
- 						   SDVO_COLORIMETRY_RGB256);
- 			connector->connector_type = DRM_MODE_CONNECTOR_HDMIA;
-+			intel_output->clone_mask =
-+					(1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
-+					(1 << INTEL_ANALOG_CLONE_BIT);
- 		}
- 	} else if (flags & SDVO_OUTPUT_SVID0) {
- 
-@@ -1975,11 +1978,14 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 		connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
- 		sdvo_priv->is_tv = true;
- 		intel_output->needs_tv_clock = true;
-+		intel_output->clone_mask = 1 << INTEL_SDVO_TV_CLONE_BIT;
- 	} else if (flags & SDVO_OUTPUT_RGB0) {
- 
- 		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
- 		encoder->encoder_type = DRM_MODE_ENCODER_DAC;
- 		connector->connector_type = DRM_MODE_CONNECTOR_VGA;
-+		intel_output->clone_mask = (1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
-+					(1 << INTEL_ANALOG_CLONE_BIT);
- 	} else if (flags & SDVO_OUTPUT_RGB1) {
- 
- 		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
-@@ -1991,12 +1997,16 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
- 		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
- 		sdvo_priv->is_lvds = true;
-+		intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT) |
-+					(1 << INTEL_SDVO_LVDS_CLONE_BIT);
- 	} else if (flags & SDVO_OUTPUT_LVDS1) {
- 
- 		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
- 		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
- 		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
- 		sdvo_priv->is_lvds = true;
-+		intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT) |
-+					(1 << INTEL_SDVO_LVDS_CLONE_BIT);
- 	} else {
- 
- 		unsigned char bytes[2];
-@@ -2009,6 +2019,7 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 				  bytes[0], bytes[1]);
- 		ret = false;
- 	}
-+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 
- 	if (ret && registered)
- 		ret = drm_sysfs_connector_add(connector) == 0 ? true : false;
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index da4ab4d..2fbe13a 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1718,6 +1718,7 @@ intel_tv_init(struct drm_device *dev)
- 	if (!intel_output) {
- 		return;
- 	}
-+
- 	connector = &intel_output->base;
- 
- 	drm_connector_init(dev, connector, &intel_tv_connector_funcs,
-@@ -1729,6 +1730,7 @@ intel_tv_init(struct drm_device *dev)
- 	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
- 	tv_priv = (struct intel_tv_priv *)(intel_output + 1);
- 	intel_output->type = INTEL_OUTPUT_TVOUT;
-+	intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT);
- 	intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1));
- 	intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);
- 	intel_output->dev_priv = tv_priv;
+empty


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1757
retrieving revision 1.1758
diff -u -p -r1.1757 -r1.1758
--- kernel.spec	1 Sep 2009 16:12:52 -0000	1.1757
+++ kernel.spec	1 Sep 2009 17:08:26 -0000	1.1758
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -686,7 +686,7 @@ Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-page-flip.patch
-# anholt's tree as of 2009-08-26
+# intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
@@ -1316,7 +1316,7 @@ ApplyPatch drm-nouveau.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-page-flip.patch
-ApplyPatch drm-intel-next.patch
+ApplyOptionalPatch drm-intel-next.patch
 ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
@@ -2005,6 +2005,10 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 01 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc8-git2
+- Blank out drm-intel-next: entire contents are now upstream.
+
 * Tue Sep 01 2009 Dave Jones <davej at redhat.com>
 - Make firmware buildarch noarch. (Suggested by drago01 on irc)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1079
retrieving revision 1.1080
diff -u -p -r1.1079 -r1.1080
--- sources	30 Aug 2009 15:23:09 -0000	1.1079
+++ sources	1 Sep 2009 17:08:26 -0000	1.1080
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 d7dce63ebb912ddcd7ac7ed580db03e4  patch-2.6.31-rc8.bz2
-7b4745c59d0ba65bef1d360229e02d50  patch-2.6.31-rc8-git1.bz2
+81cac9f7aa9cfa526ce4cfedb4e0f739  patch-2.6.31-rc8-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -p -r1.993 -r1.994
--- upstream	30 Aug 2009 15:23:09 -0000	1.993
+++ upstream	1 Sep 2009 17:08:26 -0000	1.994
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc8.bz2
-patch-2.6.31-rc8-git1.bz2
+patch-2.6.31-rc8-git2.bz2


--- patch-2.6.31-rc8-git1.bz2.sign DELETED ---

More information about the fedora-extras-commits mailing list