rpms/kernel/devel kernel-2.6.spec, 1.2203, 1.2204 linux-2.6-random-patches.patch, 1.10, 1.11 sources, 1.372, 1.373 upstream, 1.341, 1.342

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue May 16 16:38:24 UTC 2006


Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4172

Modified Files:
	kernel-2.6.spec linux-2.6-random-patches.patch sources 
	upstream 
Log Message:
2.6.17rc4-git3


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2203
retrieving revision 1.2204
diff -u -r1.2203 -r1.2204
--- kernel-2.6.spec	15 May 2006 03:14:47 -0000	1.2203
+++ kernel-2.6.spec	16 May 2006 16:38:20 -0000	1.2204
@@ -228,7 +228,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc4.bz2
-Patch2: patch-2.6.17-rc4-git2.bz2
+Patch2: patch-2.6.17-rc4-git3.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1714,6 +1714,9 @@
 %endif
 
 %changelog
+* Sun May 16 2006 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.17rc4-git3
+
 * Sun May 14 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc4-git2
 

linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c       |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c    |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c       |    5 +----
 linux-2.6.16.noarch/drivers/scsi/libata-core.c             |    1 +
 7 files changed, 7 insertions(+), 10 deletions(-)

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-random-patches.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-random-patches.patch	12 May 2006 00:21:06 -0000	1.10
+++ linux-2.6-random-patches.patch	16 May 2006 16:38:21 -0000	1.11
@@ -87,22 +87,6 @@
  	spin_lock_init(&sc1200wdt_lock);
  	sema_init(&open_sem, 1);
 
---- linux-2.6.16.noarch/drivers/net/dl2k.c~	2006-04-20 23:36:19.000000000 -0500
-+++ linux-2.6.16.noarch/drivers/net/dl2k.c	2006-04-20 23:37:54.000000000 -0500
-@@ -52,8 +52,11 @@
- #define DRV_NAME	"D-Link DL2000-based linux driver"
- #define DRV_VERSION	"v1.17b"
- #define DRV_RELDATE	"2006/03/10"
-+
-+#include <linux/dma-mapping.h>
- #include "dl2k.h"
- 
-+
- static char version[] __devinitdata =
-       KERN_INFO DRV_NAME " " DRV_VERSION " " DRV_RELDATE "\n";	
- #define MAX_UNITS 8
-
-
 --- linux-2.6.16.noarch/drivers/scsi/libata-core.c~	2006-04-22 18:43:24.000000000 -0500
 +++ linux-2.6.16.noarch/drivers/scsi/libata-core.c	2006-04-22 18:43:39.000000000 -0500
 @@ -4288,6 +4288,7 @@ int ata_device_resume(struct ata_port *a


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- sources	15 May 2006 03:14:47 -0000	1.372
+++ sources	16 May 2006 16:38:21 -0000	1.373
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 b446683143f8b396753cdec02e54fb56  xen-20060503.tar.bz2
 ec23ef169dd46af54dd6c82c187b29b4  patch-2.6.17-rc4.bz2
-ca1f4478cd53939448792aa18cb4e02e  patch-2.6.17-rc4-git2.bz2
+c063b4e623e784bf488e4734c55a1e9a  patch-2.6.17-rc4-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- upstream	15 May 2006 03:14:47 -0000	1.341
+++ upstream	16 May 2006 16:38:21 -0000	1.342
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc4.bz2
-patch-2.6.17-rc4-git2.bz2
+patch-2.6.17-rc4-git3.bz2




More information about the fedora-cvs-commits mailing list