rpms/kernel/devel .cvsignore, 1.406, 1.407 kernel-2.6.spec, 1.2132, 1.2133 linux-2.6-compile-fixes.patch, 1.66, 1.67 linux-2.6-debug-pm-pci.patch, 1.1, 1.2 linux-2.6-debug-sysfs-crash-debugging.patch, 1.4, 1.5 linux-2.6-random-patches.patch, 1.5, 1.6 linux-2.6-tux.patch, 1.17, 1.18 sources, 1.348, 1.349 upstream, 1.319, 1.320 patch-2.6.17-rc1-git4.bz2.sign, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Apr 16 22:58:51 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27760
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch
linux-2.6-debug-pm-pci.patch
linux-2.6-debug-sysfs-crash-debugging.patch
linux-2.6-random-patches.patch linux-2.6-tux.patch sources
upstream
Removed Files:
patch-2.6.17-rc1-git4.bz2.sign
Log Message:
git12
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- .cvsignore 14 Apr 2006 18:42:59 -0000 1.406
+++ .cvsignore 16 Apr 2006 22:58:48 -0000 1.407
@@ -2,8 +2,6 @@
temp-*
kernel-2.6.16
linux-2.6.16.tar.bz2
-xen-20060320.tar.bz2
patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git3.bz2
-patch-2.6.17-rc1-git4.bz2
+patch-2.6.17-rc1-git12.bz2
xen-20060413.tar.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2132
retrieving revision 1.2133
diff -u -r1.2132 -r1.2133
--- kernel-2.6.spec 14 Apr 2006 18:11:38 -0000 1.2132
+++ kernel-2.6.spec 16 Apr 2006 22:58:48 -0000 1.2133
@@ -7,7 +7,7 @@
%define buildsmp 0
%define buildpae 0
# Whether to apply the Xen patches, leave this enabled.
-%define includexen 1
+%define includexen 0
# Whether to build the Xen kernels, disable if you want.
%define buildxen 1
%define buildxenPAE 0
@@ -213,7 +213,7 @@
# Patches 0 through 100 are meant for core subsystem upgrades
#
Patch1: patch-2.6.17-rc1.bz2
-Patch2: patch-2.6.17-rc1-git4.bz2
+Patch2: patch-2.6.17-rc1-git12.bz2
# Patches 100 through 500 are meant for architecture patches
Patch100: linux-2.6-bzimage.patch
@@ -1009,7 +1009,7 @@
#
# misc small stuff to make things compile or otherwise improve performance
#
-%patch10000 -p1
+#%patch10000 -p1
# Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
%patch10001 -p1
@@ -1648,6 +1648,9 @@
%endif
%changelog
+* Sun Apr 16 2006 Dave Jones <davej at redhat.com>
+- Big rebase to 2.6.17-rc1-git12
+
* Fri Apr 14 2006 Juan Quintela <quintela at redhat.com>
- Enable xen again.
- Update xen hypervisor to cset 9638.
linux-2.6-compile-fixes.patch:
0 files changed
Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- linux-2.6-compile-fixes.patch 10 Apr 2006 18:41:28 -0000 1.66
+++ linux-2.6-compile-fixes.patch 16 Apr 2006 22:58:48 -0000 1.67
@@ -1,15 +0,0 @@
-
-include/asm/atomic.h:94: warning: implicit declaration of function 'unlikely'
-include/asm/atomic.h:97: warning: implicit declaration of function 'likely'
-
---- linux-2.6.16.noarch/include/asm-s390/atomic.h~ 2006-04-01 00:07:45.000000000 -0500
-+++ linux-2.6.16.noarch/include/asm-s390/atomic.h 2006-04-01 00:08:08.000000000 -0500
-@@ -1,6 +1,8 @@
- #ifndef __ARCH_S390_ATOMIC__
- #define __ARCH_S390_ATOMIC__
-
-+#include <linux/compiler.h>
-+
- /*
- * include/asm-s390/atomic.h
- *
linux-2.6-debug-pm-pci.patch:
pci.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
Index: linux-2.6-debug-pm-pci.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-pm-pci.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-pm-pci.patch 1 Mar 2006 20:51:03 -0000 1.1
+++ linux-2.6-debug-pm-pci.patch 16 Apr 2006 22:58:48 -0000 1.2
@@ -1,6 +1,7 @@
---- linux-2.6.15.noarch/drivers/pci/pci.c~ 2006-03-01 15:41:00.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/pci/pci.c 2006-03-01 15:47:37.000000000 -0500
-@@ -454,9 +454,17 @@ int
+
+--- linux-2.6.16.noarch/drivers/pci/pci.c~ 2006-04-16 17:36:34.000000000 -0500
++++ linux-2.6.16.noarch/drivers/pci/pci.c 2006-04-16 17:37:42.000000000 -0500
+@@ -461,9 +461,17 @@ int
pci_restore_state(struct pci_dev *dev)
{
int i;
@@ -12,11 +13,11 @@
+ pci_read_config_dword(dev, i * 4, &val);
+ if (val != dev->saved_config_space[i]) {
+ printk (KERN_DEBUG "PM: Writing back config space on device %s at offset %x. (Was %x, writing %x)\n",
-+ pci_name(dev), i,
-+ val, (int) dev->saved_config_space[i]);
++ pci_name(dev), i,
++ val, (int) dev->saved_config_space[i]);
+ pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);
+ }
+ }
+ pci_restore_msi_state(dev);
+ pci_restore_msix_state(dev);
return 0;
- }
-
linux-2.6-debug-sysfs-crash-debugging.patch:
devel-akpm/arch/i386/kernel/traps.c | 5 +++++
devel-akpm/fs/sysfs/file.c | 7 +++++++
linux-2.6.14/arch/x86_64/kernel/traps.c | 5 +++++
3 files changed, 17 insertions(+)
Index: linux-2.6-debug-sysfs-crash-debugging.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-sysfs-crash-debugging.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-sysfs-crash-debugging.patch 27 Mar 2006 18:54:19 -0000 1.4
+++ linux-2.6-debug-sysfs-crash-debugging.patch 16 Apr 2006 22:58:48 -0000 1.5
@@ -18,12 +18,11 @@
diff -puN fs/sysfs/file.c~sysfs-crash-debugging fs/sysfs/file.c
--- devel/fs/sysfs/file.c~sysfs-crash-debugging 2005-11-22 22:31:16.000000000 -0800
+++ devel-akpm/fs/sysfs/file.c 2005-11-22 22:31:16.000000000 -0800
-@@ -6,6 +6,8 @@
- #include <linux/fsnotify.h>
+@@ -7,6 +7,7 @@
#include <linux/kobject.h>
#include <linux/namei.h>
+ #include <linux/poll.h>
+#include <linux/limits.h>
-+
#include <asm/uaccess.h>
#include <asm/semaphore.h>
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.15/kernel/power/snapshot.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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-random-patches.patch 3 Apr 2006 04:16:53 -0000 1.5
+++ linux-2.6-random-patches.patch 16 Apr 2006 22:58:48 -0000 1.6
@@ -1,20 +1,4 @@
-Doubletalk printk's an extraneous \n
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/drivers/char/dtlk.c~ 2006-02-01 22:17:38.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/char/dtlk.c 2006-02-01 22:19:16.000000000 -0500
-@@ -490,7 +490,7 @@ for (i = 0; i < 10; i++) \
- release_region(dtlk_portlist[i], DTLK_IO_EXTENT);
- }
-
-- printk(KERN_INFO "\nDoubleTalk PC - not found\n");
-+ printk(KERN_INFO "DoubleTalk PC - not found\n");
- return -ENODEV;
- }
-
-
--- linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c~ 2006-01-31 20:22:02.000000000 -0500
+++ linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c 2006-01-31 20:24:27.000000000 -0500
@@ -2956,7 +2956,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
linux-2.6-tux.patch:
linux-2.6.16.noarch/include/linux/buffer_head.h | 1
linux-2.6.16.noarch/include/linux/sysctl.h | 50
linux-2.6.16.noarch/net/socket.c | 54
linux-tux.q/arch/alpha/kernel/systbls.S | 8
linux-tux.q/arch/i386/kernel/syscall_table.S | 10
linux-tux.q/arch/ia64/kernel/entry.S | 8
linux-tux.q/arch/ia64/kernel/ia64_ksyms.c | 5
linux-tux.q/arch/x86_64/ia32/ia32entry.S | 10
linux-tux.q/fs/dcache.c | 36
linux-tux.q/fs/exec.c | 2
linux-tux.q/fs/fcntl.c | 4
linux-tux.q/fs/namei.c | 18
linux-tux.q/fs/namespace.c | 2
linux-tux.q/fs/open.c | 4
linux-tux.q/fs/pipe.c | 2
linux-tux.q/fs/read_write.c | 2
linux-tux.q/include/asm-alpha/fcntl.h | 1
linux-tux.q/include/asm-generic/fcntl.h | 4
linux-tux.q/include/asm-i386/unistd.h | 5
linux-tux.q/include/asm-ia64/unistd.h | 2
linux-tux.q/include/asm-sparc/fcntl.h | 1
linux-tux.q/include/asm-sparc64/fcntl.h | 1
linux-tux.q/include/asm-x86_64/unistd.h | 10
linux-tux.q/include/linux/dcache.h | 8
linux-tux.q/include/linux/errno.h | 3
linux-tux.q/include/linux/file.h | 2
linux-tux.q/include/linux/fs.h | 7
linux-tux.q/include/linux/kmod.h | 2
linux-tux.q/include/linux/namei.h | 2
linux-tux.q/include/linux/net.h | 1
linux-tux.q/include/linux/sched.h | 5
linux-tux.q/include/linux/skbuff.h | 2
linux-tux.q/include/linux/socket.h | 4
linux-tux.q/include/net/sock.h | 8
linux-tux.q/include/net/tcp.h | 3
linux-tux.q/include/net/tux.h | 804 ++++++++
linux-tux.q/include/net/tux_u.h | 163 +
linux-tux.q/kernel/exit.c | 7
linux-tux.q/kernel/fork.c | 1
linux-tux.q/kernel/kmod.c | 28
linux-tux.q/kernel/signal.c | 1
linux-tux.q/mm/filemap.c | 19
linux-tux.q/mm/truncate.c | 2
linux-tux.q/net/Kconfig | 1
linux-tux.q/net/Makefile | 1
linux-tux.q/net/core/sock.c | 5
linux-tux.q/net/ipv4/tcp.c | 3
linux-tux.q/net/ipv4/tcp_input.c | 1
linux-tux.q/net/ipv4/tcp_output.c | 3
linux-tux.q/net/tux/Kconfig | 25
linux-tux.q/net/tux/Makefile | 12
linux-tux.q/net/tux/abuf.c | 190 ++
linux-tux.q/net/tux/accept.c | 863 +++++++++
linux-tux.q/net/tux/cachemiss.c | 265 ++
linux-tux.q/net/tux/cgi.c | 171 +
linux-tux.q/net/tux/directory.c | 302 +++
linux-tux.q/net/tux/extcgi.c | 329 +++
linux-tux.q/net/tux/gzip.c | 40
linux-tux.q/net/tux/input.c | 641 +++++++
linux-tux.q/net/tux/logger.c | 837 +++++++++
linux-tux.q/net/tux/main.c | 1417 +++++++++++++++
linux-tux.q/net/tux/mod.c | 262 ++
linux-tux.q/net/tux/output.c | 352 +++
linux-tux.q/net/tux/parser.h | 102 +
linux-tux.q/net/tux/postpone.c | 77
linux-tux.q/net/tux/proc.c | 1149 ++++++++++++
linux-tux.q/net/tux/proto_ftp.c | 1555 ++++++++++++++++
linux-tux.q/net/tux/proto_http.c | 2197 ++++++++++++++++++++++++
linux-tux.q/net/tux/redirect.c | 172 +
linux-tux.q/net/tux/times.c | 392 ++++
linux-tux.q/net/tux/times.h | 26
linux-tux.q/net/tux/userspace.c | 27
72 files changed, 12697 insertions(+), 32 deletions(-)
Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-tux.patch 1 Apr 2006 02:07:22 -0000 1.17
+++ linux-2.6-tux.patch 16 Apr 2006 22:58:48 -0000 1.18
@@ -532,9 +532,9 @@
struct file_ra_state *, struct file *,
- loff_t *, read_descriptor_t *, read_actor_t);
+ loff_t *, read_descriptor_t *, read_actor_t, int);
- extern ssize_t generic_file_splice_read(struct file *, struct inode *, size_t, unsigned int);
- extern ssize_t generic_file_splice_write(struct inode *, struct file *, size_t, unsigned int);
- extern void
+
+ /* fs/splice.c */
+ extern ssize_t generic_file_splice_read(struct file *, loff_t *,
@@ -1607,14 +1607,15 @@ static inline int xip_truncate_page(stru
static inline void do_generic_file_read(struct file * filp, loff_t *ppos,
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- sources 14 Apr 2006 18:42:59 -0000 1.348
+++ sources 16 Apr 2006 22:58:48 -0000 1.349
@@ -1,5 +1,4 @@
9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2
ee1b5bf019ec60a34ef7bf1b2a0c1291 patch-2.6.17-rc1.bz2
-33a1f95f8b4dbad15a69b2628cf16d09 patch-2.6.17-rc1-git3.bz2
-8ae04240509d86bf520010c497f359e2 patch-2.6.17-rc1-git4.bz2
e8e055329db3aad40a010ded0f8bdcf9 xen-20060413.tar.bz2
+a116af6c1723ef2a7b5aff5b380fcd35 patch-2.6.17-rc1-git12.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- upstream 11 Apr 2006 13:01:42 -0000 1.319
+++ upstream 16 Apr 2006 22:58:48 -0000 1.320
@@ -1,3 +1,3 @@
linux-2.6.16.tar.bz2
patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git4.bz2
+patch-2.6.17-rc1-git12.bz2
--- patch-2.6.17-rc1-git4.bz2.sign DELETED ---
More information about the fedora-cvs-commits
mailing list