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

rpms/kernel/devel .cvsignore, 1.175, 1.176 kernel-2.6.spec, 1.1431, 1.1432 linux-2.6-compile-fixes.patch, 1.8, 1.9 linux-2.6-tux.patch, 1.1, 1.2 sources, 1.145, 1.146 upstream, 1.105, 1.106



Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-tux.patch sources upstream 
Log Message:
rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- .cvsignore	12 Jul 2005 21:22:06 -0000	1.175
+++ .cvsignore	13 Jul 2005 06:16:42 -0000	1.176
@@ -9,3 +9,4 @@
 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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1431
retrieving revision 1.1432
diff -u -r1.1431 -r1.1432
--- kernel-2.6.spec	12 Jul 2005 21:34:07 -0000	1.1431
+++ kernel-2.6.spec	13 Jul 2005 06:16:42 -0000	1.1432
@@ -221,7 +221,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.13-rc2.bz2
+Patch1: patch-2.6.13-rc3.bz2
 Patch2: patch-2.6.13-rc2-git5.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
+* Wed Jul 13 2005 Dave Jones <davej redhat com>
+- 2.6.13-rc3
+
 * Tue Jul 12 2005 Dave Jones <davej redhat com>
 - 2.6.13-rc2-git5
 - Fix IDE locking bug de jour.

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 +-
 41 files changed, 67 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-compile-fixes.patch	10 Jul 2005 20:21:32 -0000	1.8
+++ linux-2.6-compile-fixes.patch	13 Jul 2005 06:16:42 -0000	1.9
@@ -545,17 +545,6 @@
  #include "agp.h"
  
  #ifndef log2
---- linux-2.6.12/drivers/scsi/aacraid/commctrl.c~	2005-06-20 20:43:12.000000000 -0400
-+++ linux-2.6.12/drivers/scsi/aacraid/commctrl.c	2005-06-20 20:43:25.000000000 -0400
-@@ -469,7 +469,7 @@ static int aac_send_raw_srb(struct aac_d
- 		goto cleanup;
- 	}
- 
--	user_srbcmd = kmalloc(GFP_KERNEL, fibsize);
-+	user_srbcmd = kmalloc(fibsize, GFP_KERNEL);
- 	if (!user_srbcmd) {
- 		dprintk((KERN_DEBUG"aacraid: Could not make a copy of the srb\n"));
- 		rcode = -ENOMEM;
 --- 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

linux-2.6-tux.patch:
 linux-2.6.12/arch/ia64/kernel/ia64_ksyms.c |    4 
 linux-2.6.12/net/Kconfig                   |    1 
 linux/arch/alpha/kernel/systbls.S          |    8 
 linux/arch/i386/kernel/syscall_table.S     |   10 
 linux/arch/ia64/kernel/entry.S             |    8 
 linux/arch/ppc64/kernel/misc.S             |   20 
 linux/arch/x86_64/ia32/ia32entry.S         |   10 
 linux/fs/dcache.c                          |   36 
 linux/fs/exec.c                            |    2 
 linux/fs/fcntl.c                           |    4 
 linux/fs/namei.c                           |   18 
 linux/fs/namespace.c                       |    2 
 linux/fs/open.c                            |    4 
 linux/fs/pipe.c                            |    2 
 linux/fs/read_write.c                      |    2 
 linux/include/asm-alpha/fcntl.h            |    1 
 linux/include/asm-i386/fcntl.h             |    1 
 linux/include/asm-i386/unistd.h            |    5 
 linux/include/asm-ia64/fcntl.h             |    1 
 linux/include/asm-ia64/unistd.h            |    2 
 linux/include/asm-ppc/fcntl.h              |    1 
 linux/include/asm-ppc64/fcntl.h            |    1 
 linux/include/asm-s390/fcntl.h             |    1 
 linux/include/asm-sparc/fcntl.h            |    1 
 linux/include/asm-sparc64/fcntl.h          |    1 
 linux/include/asm-x86_64/fcntl.h           |    1 
 linux/include/asm-x86_64/unistd.h          |   10 
 linux/include/linux/buffer_head.h          |    1 
 linux/include/linux/dcache.h               |    8 
 linux/include/linux/errno.h                |    3 
 linux/include/linux/file.h                 |    2 
 linux/include/linux/fs.h                   |    7 
 linux/include/linux/kmod.h                 |    2 
 linux/include/linux/namei.h                |    2 
 linux/include/linux/net.h                  |    1 
 linux/include/linux/sched.h                |    5 
 linux/include/linux/skbuff.h               |    2 
 linux/include/linux/socket.h               |    5 
 linux/include/linux/sysctl.h               |   50 
 linux/include/net/sock.h                   |    6 
 linux/include/net/tcp.h                    |    3 
 linux/include/net/tux.h                    |  802 ++++++++++
 linux/include/net/tux_u.h                  |  163 ++
 linux/kernel/exit.c                        |   10 
 linux/kernel/fork.c                        |    1 
 linux/kernel/kmod.c                        |   30 
 linux/kernel/signal.c                      |    1 
 linux/mm/filemap.c                         |   19 
 linux/mm/truncate.c                        |    2 
 linux/net/Makefile                         |    1 
 linux/net/ipv4/tcp.c                       |    3 
 linux/net/ipv4/tcp_input.c                 |    1 
 linux/net/ipv4/tcp_ipv4.c                  |    5 
 linux/net/ipv4/tcp_minisocks.c             |    3 
 linux/net/ipv4/tcp_output.c                |    5 
 linux/net/socket.c                         |  137 +
 linux/net/tux/Kconfig                      |   25 
 linux/net/tux/Makefile                     |   12 
 linux/net/tux/abuf.c                       |  190 ++
 linux/net/tux/accept.c                     |  859 +++++++++++
 linux/net/tux/cachemiss.c                  |  265 +++
 linux/net/tux/cgi.c                        |  160 ++
 linux/net/tux/directory.c                  |  302 +++
 linux/net/tux/extcgi.c                     |  329 ++++
 linux/net/tux/gzip.c                       |   40 
 linux/net/tux/input.c                      |  640 ++++++++
 linux/net/tux/logger.c                     |  836 +++++++++++
 linux/net/tux/main.c                       | 1413 ++++++++++++++++++
 linux/net/tux/mod.c                        |  262 +++
 linux/net/tux/output.c                     |  352 ++++
 linux/net/tux/parser.h                     |  102 +
 linux/net/tux/postpone.c                   |   77 +
 linux/net/tux/proc.c                       | 1149 +++++++++++++++
 linux/net/tux/proto_ftp.c                  | 1549 ++++++++++++++++++++
 linux/net/tux/proto_http.c                 | 2197 +++++++++++++++++++++++++++++
 linux/net/tux/redirect.c                   |  167 ++
 linux/net/tux/times.c                      |  392 +++++
 linux/net/tux/times.h                      |   26 
 linux/net/tux/userspace.c                  |   27 
 79 files changed, 12736 insertions(+), 72 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-tux.patch	12 Jul 2005 21:34:07 -0000	1.1
+++ linux-2.6-tux.patch	13 Jul 2005 06:16:42 -0000	1.2
@@ -2089,17 +2089,17 @@
  	return invalidate_mapping_pages(mapping, 0, ~0UL);
 Index: linux/net/Kconfig
 ===================================================================
---- linux.orig/net/Kconfig
-+++ linux/net/Kconfig
-@@ -640,6 +640,8 @@ source "net/irda/Kconfig"
- 
+--- linux-2.6.12/net/Kconfig~	2005-07-13 02:03:04.000000000 -0400
++++ linux-2.6.12/net/Kconfig	2005-07-13 02:03:10.000000000 -0400
+@@ -228,6 +228,7 @@ config NET_POLL_CONTROLLER
+ source "net/ax25/Kconfig"
+ source "net/irda/Kconfig"
  source "net/bluetooth/Kconfig"
- 
 +source "net/tux/Kconfig"
-+
- source "drivers/net/Kconfig"
  
- endmenu
+ endif   # if NET
+ endmenu # Networking
+
 Index: linux/net/Makefile
 ===================================================================
 --- linux.orig/net/Makefile


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- sources	10 Jul 2005 20:21:33 -0000	1.145
+++ sources	13 Jul 2005 06:16:42 -0000	1.146
@@ -1,3 +1,4 @@
 c5d2a1b62e1dad502c871bba267337d5  linux-2.6.12.tar.bz2
 98ad9cf1657c69c87af2883c1ec04f35  patch-2.6.13-rc2.bz2
 752a41245ad3eb07b249f66179d04b2b  patch-2.6.13-rc2-git3.bz2
+72bc8a76ca38624c853e4ee7fe78dfe6  patch-2.6.13-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- upstream	12 Jul 2005 21:22:06 -0000	1.105
+++ upstream	13 Jul 2005 06:16:42 -0000	1.106
@@ -1,3 +1,3 @@
 linux-2.6.12.tar.bz2
-patch-2.6.13-rc2.bz2
+patch-2.6.13-rc3.bz2
 patch-2.6.13-rc2-git5.bz2


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