rpms/kernel/devel patch-2.6.29-rc6-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.1024, 1.1025 config-generic, 1.249, 1.250 drm-modesetting-radeon.patch, 1.58, 1.59 kernel.spec, 1.1355, 1.1356 linux-2.6-hotfixes.patch, 1.3, 1.4 linux-2.6-v4l-dvb-fixes.patch, 1.1, 1.2 sources, 1.985, 1.986 upstream, 1.897, 1.898 patch-2.6.29-rc6-git4.bz2.sign, 1.1, NONE

Sat Feb 28 15:35:57 UTC 2009

Author: cebbert

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

Modified Files:
	.cvsignore config-generic drm-modesetting-radeon.patch 
	kernel.spec linux-2.6-hotfixes.patch 
	linux-2.6-v4l-dvb-fixes.patch sources upstream 
Added Files:
	patch-2.6.29-rc6-git5.bz2.sign 
Removed Files:
	patch-2.6.29-rc6-git4.bz2.sign 
Log Message:
Linux 2.6.29-rc6-git5
Removed parts of v4l-fixes patch that were merged upstream.
Added hotfix from lkml to export symbols needed by i915.
New driver: CONFIG_W1_SLAVE_DS2431=m

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

iD8DBQBJqSe7yGugalF9Dw4RAgvEAJ9pzINSGn0TRDCnN6a5Wf7VfF0C2QCeJZ+Q
2aJRzE3u1fzcyoKdOMTrlVQ=
=Qb5L
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1024
retrieving revision 1.1025
diff -u -r1.1024 -r1.1025
--- .cvsignore	27 Feb 2009 06:47:23 -0000	1.1024
+++ .cvsignore	28 Feb 2009 15:35:25 -0000	1.1025
@@ -6,4 +6,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc6.bz2
-patch-2.6.29-rc6-git4.bz2
+patch-2.6.29-rc6-git5.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- config-generic	28 Feb 2009 03:08:27 -0000	1.249
+++ config-generic	28 Feb 2009 15:35:25 -0000	1.250
@@ -2044,10 +2044,10 @@
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_W1_SLAVE_DS2433_CRC=y
 CONFIG_W1_SLAVE_DS2760=m
-
 #
 # Mice
 #

drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- drm-modesetting-radeon.patch	27 Feb 2009 05:42:11 -0000	1.58
+++ drm-modesetting-radeon.patch	28 Feb 2009 15:35:25 -0000	1.59
@@ -1427,14 +1427,6 @@
 index aebbf67..3867c71 100644
 --- a/arch/x86/mm/pat.c
 +++ b/arch/x86/mm/pat.c
-@@ -11,6 +11,7 @@
- #include <linux/bootmem.h>
- #include <linux/debugfs.h>
- #include <linux/kernel.h>
-+#include <linux/module.h>
- #include <linux/gfp.h>
- #include <linux/mm.h>
- #include <linux/fs.h>
 @@ -29,6 +30,7 @@
  
  #ifdef CONFIG_X86_PAT


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1355
retrieving revision 1.1356
diff -u -r1.1355 -r1.1356
--- kernel.spec	28 Feb 2009 03:13:38 -0000	1.1355
+++ kernel.spec	28 Feb 2009 15:35:26 -0000	1.1356
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -672,8 +672,8 @@
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
 # Updates/Fixes on V4L/DVB to the latest development tree
-Patch 2899: linux-2.6-v4l-dvb-fixes.patch
-Patch 2900: linux-2.6-v4l-dvb-update.patch
+Patch2899: linux-2.6-v4l-dvb-fixes.patch
+Patch2900: linux-2.6-v4l-dvb-update.patch
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
@@ -1792,7 +1792,13 @@
 # and build.
 
 %changelog
-* Wed Feb 27 2009 Mauro Carvalho Chehab <mchehab at redhat.com>
+* Sat Feb 28 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.176.rc6.git5
+- Linux 2.6.29-rc6-git5
+- Removed parts of v4l-fixes patch that were merged upstream.
+- Added hotfix from lkml to export symbols needed by i915.
+- New driver: CONFIG_W1_SLAVE_DS2431=m
+
+* Fri Feb 27 2009 Mauro Carvalho Chehab <mchehab at redhat.com>
 - Update V4L/DVB to the latest development tree (fixes and updates for linux-next)
 
 * Fri Feb 27 2009 Jarod Wilson <jarod at redhat.com>

linux-2.6-hotfixes.patch:

Index: linux-2.6-hotfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-hotfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-hotfixes.patch	15 Feb 2008 20:40:46 -0000	1.3
+++ linux-2.6-hotfixes.patch	28 Feb 2009 15:35:26 -0000	1.4
@@ -0,0 +1,60 @@
+Ingo Molnar (1):
+      x86: i915 needs pgprot_writecombine() and is_io_mapping_possible()
+
+
+ arch/x86/mm/iomap_32.c |   15 ++++-----------
+ arch/x86/mm/pat.c      |    2 ++
+ 2 files changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
+index 6c2b1af..04102d4 100644
+--- a/arch/x86/mm/iomap_32.c
++++ b/arch/x86/mm/iomap_32.c
+@@ -20,23 +20,16 @@
+ #include <asm/pat.h>
+ #include <linux/module.h>
+ 
+-#ifdef CONFIG_X86_PAE
+-int
+-is_io_mapping_possible(resource_size_t base, unsigned long size)
+-{
+-	return 1;
+-}
+-#else
+-int
+-is_io_mapping_possible(resource_size_t base, unsigned long size)
++int is_io_mapping_possible(resource_size_t base, unsigned long size)
+ {
++#ifndef CONFIG_X86_PAE
+ 	/* There is no way to map greater than 1 << 32 address without PAE */
+ 	if (base + size > 0x100000000ULL)
+ 		return 0;
+-
++#endif
+ 	return 1;
+ }
+-#endif
++EXPORT_SYMBOL_GPL(is_io_mapping_possible);
+ 
+ /* Map 'pfn' using fixed map 'type' and protections 'prot'
+  */
+diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
+index aebbf67..e0ab173 100644
+--- a/arch/x86/mm/pat.c
++++ b/arch/x86/mm/pat.c
+@@ -11,6 +11,7 @@
+ #include <linux/bootmem.h>
+ #include <linux/debugfs.h>
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/gfp.h>
+ #include <linux/mm.h>
+ #include <linux/fs.h>
+@@ -868,6 +869,7 @@ pgprot_t pgprot_writecombine(pgprot_t prot)
+ 	else
+ 		return pgprot_noncached(prot);
+ }
++EXPORT_SYMBOL_GPL(pgprot_writecombine);
+ 
+ #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT)
+ 

linux-2.6-v4l-dvb-fixes.patch:

Index: linux-2.6-v4l-dvb-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-v4l-dvb-fixes.patch	28 Feb 2009 03:08:27 -0000	1.1
+++ linux-2.6-v4l-dvb-fixes.patch	28 Feb 2009 15:35:26 -0000	1.2
@@ -1,216 +1,3 @@
-diff -upr drivers/media/dvb/b2c2/flexcop.c /home/v4l/tokernel/wrk/linux-2.6/drivers/media/dvb/b2c2/flexcop.c
---- a/drivers/media/dvb/b2c2/flexcop.c	2009-02-27 22:14:57.000000000 -0300
-+++ b/drivers/media/dvb/b2c2/flexcop.c	2009-02-27 00:32:20.000000000 -0300
-@@ -212,8 +212,7 @@ void flexcop_reset_block_300(struct flex
- 	v210.sw_reset_210.Block_reset_enable = 0xb2;
- 
- 	fc->write_ibi_reg(fc,sw_reset_210,v210);
--	msleep(1);
--
-+	udelay(1000);
- 	fc->write_ibi_reg(fc,ctrl_208,v208_save);
- }
- 
-diff -upr drivers/media/dvb/b2c2/flexcop-hw-filter.c /home/v4l/tokernel/wrk/linux-2.6/drivers/media/dvb/b2c2/flexcop-hw-filter.c
---- a/drivers/media/dvb/b2c2/flexcop-hw-filter.c	2008-12-24 21:26:37.000000000 -0200
-+++ b/drivers/media/dvb/b2c2/flexcop-hw-filter.c	2009-02-27 00:32:20.000000000 -0300
-@@ -192,6 +192,7 @@ int flexcop_pid_feed_control(struct flex
- 
- 	return 0;
- }
-+EXPORT_SYMBOL(flexcop_pid_feed_control);
- 
- void flexcop_hw_filter_init(struct flexcop_device *fc)
- {
-diff -upr drivers/media/dvb/b2c2/flexcop-pci.c /home/v4l/tokernel/wrk/linux-2.6/drivers/media/dvb/b2c2/flexcop-pci.c
---- a/drivers/media/dvb/b2c2/flexcop-pci.c	2008-12-24 21:26:37.000000000 -0200
-+++ b/drivers/media/dvb/b2c2/flexcop-pci.c	2009-02-27 00:32:20.000000000 -0300
-@@ -13,9 +13,9 @@ static int enable_pid_filtering = 1;
- module_param(enable_pid_filtering, int, 0444);
- MODULE_PARM_DESC(enable_pid_filtering, "enable hardware pid filtering: supported values: 0 (fullts), 1");
- 
--static int irq_chk_intv;
-+static int irq_chk_intv = 100;
- module_param(irq_chk_intv, int, 0644);
--MODULE_PARM_DESC(irq_chk_intv, "set the interval for IRQ watchdog (currently just debugging).");
-+MODULE_PARM_DESC(irq_chk_intv, "set the interval for IRQ streaming watchdog.");
- 
- #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG
- #define dprintk(level,args...) \
-@@ -34,7 +34,9 @@ MODULE_PARM_DESC(irq_chk_intv, "set the 
- 
- static int debug;
- module_param(debug, int, 0644);
--MODULE_PARM_DESC(debug, "set debug level (1=info,2=regs,4=TS,8=irqdma (|-able))." DEBSTATUS);
-+MODULE_PARM_DESC(debug,
-+	"set debug level (1=info,2=regs,4=TS,8=irqdma,16=check (|-able))."
-+	 DEBSTATUS);
- 
- #define DRIVER_VERSION "0.1"
- #define DRIVER_NAME "Technisat/B2C2 FlexCop II/IIb/III Digital TV PCI Driver"
-@@ -58,6 +60,8 @@ struct flexcop_pci {
- 	int active_dma1_addr; /* 0 = addr0 of dma1; 1 = addr1 of dma1 */
- 	u32 last_dma1_cur_pos; /* position of the pointer last time the timer/packet irq occured */
- 	int count;
-+	int count_prev;
-+	int stream_problem;
- 
- 	spinlock_t irq_lock;
- 
-@@ -103,18 +107,32 @@ static void flexcop_pci_irq_check_work(s
- 		container_of(work, struct flexcop_pci, irq_check_work.work);
- 	struct flexcop_device *fc = fc_pci->fc_dev;
- 
--	flexcop_ibi_value v = fc->read_ibi_reg(fc,sram_dest_reg_714);
-+	if (fc->feedcount) {
- 
--	flexcop_dump_reg(fc_pci->fc_dev,dma1_000,4);
--
--	if (v.sram_dest_reg_714.net_ovflow_error)
--		deb_chk("sram net_ovflow_error\n");
--	if (v.sram_dest_reg_714.media_ovflow_error)
--		deb_chk("sram media_ovflow_error\n");
--	if (v.sram_dest_reg_714.cai_ovflow_error)
--		deb_chk("sram cai_ovflow_error\n");
--	if (v.sram_dest_reg_714.cai_ovflow_error)
--		deb_chk("sram cai_ovflow_error\n");
-+		if (fc_pci->count == fc_pci->count_prev) {
-+			deb_chk("no IRQ since the last check\n");
-+			if (fc_pci->stream_problem++ == 3) {
-+				struct dvb_demux_feed *feed;
-+
-+				spin_lock_irq(&fc->demux.lock);
-+				list_for_each_entry(feed, &fc->demux.feed_list,
-+					list_head) {
-+					flexcop_pid_feed_control(fc, feed, 0);
-+				}
-+
-+				list_for_each_entry(feed, &fc->demux.feed_list,
-+					list_head) {
-+					flexcop_pid_feed_control(fc, feed, 1);
-+				}
-+				spin_unlock_irq(&fc->demux.lock);
-+
-+				fc_pci->stream_problem = 0;
-+			}
-+		} else {
-+			fc_pci->stream_problem = 0;
-+			fc_pci->count_prev = fc_pci->count;
-+		}
-+	}
- 
- 	schedule_delayed_work(&fc_pci->irq_check_work,
- 			msecs_to_jiffies(irq_chk_intv < 100 ? 100 : irq_chk_intv));
-@@ -216,16 +234,12 @@ static int flexcop_pci_stream_control(st
- 		flexcop_dma_control_timer_irq(fc,FC_DMA_1,1);
- 		deb_irq("IRQ enabled\n");
- 
-+		fc_pci->count_prev = fc_pci->count;
-+
- //		fc_pci->active_dma1_addr = 0;
- //		flexcop_dma_control_size_irq(fc,FC_DMA_1,1);
- 
--		if (irq_chk_intv > 0)
--			schedule_delayed_work(&fc_pci->irq_check_work,
--					msecs_to_jiffies(irq_chk_intv < 100 ? 100 : irq_chk_intv));
- 	} else {
--		if (irq_chk_intv > 0)
--			cancel_delayed_work(&fc_pci->irq_check_work);
--
- 		flexcop_dma_control_timer_irq(fc,FC_DMA_1,0);
- 		deb_irq("IRQ disabled\n");
- 
-@@ -299,8 +313,6 @@ static int flexcop_pci_init(struct flexc
- 					IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0)
- 		goto err_pci_iounmap;
- 
--
--
- 	fc_pci->init_state |= FC_PCI_INIT;
- 	return ret;
- 
-@@ -375,6 +387,10 @@ static int flexcop_pci_probe(struct pci_
- 
- 	INIT_DELAYED_WORK(&fc_pci->irq_check_work, flexcop_pci_irq_check_work);
- 
-+		if (irq_chk_intv > 0)
-+			schedule_delayed_work(&fc_pci->irq_check_work,
-+		msecs_to_jiffies(irq_chk_intv < 100 ? 100 : irq_chk_intv));
-+
- 	return ret;
- 
- err_fc_exit:
-@@ -393,6 +409,9 @@ static void flexcop_pci_remove(struct pc
- {
- 	struct flexcop_pci *fc_pci = pci_get_drvdata(pdev);
- 
-+	if (irq_chk_intv > 0)
-+		cancel_delayed_work(&fc_pci->irq_check_work);
-+
- 	flexcop_pci_dma_exit(fc_pci);
- 	flexcop_device_exit(fc_pci->fc_dev);
- 	flexcop_pci_exit(fc_pci);
-diff -upr drivers/media/video/em28xx/em28xx-audio.c /home/v4l/tokernel/wrk/linux-2.6/drivers/media/video/em28xx/em28xx-audio.c
---- a/drivers/media/video/em28xx/em28xx-audio.c	2009-02-27 22:44:26.000000000 -0300
-+++ b/drivers/media/video/em28xx/em28xx-audio.c	2009-02-27 00:32:20.000000000 -0300
-@@ -463,6 +463,8 @@ static int em28xx_audio_init(struct em28
- 	pcm->info_flags = 0;
- 	pcm->private_data = dev;
- 	strcpy(pcm->name, "Empia 28xx Capture");
-+
-+	snd_card_set_dev(card, &dev->udev->dev);
- 	strcpy(card->driver, "Empia Em28xx Audio");
- 	strcpy(card->shortname, "Em28xx Audio");
- 	strcpy(card->longname, "Empia Em28xx Audio");
-diff -upr drivers/media/video/pxa_camera.c /home/v4l/tokernel/wrk/linux-2.6/drivers/media/video/pxa_camera.c
---- a/drivers/media/video/pxa_camera.c	2009-02-27 22:44:50.000000000 -0300
-+++ b/drivers/media/video/pxa_camera.c	2009-02-27 00:32:20.000000000 -0300
-@@ -1155,23 +1155,23 @@ static int pxa_camera_set_fmt(struct soc
- {
- 	struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
- 	struct pxa_camera_dev *pcdev = ici->priv;
--	const struct soc_camera_data_format *host_fmt, *cam_fmt = NULL;
--	const struct soc_camera_format_xlate *xlate;
-+	const struct soc_camera_data_format *cam_fmt = NULL;
-+	const struct soc_camera_format_xlate *xlate = NULL;
- 	struct soc_camera_sense sense = {
- 		.master_clock = pcdev->mclk,
- 		.pixel_clock_max = pcdev->ciclk / 4,
- 	};
--	int ret, buswidth;
-+	int ret;
- 
--	xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
--	if (!xlate) {
--		dev_warn(&ici->dev, "Format %x not found\n", pixfmt);
--		return -EINVAL;
--	}
-+	if (pixfmt) {
-+		xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
-+		if (!xlate) {
-+			dev_warn(&ici->dev, "Format %x not found\n", pixfmt);
-+			return -EINVAL;
-+		}
- 
--	buswidth = xlate->buswidth;
--	host_fmt = xlate->host_fmt;
--	cam_fmt = xlate->cam_fmt;
-+		cam_fmt = xlate->cam_fmt;
-+	}
- 
- 	/* If PCLK is used to latch data from the sensor, check sense */
- 	if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
-@@ -1201,8 +1201,8 @@ static int pxa_camera_set_fmt(struct soc
- 	}
- 
- 	if (pixfmt && !ret) {
--		icd->buswidth = buswidth;
--		icd->current_fmt = host_fmt;
-+		icd->buswidth = xlate->buswidth;
-+		icd->current_fmt = xlate->host_fmt;
- 	}
- 
- 	return ret;
 diff -upr drivers/media/video/v4l2-common.c /home/v4l/tokernel/wrk/linux-2.6/drivers/media/video/v4l2-common.c
 --- a/drivers/media/video/v4l2-common.c	2009-02-27 22:44:26.000000000 -0300
 +++ b/drivers/media/video/v4l2-common.c	2009-01-06 22:29:51.000000000 -0200
@@ -231,33 +18,3 @@
  
  	/* MPEG controls */
  	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
-diff -upr drivers/media/video/sh_mobile_ceu_camera.c /home/v4l/tokernel/wrk/linux-2.6/drivers/media/video/sh_mobile_ceu_camera.c
---- a/drivers/media/video/sh_mobile_ceu_camera.c	2009-02-27 22:44:50.000000000 -0300
-+++ b/drivers/media/video/sh_mobile_ceu_camera.c	2009-02-27 00:32:20.000000000 -0300
-@@ -603,21 +603,18 @@ static int sh_mobile_ceu_set_fmt(struct 
- 	const struct soc_camera_format_xlate *xlate;
- 	int ret;
- 
-+	if (!pixfmt)
-+		return icd->ops->set_fmt(icd, pixfmt, rect);
-+
- 	xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
- 	if (!xlate) {
- 		dev_warn(&ici->dev, "Format %x not found\n", pixfmt);
- 		return -EINVAL;
- 	}
- 
--	switch (pixfmt) {
--	case 0:				/* Only geometry change */
--		ret = icd->ops->set_fmt(icd, pixfmt, rect);
--		break;
--	default:
--		ret = icd->ops->set_fmt(icd, xlate->cam_fmt->fourcc, rect);
--	}
-+	ret = icd->ops->set_fmt(icd, xlate->cam_fmt->fourcc, rect);
- 
--	if (pixfmt && !ret) {
-+	if (!ret) {
- 		icd->buswidth = xlate->buswidth;
- 		icd->current_fmt = xlate->host_fmt;
- 		pcdev->camera_fmt = xlate->cam_fmt;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.985
retrieving revision 1.986
diff -u -r1.985 -r1.986
--- sources	27 Feb 2009 06:47:23 -0000	1.985
+++ sources	28 Feb 2009 15:35:26 -0000	1.986
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 26f67d99666834cc579094619821d3c8  patch-2.6.29-rc6.bz2
-c9a437c9aecae85e0e11338f175d4818  patch-2.6.29-rc6-git4.bz2
+c9924c779a427f2b57cd201fbef62cee  patch-2.6.29-rc6-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -r1.897 -r1.898
--- upstream	27 Feb 2009 06:47:23 -0000	1.897
+++ upstream	28 Feb 2009 15:35:26 -0000	1.898
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc6.bz2
-patch-2.6.29-rc6-git4.bz2
+patch-2.6.29-rc6-git5.bz2


--- patch-2.6.29-rc6-git4.bz2.sign DELETED ---


