rpms/kernel/devel kernel-2.6.spec, 1.1432, 1.1433 linux-2.6-tux.patch, 1.3, 1.4 upstream, 1.106, 1.107
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 14 22:21:13 UTC 2005
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv476
Modified Files:
kernel-2.6.spec linux-2.6-tux.patch upstream
Log Message:
git1
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1432
retrieving revision 1.1433
diff -u -r1.1432 -r1.1433
--- kernel-2.6.spec 13 Jul 2005 06:16:42 -0000 1.1432
+++ kernel-2.6.spec 14 Jul 2005 22:21:09 -0000 1.1433
@@ -222,7 +222,7 @@
# Patches 0 through 100 are meant for core subsystem upgrades
#
Patch1: patch-2.6.13-rc3.bz2
-Patch2: patch-2.6.13-rc2-git5.bz2
+Patch2: patch-2.6.13-rc3-git1.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
+* Thu Jul 14 2005 Dave Jones <davej at redhat.com>
+- 2.6.13-rc3-git1
+
* Wed Jul 13 2005 Dave Jones <davej at redhat.com>
- 2.6.13-rc3
linux-2.6-tux.patch:
linux-2.6.12/arch/ia64/kernel/ia64_ksyms.c | 5
linux-2.6.12/net/Kconfig | 1
linux-2.6.12/net/ipv4/tcp_output.c | 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
80 files changed, 12738 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-tux.patch 13 Jul 2005 07:05:56 -0000 1.3
+++ linux-2.6-tux.patch 14 Jul 2005 22:21:09 -0000 1.4
@@ -13895,3 +13895,13 @@
+ *
+ ****************************************************************/
+
+--- linux-2.6.12/net/ipv4/tcp_output.c~ 2005-07-14 18:20:31.000000000 -0400
++++ linux-2.6.12/net/ipv4/tcp_output.c 2005-07-14 18:20:45.000000000 -0400
+@@ -1067,6 +1067,7 @@ void __tcp_push_pending_frames(struct so
+ tcp_check_probe_timer(sk, tp);
+ }
+ }
++EXPORT_SYMBOL_GPL(__tcp_push_pending_frames);
+
+ /* Send _single_ skb sitting at the send head. This function requires
+ * true push pending frames to setup probe timer etc.
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- upstream 13 Jul 2005 06:16:42 -0000 1.106
+++ upstream 14 Jul 2005 22:21:09 -0000 1.107
@@ -1,3 +1,3 @@
linux-2.6.12.tar.bz2
patch-2.6.13-rc3.bz2
-patch-2.6.13-rc2-git5.bz2
+patch-2.6.13-rc3-git1.bz2
More information about the fedora-cvs-commits
mailing list