rpms/kernel/devel patch-2.6.13-rc7.bz2.sign, NONE, 1.1 .cvsignore, 1.205, 1.206 kernel-2.6.spec, 1.1507, 1.1508 linux-2.6-compile-fixes.patch, 1.26, 1.27 linux-2.6.9-module_version.patch, 1.15, 1.16 sources, 1.149, 1.150 upstream, 1.138, 1.139

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Aug 24 18:33:15 UTC 2005 

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6.9-module_version.patch sources upstream 
Added Files:
	patch-2.6.13-rc7.bz2.sign 
Log Message:
rc7



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

iD8DBQBDC/HFyGugalF9Dw4RArRHAJ9DI/S+6Z8GigfG193xW4fnW+OscgCglYtt
XR/RwlxN8bYkIrqEoS+rnVs=
=dETY
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- .cvsignore	22 Aug 2005 20:11:51 -0000	1.205
+++ .cvsignore	24 Aug 2005 18:32:58 -0000	1.206
@@ -6,5 +6,4 @@
 temp-*
 kernel-2.6.12
 linux-2.6.12.tar.bz2
-patch-2.6.13-rc6.bz2
-patch-2.6.13-rc6-git13.bz2
+patch-2.6.13-rc7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1507
retrieving revision 1.1508
diff -u -r1.1507 -r1.1508
--- kernel-2.6.spec	24 Aug 2005 04:00:08 -0000	1.1507
+++ kernel-2.6.spec	24 Aug 2005 18:32:58 -0000	1.1508
@@ -214,7 +214,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.13-rc6.bz2
+Patch1: patch-2.6.13-rc7.bz2
 Patch2: patch-2.6.13-rc6-git13.bz2
 
 # Patches 100 through 500 are meant for architecture patches
@@ -536,7 +536,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1210,6 +1210,9 @@
 %endif
 
 %changelog
+* Tue Aug 23 2005 Dave Jones <davej at redhat.com>
+- 2.6.13-rc7
+
 * Tue Aug 23 2005 Rik van Riel <riel at redhat.com>
 - upgrade to latest upstream Xen snapshot
 

linux-2.6-compile-fixes.patch:
 setup.c |    1 +
 1 files changed, 1 insertion(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- linux-2.6-compile-fixes.patch	22 Aug 2005 20:36:14 -0000	1.26
+++ linux-2.6-compile-fixes.patch	24 Aug 2005 18:32:59 -0000	1.27
@@ -11,36 +11,3 @@
  void machine_halt(void)
  {
 
-
-{standard input}: Assembler messages:
-{standard input}:397: Error: symbol `.Litfits' is already defined
-{standard input}:585: Error: symbol `.Litfits' is already defined
-
-Newer gcc's inline this it seems, which blows up.
-
---- linux-2.6.12/arch/s390/kernel/cpcmd.c~	2005-08-18 15:12:51.000000000 -0400
-+++ linux-2.6.12/arch/s390/kernel/cpcmd.c	2005-08-18 15:13:35.000000000 -0400
-@@ -46,9 +46,9 @@ int  __cpcmd(const char *cmd, char *resp
- 				"lra	3,0(%4)\n"
- 				"lr	5,%5\n"
- 				"diag	2,4,0x8\n"
--				"brc	8, .Litfits\n"
-+				"brc	8, .Litfits%=\n"
- 				"ar	5, %5\n"
--				".Litfits: \n"
-+				".Litfits%=: \n"
- 				"lr	%0,4\n"
- 				"lr	%1,5\n"
- 				: "=d" (return_code), "=d" (return_len)
-@@ -64,9 +64,9 @@ int  __cpcmd(const char *cmd, char *resp
- 				"sam31\n"
- 				"diag	2,4,0x8\n"
- 				"sam64\n"
--				"brc	8, .Litfits\n"
-+				"brc	8, .Litfits%=\n"
- 				"agr	5, %5\n"
--				".Litfits: \n"
-+				".Litfits%=: \n"
- 				"lgr	%0,4\n"
- 				"lgr	%1,5\n"
- 				: "=d" (return_code), "=d" (return_len)

linux-2.6.9-module_version.patch:
 linux-1720/drivers/block/DAC960.c           |    1 +
 linux-1720/drivers/block/cpqarray.c         |    1 +
 linux-1720/drivers/message/fusion/mptbase.c |    1 +
 linux-1720/drivers/net/b44.c                |    1 +
 linux-1720/drivers/net/ns83820.c            |    1 +
 linux-1720/drivers/net/tg3.c                |    1 +
 linux-1720/drivers/scsi/gdth.c              |    1 +
 linux-2.6.12/drivers/block/cciss.c          |    1 +
 8 files changed, 8 insertions(+)

Index: linux-2.6.9-module_version.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-module_version.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6.9-module_version.patch	28 Jun 2005 17:15:28 -0000	1.15
+++ linux-2.6.9-module_version.patch	24 Aug 2005 18:32:59 -0000	1.16
@@ -71,17 +71,6 @@
  
  static struct pci_device_id tg3_pci_tbl[] = {
  	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5700,
-diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/scsi/ahci.c linux-1720/drivers/scsi/ahci.c
---- linux-1700/drivers/scsi/ahci.c
-+++ linux-1720/drivers/scsi/ahci.c
-@@ -1062,6 +1062,7 @@ MODULE_AUTHOR("Jeff Garzik");
- MODULE_DESCRIPTION("AHCI SATA low-level driver");
- MODULE_LICENSE("GPL");
- MODULE_DEVICE_TABLE(pci, ahci_pci_tbl);
-+MODULE_VERSION(DRV_VERSION);
- 
- module_init(ahci_init);
- module_exit(ahci_exit);
 diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/scsi/gdth.c linux-1720/drivers/scsi/gdth.c
 --- linux-1700/drivers/scsi/gdth.c
 +++ linux-1720/drivers/scsi/gdth.c


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- sources	22 Aug 2005 20:11:51 -0000	1.149
+++ sources	24 Aug 2005 18:32:59 -0000	1.150
@@ -1,3 +1,2 @@
 c5d2a1b62e1dad502c871bba267337d5  linux-2.6.12.tar.bz2
-f6d3d54ff3af976e5e85a49d840e33be  patch-2.6.13-rc6.bz2
-5f569e943f464504e14744f9e98d12b1  patch-2.6.13-rc6-git13.bz2
+abc48891a152e7feefa69b0db835a024  patch-2.6.13-rc7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- upstream	23 Aug 2005 15:55:34 -0000	1.138
+++ upstream	24 Aug 2005 18:33:00 -0000	1.139
@@ -1,3 +1,3 @@
 linux-2.6.12.tar.bz2
-patch-2.6.13-rc6.bz2
+patch-2.6.13-rc7.bz2
 patch-2.6.13-rc6-git13.bz2

More information about the fedora-cvs-commits mailing list