[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel patch-2.6.13-rc5.bz2.sign, NONE, 1.1 .cvsignore, 1.185, 1.186 kernel-2.6.spec, 1.1445, 1.1446 linux-2.6-compile-fixes.patch, 1.14, 1.15 upstream, 1.117, 1.118 patch-2.6.13-rc4.bz2.sign, 1.1, NONE

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	upstream 
Added Files:
	patch-2.6.13-rc5.bz2.sign 
Removed Files:
	patch-2.6.13-rc4.bz2.sign 
Log Message:
rc5



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

iD8DBQBC7wXCyGugalF9Dw4RAsIVAJ4kNDrIxZlgeTmSlBxQRrsv5wm/KACfaIU9
yAZzAqIN9+Vu19kflr+dF7E=
=4usn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- .cvsignore	1 Aug 2005 19:34:18 -0000	1.185
+++ .cvsignore	2 Aug 2005 06:07:08 -0000	1.186
@@ -6,17 +6,4 @@
 temp-*
 kernel-2.6.12
 linux-2.6.12.tar.bz2
-patch-2.6.13-rc2.bz2
-patch-2.6.13-rc2-git3.bz2
-patch-2.6.13-rc2-git5.bz2
-patch-2.6.13-rc3.bz2
-patch-2.6.13-rc3-git2.bz2
-patch-2.6.13-rc3-git4.bz2
-patch-2.6.13-rc3-git4.bz2
-patch-2.6.13-rc3-git5.bz2
-patch-2.6.13-rc3-git7.bz2
-patch-2.6.13-rc3-git8.bz2
-patch-2.6.13-rc3-git9.bz2
-patch-2.6.13-rc4-git1.bz2
-patch-2.6.13-rc4-git3.bz2
-patch-2.6.13-rc4-git4.bz2
+patch-2.6.13-rc5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1445
retrieving revision 1.1446
diff -u -r1.1445 -r1.1446
--- kernel-2.6.spec	1 Aug 2005 19:34:18 -0000	1.1445
+++ kernel-2.6.spec	2 Aug 2005 06:07:08 -0000	1.1446
@@ -221,7 +221,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.13-rc4.bz2
+Patch1: patch-2.6.13-rc5.bz2
 Patch2: patch-2.6.13-rc4-git4.bz2
 
 # Patches 100 through 500 are meant for architecture patches
@@ -543,7 +543,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 # 
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 
 #
 # Patches to back out
@@ -1252,6 +1252,9 @@
 %endif
 
 %changelog
+* Tue Aug 02 2005 Dave Jones <davej redhat com>
+- 2.6.13-rc5
+
 * Mon Aug 01 2005 Dave Jones <davej redhat com>
 - 2.6.13-rc4-git4
 

linux-2.6-compile-fixes.patch:
 linux-10000/arch/i386/Makefile              |    4 ++--
 linux-10000/arch/i386/kernel/Makefile       |    6 +++---
 linux-10000/arch/i386/kernel/nmi.c          |    2 +-
 linux-10000/arch/ppc64/Makefile             |    2 +-
 linux-10000/arch/ppc64/boot/Makefile        |    3 +++
 linux-10000/arch/x86_64/ia32/sys_ia32.c     |    1 -
 linux-10000/arch/x86_64/mm/init.c           |    2 --
 linux-10000/drivers/acpi/ec.c               |    2 +-
 linux-10000/drivers/net/acenic.c            |    2 +-
 linux-10000/drivers/pci/search.c            |    2 +-
 linux-10000/drivers/usb/storage/scsiglue.c  |    2 +-
 linux-10000/fs/open.c                       |    1 -
 linux-10000/fs/proc/generic.c               |    2 +-
 linux-10000/include/linux/config.h          |    4 +++-
 linux-10000/include/linux/delay.h           |   17 ++++++++---------
 linux-10000/include/linux/gfp.h             |    2 +-
 linux-10000/include/linux/namei.h           |    2 +-
 linux-10000/init/Kconfig                    |    2 +-
 linux-10000/kernel/pid.c                    |    2 +-
 linux-10000/scripts/reference_discarded.pl  |    3 ++-
 linux-10000/scripts/reference_init.pl       |    1 +
 linux-10000/sound/core/oss/pcm_oss.c        |    7 +++++++
 linux-10001/arch/ppc/Makefile               |    1 +
 linux-10001/arch/ppc/kernel/head.S          |    2 +-
 linux-10001/arch/ppc/kernel/misc.S          |    2 +-
 linux-10001/arch/ppc/mm/hashtable.S         |    4 ++--
 linux-10001/arch/ppc/platforms/pmac_sleep.S |    2 +-
 linux-10001/arch/ppc64/Makefile             |    2 +-
 linux-10001/arch/ppc64/boot/main.c          |    1 +
 linux-10001/crypto/Makefile                 |    2 ++
 linux-10001/drivers/md/Makefile             |    2 ++
 linux-10001/include/asm-ppc/ppc_asm.h       |    2 +-
 linux-10001/include/linux/config.h          |    2 +-
 linux-10001/scripts/kconfig/Makefile        |    2 +-
 linux-10001/scripts/reference_discarded.pl  |    1 +
 linux-10001/sound/core/oss/Makefile         |    1 +
 linux-2.6.11/Makefile                       |    2 +-
 linux-2.6.11/drivers/char/agp/hp-agp.c      |    3 +--
 linux-2.6.11/drivers/scsi/ide-scsi.c        |    7 ++++++-
 linux-2.6.11/drivers/usb/storage/usb.c      |    2 +-
 linux-2.6.12/drivers/net/sk98lin/skge.c     |    2 ++
 linux-2.6.12/drivers/net/skge.c             |    2 +-
 42 files changed, 69 insertions(+), 46 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-compile-fixes.patch	1 Aug 2005 20:35:08 -0000	1.14
+++ linux-2.6-compile-fixes.patch	2 Aug 2005 06:07:08 -0000	1.15
@@ -557,109 +557,6 @@
  	}
  #endif
 
---- linux-2.6.12/drivers/i2c/busses/i2c-mpc.c~	2005-08-01 16:07:47.000000000 -0400
-+++ linux-2.6.12/drivers/i2c/busses/i2c-mpc.c	2005-08-01 16:10:31.000000000 -0400
-@@ -382,100 +382,6 @@ static void __exit fsl_i2c_exit(void)
- module_init(fsl_i2c_init);
- module_exit(fsl_i2c_exit);
- 
--static int fsl_i2c_probe(struct device *device)
--{
--	int result = 0;
--	struct mpc_i2c *i2c;
--	struct platform_device *pdev = to_platform_device(device);
--	struct fsl_i2c_platform_data *pdata;
--	struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
--	pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data;
--
--	if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {
--		return -ENOMEM;
--	}
--	memset(i2c, 0, sizeof(*i2c));
--
--	i2c->irq = platform_get_irq(pdev, 0);
--	i2c->flags = pdata->device_flags;
--	init_waitqueue_head(&i2c->queue);
--
--	i2c->base = ioremap((phys_addr_t)r->start, MPC_I2C_REGION);
--
--	if (!i2c->base) {
--		printk(KERN_ERR "i2c-mpc - failed to map controller\n");
--		result = -ENOMEM;
--		goto fail_map;
--	}
--
--	if (i2c->irq != 0)
--		if ((result = request_irq(i2c->irq, mpc_i2c_isr,
--					  SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
--			printk(KERN_ERR
--			       "i2c-mpc - failed to attach interrupt\n");
--			goto fail_irq;
--		}
--
--	mpc_i2c_setclock(i2c);
--	dev_set_drvdata(device, i2c);
--
--	i2c->adap = mpc_ops;
--	i2c_set_adapdata(&i2c->adap, i2c);
--	i2c->adap.dev.parent = &pdev->dev;
--	if ((result = i2c_add_adapter(&i2c->adap)) < 0) {
--		printk(KERN_ERR "i2c-mpc - failed to add adapter\n");
--		goto fail_add;
--	}
--
--	return result;
--
--      fail_add:
--	if (i2c->irq != 0)
--		free_irq(i2c->irq, NULL);
--      fail_irq:
--	iounmap(i2c->base);
--      fail_map:
--	kfree(i2c);
--	return result;
--};
--
--static int fsl_i2c_remove(struct device *device)
--{
--	struct mpc_i2c *i2c = dev_get_drvdata(device);
--
--	i2c_del_adapter(&i2c->adap);
--	dev_set_drvdata(device, NULL);
--
--	if (i2c->irq != 0)
--		free_irq(i2c->irq, i2c);
--
--	iounmap(i2c->base);
--	kfree(i2c);
--	return 0;
--};
--
--/* Structure for a device driver */
--static struct device_driver fsl_i2c_driver = {
--	.name = "fsl-i2c",
--	.bus = &platform_bus_type,
--	.probe = fsl_i2c_probe,
--	.remove = fsl_i2c_remove,
--};
--
--static int __init fsl_i2c_init(void)
--{
--	return driver_register(&fsl_i2c_driver);
--}
--
--static void __exit fsl_i2c_exit(void)
--{
--	driver_unregister(&fsl_i2c_driver);
--}
--
--module_init(fsl_i2c_init);
--module_exit(fsl_i2c_exit);
--
- MODULE_AUTHOR("Adrian Cox <adrian humboldt co uk>");
- MODULE_DESCRIPTION
-     ("I2C-Bus adapter for MPC107 bridge and MPC824x/85xx/52xx processors");
 --- linux-2.6.12/drivers/net/sk98lin/skge.c~	2005-08-01 16:32:42.000000000 -0400
 +++ linux-2.6.12/drivers/net/sk98lin/skge.c	2005-08-01 16:33:10.000000000 -0400
 @@ -5233,8 +5233,10 @@ static struct pci_driver skge_driver = {


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- upstream	1 Aug 2005 19:34:18 -0000	1.117
+++ upstream	2 Aug 2005 06:07:08 -0000	1.118
@@ -1,3 +1,3 @@
 linux-2.6.12.tar.bz2
-patch-2.6.13-rc4.bz2
+patch-2.6.13-rc5.bz2
 patch-2.6.13-rc4-git4.bz2


--- patch-2.6.13-rc4.bz2.sign DELETED ---
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]