rpms/kernel/devel patch-2.6.13-rc2-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.173, 1.174 kernel-2.6.spec, 1.1425, 1.1426 linux-2.6-compile-fixes.patch, 1.7, 1.8 linux-2.6.7-modsign-crypto.patch, 1.4, 1.5 sources, 1.144, 1.145 upstream, 1.103, 1.104 patch-2.6.13-rc2-git2.bz2.sign, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sun Jul 10 20:21:36 UTC 2005


Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6.7-modsign-crypto.patch sources upstream 
Added Files:
	patch-2.6.13-rc2-git3.bz2.sign 
Removed Files:
	patch-2.6.13-rc2-git2.bz2.sign 
Log Message:
git3



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

iD8DBQBC0S/PyGugalF9Dw4RApKeAJ9SFB977mwNVifnjDkdeSW+HO30pwCeOt07
Pg+Ro9/ZYsXDxA2ZquShJcM=
=ZE6z
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- .cvsignore	8 Jul 2005 22:08:59 -0000	1.173
+++ .cvsignore	10 Jul 2005 20:21:32 -0000	1.174
@@ -7,4 +7,4 @@
 kernel-2.6.12
 linux-2.6.12.tar.bz2
 patch-2.6.13-rc2.bz2
-patch-2.6.13-rc2-git2.bz2
+patch-2.6.13-rc2-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1425
retrieving revision 1.1426
diff -u -r1.1425 -r1.1426
--- kernel-2.6.spec	8 Jul 2005 22:08:59 -0000	1.1425
+++ kernel-2.6.spec	10 Jul 2005 20:21:32 -0000	1.1426
@@ -222,7 +222,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.13-rc2.bz2
-Patch2: patch-2.6.13-rc2-git2.bz2
+Patch2: patch-2.6.13-rc2-git3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1250,6 +1250,9 @@
 %endif
 
 %changelog
+* Sun Jul 10 2005 Dave Jones <davej at redhat.com>
+- 2.6.13-rc2-git3
+
 * Fri Jul 08 2005 Dave Jones <davej at redhat.com>
 - 2.6.13-rc2-git2
 

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/skge.c              |    2 +-
 linux-2.6.12/drivers/scsi/aacraid/commctrl.c |    2 +-
 42 files changed, 68 insertions(+), 47 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-compile-fixes.patch	6 Jul 2005 19:27:01 -0000	1.7
+++ linux-2.6-compile-fixes.patch	10 Jul 2005 20:21:32 -0000	1.8
@@ -556,63 +556,6 @@
  	if (!user_srbcmd) {
  		dprintk((KERN_DEBUG"aacraid: Could not make a copy of the srb\n"));
  		rcode = -ENOMEM;
---- linux-2.6.12/include/asm-i386/mmzone.h~	2005-07-01 17:59:22.000000000 -0400
-+++ linux-2.6.12/include/asm-i386/mmzone.h	2005-07-01 18:01:44.000000000 -0400
-@@ -8,20 +8,15 @@
- 
- #include <asm/smp.h>
- 
--#if CONFIG_NUMA
-+#ifdef CONFIG_NUMA
- extern struct pglist_data *node_data[];
- #define NODE_DATA(nid)	(node_data[nid])
- 
--#ifdef CONFIG_NUMA
--	#ifdef CONFIG_X86_NUMAQ
--		#include <asm/numaq.h>
--	#else	/* summit or generic arch */
--		#include <asm/srat.h>
--	#endif
--#else /* !CONFIG_NUMA */
--	#define get_memcfg_numa get_memcfg_numa_flat
--	#define get_zholes_size(n) (0)
--#endif /* CONFIG_NUMA */
-+#ifdef CONFIG_X86_NUMAQ
-+	#include <asm/numaq.h>
-+#else	/* summit or generic arch */
-+	#include <asm/srat.h>
-+#endif
- 
- extern int get_memcfg_numa_flat(void );
- /*
-@@ -42,6 +37,9 @@ static inline void get_memcfg_numa(void)
- 	get_memcfg_numa_flat();
- }
- 
-+#else /* !CONFIG_NUMA */
-+#define get_memcfg_numa get_memcfg_numa_flat
-+#define get_zholes_size(n) (0)
- #endif /* CONFIG_NUMA */
- 
- #ifdef CONFIG_DISCONTIGMEM
---- linux-2.6.12/include/asm-i386/mmzone.h~	2005-07-01 18:30:14.000000000 -0400
-+++ linux-2.6.12/include/asm-i386/mmzone.h	2005-07-01 18:30:30.000000000 -0400
-@@ -37,6 +37,8 @@ static inline void get_memcfg_numa(void)
- 	get_memcfg_numa_flat();
- }
- 
-+extern int early_pfn_to_nid(unsigned long pfn);
-+
- #else /* !CONFIG_NUMA */
- #define get_memcfg_numa get_memcfg_numa_flat
- #define get_zholes_size(n) (0)
-@@ -149,6 +151,4 @@ static inline int pfn_valid(int pfn)
- 
- #endif /* CONFIG_NEED_MULTIPLE_NODES */
- 
--extern int early_pfn_to_nid(unsigned long pfn);
--
- #endif /* _ASM_MMZONE_H_ */
 --- linux-2.6.12/drivers/net/skge.c~	2005-07-01 18:46:54.000000000 -0400
 +++ linux-2.6.12/drivers/net/skge.c	2005-07-01 18:47:34.000000000 -0400
 @@ -3148,7 +3148,7 @@ static int __devinit skge_probe(struct p
@@ -624,25 +567,3 @@
  		pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
  	}
  #endif
---- linux-2.6.12/sound/pci/bt87x.c~	2005-07-06 14:28:58.000000000 -0400
-+++ linux-2.6.12/sound/pci/bt87x.c	2005-07-06 14:30:03.000000000 -0400
-@@ -798,6 +798,8 @@ static struct {
- 	{0x270f, 0xfc00}, /* Chaintech Digitop DST-1000 DVB-S */
- };
- 
-+static struct pci_driver driver;
-+
- /* return the rate of the card, or a negative value if it's blacklisted */
- static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
- {
---- linux-2.6.12/sound/pci/bt87x.c~	2005-07-06 14:59:08.000000000 -0400
-+++ linux-2.6.12/sound/pci/bt87x.c	2005-07-06 15:26:35.000000000 -0400
-@@ -806,7 +806,7 @@ static int __devinit snd_bt87x_detect_ca
- 	int i;
- 	const struct pci_device_id *supported;
- 
--	supported = pci_match_device(driver, pci);
-+	supported = pci_match_device(&driver, pci);
- 	if (supported)
- 		return supported->driver_data;
- 

linux-2.6.7-modsign-crypto.patch:
 crypto/Kconfig         |   19 +++++++++++++++++++
 crypto/Makefile        |    3 +++
 crypto/api.c           |   16 ++++++++++++++--
 include/linux/crypto.h |    4 ++++
 4 files changed, 40 insertions(+), 2 deletions(-)

Index: linux-2.6.7-modsign-crypto.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.7-modsign-crypto.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6.7-modsign-crypto.patch	22 Mar 2005 07:00:21 -0000	1.4
+++ linux-2.6.7-modsign-crypto.patch	10 Jul 2005 20:21:32 -0000	1.5
@@ -11,6 +11,7 @@
  {
  	struct crypto_tfm *tfm = NULL;
  	struct crypto_alg *alg;
+ 	unsigned int tfm_size;
  
 -	alg = crypto_alg_mod_lookup(name);
 +	if (!nomodload) {
@@ -22,7 +23,6 @@
 +
  	if (alg == NULL)
  		goto out;
- 	
 @@ -153,6 +160,11 @@ out:
  	return tfm;
  }


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources	6 Jul 2005 18:11:28 -0000	1.144
+++ sources	10 Jul 2005 20:21:33 -0000	1.145
@@ -1,2 +1,3 @@
 c5d2a1b62e1dad502c871bba267337d5  linux-2.6.12.tar.bz2
 98ad9cf1657c69c87af2883c1ec04f35  patch-2.6.13-rc2.bz2
+752a41245ad3eb07b249f66179d04b2b  patch-2.6.13-rc2-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- upstream	8 Jul 2005 22:08:59 -0000	1.103
+++ upstream	10 Jul 2005 20:21:33 -0000	1.104
@@ -1,3 +1,3 @@
 linux-2.6.12.tar.bz2
 patch-2.6.13-rc2.bz2
-patch-2.6.13-rc2-git2.bz2
+patch-2.6.13-rc2-git3.bz2


--- patch-2.6.13-rc2-git2.bz2.sign DELETED ---




More information about the fedora-cvs-commits mailing list