rpms/kernel/devel patch-2.6.13-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.214, 1.215 kernel-2.6.spec, 1.1530, 1.1531 linux-2.6-build-userspace-headers-warning.patch, 1.2, 1.3 linux-2.6-tux.patch, 1.5, 1.6 sources, 1.157, 1.158 upstream, 1.145, 1.146 patch-2.6.13-git2.bz2.sign, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 2 19:28:07 UTC 2005
- Previous message (by thread): rpms/kernel/devel/configs config-generic, 1.50, 1.51 config-ia64-generic, 1.11, 1.12 config-x86-generic, 1.13, 1.14 config-x86_64-generic, 1.15, 1.16
- Next message (by thread): rpms/kernel/devel linux-2.6.9-ieee80211.patch, 1.13, NONE linux-2.6.9-ipw2100.patch, 1.8, NONE linux-2.6.9-ipw2200.patch, 1.6, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27640
Modified Files:
.cvsignore kernel-2.6.spec
linux-2.6-build-userspace-headers-warning.patch
linux-2.6-tux.patch sources upstream
Added Files:
patch-2.6.13-git3.bz2.sign
Removed Files:
patch-2.6.13-git2.bz2.sign
Log Message:
Coming soon to theatres near you..
git3 -- The rebase from hell.
--- NEW FILE patch-2.6.13-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBDGCwPyGugalF9Dw4RAkq2AJ9nj75oEhChSn2xdwRCMo77WGSWQACeMKb0
YgCmr1Psz/6kXf12qQOyqTQ=
=qOph
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- .cvsignore 31 Aug 2005 18:17:29 -0000 1.214
+++ .cvsignore 2 Sep 2005 19:28:04 -0000 1.215
@@ -8,3 +8,4 @@
linux-2.6.13.tar.bz2
patch-2.6.13-git2.bz2
patch-2.6.13-rc7-git3.bz2
+patch-2.6.13-git3.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1530
retrieving revision 1.1531
diff -u -r1.1530 -r1.1531
--- kernel-2.6.spec 31 Aug 2005 18:05:25 -0000 1.1530
+++ kernel-2.6.spec 2 Sep 2005 19:28:04 -0000 1.1531
@@ -12,7 +12,7 @@
%if %{FC3}
%define includexen 0
%else
-%define includexen 1
+%define includexen 0
%endif
%define builddoc 0
@@ -214,7 +214,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.13-git2.bz2
+Patch1: patch-2.6.13-git3.bz2
Patch2: patch-2.6.13-rc7-git3.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -331,7 +331,7 @@
Patch1660: linux-2.6.9-module_version.patch
Patch1710: linux-2.6.11-parport-sysctl-perms.patch
-Patch1720: linux-2.6.11-libata-promise-pata-on-sata.patch
+#Patch1720: linux-2.6.11-libata-promise-pata-on-sata.patch
Patch1730: linux-2.6.12-input-kill-stupid-messages.patch
Patch1731: linux-2.6-input-usblegacy.patch
Patch1740: linux-2.6-modules-ignore-whitespace.patch
@@ -354,14 +354,6 @@
Patch2000: linux-2.6.9-vm-oomkiller-debugging.patch
Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
-#
-# External drivers that are about to get accepted upstream
-#
-
-# Intel Centrino wireless drivers.
-Patch3000: linux-2.6.9-ipw2100.patch
-Patch3001: linux-2.6.9-ipw2200.patch
-Patch3002: linux-2.6.9-ieee80211.patch
#
# 10000 to 20000 is for stuff that has to come last due to the
@@ -629,7 +621,7 @@
%patch905 -p1
# Tux
-%patch910 -p1
+#%patch910 -p1
#
# Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -741,7 +733,7 @@
# Fix up some permissions in /proc
%patch1710 -p1
# Support PATA on Promise SATA.
-%patch1720 -p1
+#%patch1720 -p1
# The input layer spews crap no-one cares about.
%patch1730 -p1
# usb legacy workaround.
@@ -775,15 +767,6 @@
#
-# External drivers that are about to get accepted upstream
-#
-
-# Intel wireless
-%patch3000 -p1
-%patch3001 -p1
-%patch3002 -p1
-
-#
# Patches 5000 to 6000 are reserved for new drivers that are about to
# be merged upstream
#
@@ -1220,6 +1203,12 @@
%endif
%changelog
+* Fri Sep 02 2005 Dave Jones <davej at redhat.com>
+- 2.6.13-git3.
+ (For real this time, the last two builds didn't really rebase).
+ - Tux & Xen currently disabled.
+ - ipw2100/ipw2200 drivers are now upstream.
+
* Wed Aug 31 2005 Dave Jones <davej at redhat.com>
- 2.6.13-git2
linux-2.6-build-userspace-headers-warning.patch:
linux-10000/include/linux/config.h | 4 +++-
linux-10001/include/linux/config.h | 2 +-
linux-2.6.13/arch/ppc64/boot/main.c | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
Index: linux-2.6-build-userspace-headers-warning.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-userspace-headers-warning.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-build-userspace-headers-warning.patch 18 Aug 2005 19:09:44 -0000 1.2
+++ linux-2.6-build-userspace-headers-warning.patch 2 Sep 2005 19:28:04 -0000 1.3
@@ -22,18 +22,17 @@
make[1]: *** [arch/ppc64/boot/main.o] Error 1
make[1]: *** Waiting for unfinished jobs....
-
-diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc64/boot/main.c linux-10001/arch/ppc64/boot/main.c
---- linux-10000/arch/ppc64/boot/main.c
-+++ linux-10001/arch/ppc64/boot/main.c
-@@ -8,6 +8,7 @@
+--- linux-2.6.13/arch/ppc64/boot/main.c~ 2005-09-02 14:20:40.000000000 -0400
++++ linux-2.6.13/arch/ppc64/boot/main.c 2005-09-02 14:23:23.000000000 -0400
+@@ -8,6 +8,8 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
-+#define __KERNGLUE__
- #include "ppc32-types.h"
- #include "zlib.h"
- #include <linux/elf.h>
++#define __KERNGLUE_
++
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include "elf.h"
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/include/linux/config.h linux-10001/include/linux/config.h
--- linux-10000/include/linux/config.h
+++ linux-10001/include/linux/config.h
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 | 7
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, 12736 insertions(+), 71 deletions(-)
Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-tux.patch 5 Aug 2005 19:52:59 -0000 1.5
+++ linux-2.6-tux.patch 2 Sep 2005 19:28:04 -0000 1.6
@@ -2088,15 +2088,15 @@
===================================================================
--- 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
+@@ -216,6 +216,7 @@ source "net/ax25/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "net/bluetooth/Kconfig"
+ source "net/ieee80211/Kconfig"
+source "net/tux/Kconfig"
endif # if NET
endmenu # Networking
-
Index: linux/net/Makefile
===================================================================
--- linux.orig/net/Makefile
@@ -2122,10 +2122,10 @@
{
struct tcp_sock *tp = tcp_sk(sk);
int time_to_ack = 0;
-@@ -2381,3 +2381,4 @@ EXPORT_SYMBOL(tcp_setsockopt);
+@@ -2141,3 +2141,4 @@ EXPORT_SYMBOL(tcp_sendpage);
+ EXPORT_SYMBOL(tcp_setsockopt);
EXPORT_SYMBOL(tcp_shutdown);
EXPORT_SYMBOL(tcp_statistics);
- EXPORT_SYMBOL(tcp_timewait_cachep);
+EXPORT_SYMBOL_GPL(cleanup_rbuf);
Index: linux/net/ipv4/tcp_input.c
===================================================================
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- sources 31 Aug 2005 18:17:29 -0000 1.157
+++ sources 2 Sep 2005 19:28:04 -0000 1.158
@@ -1,3 +1,2 @@
560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2
-4059d198768f9f8dc9372dc1c54bc3c3 patch-2.6.13-git2.bz2
-75091f9429baa19402349828ee757e65 patch-2.6.13-rc7-git3.bz2
+ef11133d8270421df20cd3b27d0cacec patch-2.6.13-git3.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- upstream 31 Aug 2005 18:05:25 -0000 1.145
+++ upstream 2 Sep 2005 19:28:04 -0000 1.146
@@ -1,2 +1,2 @@
linux-2.6.13.tar.bz2
-patch-2.6.13-git2.bz2
+patch-2.6.13-git3.bz2
--- patch-2.6.13-git2.bz2.sign DELETED ---
- Previous message (by thread): rpms/kernel/devel/configs config-generic, 1.50, 1.51 config-ia64-generic, 1.11, 1.12 config-x86-generic, 1.13, 1.14 config-x86_64-generic, 1.15, 1.16
- Next message (by thread): rpms/kernel/devel linux-2.6.9-ieee80211.patch, 1.13, NONE linux-2.6.9-ipw2100.patch, 1.8, NONE linux-2.6.9-ipw2200.patch, 1.6, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list