rpms/kernel/devel linux-2.6.12.tar.bz2.sign, NONE, 1.1 patch-2.6.12-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.159, 1.160 kernel-2.6.spec, 1.1384, 1.1385 linux-2.6.11-tux.patch, 1.6, 1.7 sources, 1.137, 1.138 upstream, 1.88, 1.89 linux-2.6.11.tar.bz2.sign, 1.1, NONE patch-2.6.12-rc6-git5.bz2.sign, 1.1, NONE patch-2.6.12-rc6.bz2.sign, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jun 20 20:42:51 UTC 2005


Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6.11-tux.patch sources 
	upstream 
Added Files:
	linux-2.6.12.tar.bz2.sign patch-2.6.12-git2.bz2.sign 
Removed Files:
	linux-2.6.11.tar.bz2.sign patch-2.6.12-rc6-git5.bz2.sign 
	patch-2.6.12-rc6.bz2.sign 
Log Message:
.12git2



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

iD8DBQBCs1xyyGugalF9Dw4RAlRHAJ9U4Lq+GmLR6Rs/44fYwizxJ03HFwCfUTs0
4fGx0BgzA0JlDd1zOqE2J3I=
=CDaz
-----END PGP SIGNATURE-----


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

iD8DBQBCtpAqyGugalF9Dw4RAlfMAKCK6RwreEyQ8mbV/p67hvYNza/GygCfS6wv
M4Suns1NasFMv81WyTvISgQ=
=Ebdo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- .cvsignore	13 Jun 2005 04:41:12 -0000	1.159
+++ .cvsignore	20 Jun 2005 20:42:46 -0000	1.160
@@ -4,12 +4,6 @@
 patch-2.6.*-final*.bz2
 kernel-2.6.*.config
 temp-*
-kernel-2.6.11
-linux-2.6.11.tar.bz2
-patch-2.6.12-rc5.bz2
-patch-2.6.12-rc5-git7.bz2
-patch-2.6.12-rc5-git8.bz2
-patch-2.6.12-rc5-git9.bz2
-patch-2.6.12-rc6.bz2
-patch-2.6.12-rc6-git3.bz2
-patch-2.6.12-rc6-git5.bz2
+kernel-2.6.12
+linux-2.6.12.tar.bz2
+patch-2.6.12-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1384
retrieving revision 1.1385
diff -u -r1.1384 -r1.1385
--- kernel-2.6.spec	15 Jun 2005 23:18:41 -0000	1.1384
+++ kernel-2.6.spec	20 Jun 2005 20:42:46 -0000	1.1385
@@ -25,7 +25,7 @@
 # that the kernel isn't the stock distribution kernel, for example by
 # adding some text to the end of the version number.
 #
-%define sublevel 11
+%define sublevel 12
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
 %define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
@@ -220,8 +220,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.12-rc6.bz2
-Patch2: patch-2.6.12-rc6-git5.bz2
+Patch1: patch-2.6.12-git2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -249,7 +248,6 @@
 # 500 - 599   s390(x)
 Patch500: linux-2.6.1-s390-compile.patch
 Patch501: linux-2.6.9-s390-autoraid.patch
-Patch502: linux-2.6.9-s390-zfcp_port-fix.patch
 
 # 600 - 699   sparc(64)
 Patch600: linux-2.6.3-sparc-addbzimage.patch
@@ -330,7 +328,6 @@
 Patch1600: linux-2.6.11-i2c-config.patch
 Patch1610: linux-2.6.11-atkbd-dell-multimedia.patch
 Patch1620: linux-2.6.11-isdn-icn-nodev.patch
-Patch1630: linux-2.6.11-module-licenses.patch
 Patch1640: linux-2.6.11-panic-stackdump.patch
 Patch1650: linux-2.6.11-acpi-thinkpad-c2c3.patch
 Patch1700: linux-2.6.10-revert-module-invalidparam.patch
@@ -343,14 +340,12 @@
 Patch1800: linux-2.6.11-parport-sysctl-perms.patch
 Patch1810: linux-2.6.11-libata-promise-pata-on-sata.patch
 Patch1820: linux-2.6.12-input-kill-stupid-messages.patch
-Patch1830: linux-2.6.12-rc4-audit-git.patch
 Patch1840: linux-2.6.12-ext3-always-nobh.patch
 Patch1850: linux-2.6.12-detect-softlockups.patch
 Patch1860: linux-2.6.11-serial-tickle-nmi.patch
 Patch1870: linux-2.6.12-missing-exports.patch
 Patch1880: linux-2.6.11-radeon-backlight.patch
 Patch1890: linux-2.6.12-firedire-init-breakage.patch 
-Patch1891: linux-2.6.11-firedire-slab-corruptor.patch
 Patch1910: linux-2.6.12-ns558-nodev-rmmod.patch
 
 Patch2000: linux-2.6.11-vm-taint.patch
@@ -539,7 +534,6 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 # 
 %patch1 -p1
-%patch2 -p1
 
 #
 # Patches to back out
@@ -589,8 +583,6 @@
 %patch500 -p1
 # Auto raidstart for S390
 %patch501 -p1
-# Recover after aborted nameserver request.
-%patch502 -p1
 
 #
 # sparc/sparc64
@@ -753,8 +745,6 @@
 %patch1610 -p1
 # ISDN ICN driver barfs if probed with no cards present.
 %patch1620 -p1
-# Fix missing MODULE_LICENSE tags
-%patch1630 -p1
 # Print stack trace when we panic.
 %patch1640 -p1
 # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.
@@ -781,8 +771,6 @@
 %patch1810 -p1
 # The input layer spews crap no-one cares about.
 %patch1820 -p1
-# Audit code from git tree which was imported into 2.6.12-rc4
-%patch1830 -p1
 # Always set nobh on ext3 volumes.
 #%patch1840 -p1
 # Detect soft lockups.
@@ -795,8 +783,6 @@
 %patch1880 -p1
 # Fix ochi1394 smp init.
 %patch1890 -p1
-# Fix slab corruption with firewire.
-%patch1891 -p1
 # Fix oops in ns558 on rmmod
 %patch1910 -p1
 
@@ -1263,6 +1249,9 @@
 %endif
 
 %changelog
+* Mon Jun 20 2005 Dave Jones <davej at redhat.com>
+- 2.6.12-git2
+
 * Mon Jun 13 2005 Peter Jones <pjones at redhat.com>
 - Reenable fixed ipw drivers.
 

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

Index: linux-2.6.11-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-tux.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6.11-tux.patch	9 May 2005 22:19:09 -0000	1.6
+++ linux-2.6.11-tux.patch	20 Jun 2005 20:42:46 -0000	1.7
@@ -1803,11 +1803,14 @@
 +
 +#endif
 diff -urNp --exclude-from=/home/davej/.exclude linux-905/kernel/exit.c linux-910/kernel/exit.c
---- linux-905/kernel/exit.c
-+++ linux-910/kernel/exit.c
-@@ -813,6 +813,13 @@ fastcall NORET_TYPE void do_exit(long co
- 	if (group_dead) {
-  		del_timer_sync(&tsk->signal->real_timer);
+--- linux-2.6.12/kernel/exit.c~	2005-06-20 15:18:06.000000000 -0400
++++ linux-2.6.12/kernel/exit.c	2005-06-20 15:19:23.000000000 -0400
+@@ -811,8 +811,16 @@ fastcall NORET_TYPE void do_exit(long co
+ 	acct_update_integrals(tsk);
+ 	update_mem_hiwater(tsk);
+ 	group_dead = atomic_dec_and_test(&tsk->signal->live);
+-	if (group_dead)
++	if (group_dead) {
  		acct_process(code);
 +		if (current->tux_info) {
 +#ifdef CONFIG_TUX_DEBUG
@@ -1816,9 +1819,10 @@
 +#endif
 +			current->tux_exit();
 +		}
- 	}
++	}
  	exit_mm(tsk);
  
+ 	exit_sem(tsk);
 diff -urNp --exclude-from=/home/davej/.exclude linux-905/kernel/fork.c linux-910/kernel/fork.c
 --- linux-905/kernel/fork.c
 +++ linux-910/kernel/fork.c


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- sources	6 Jun 2005 22:12:15 -0000	1.137
+++ sources	20 Jun 2005 20:42:47 -0000	1.138
@@ -1,4 +1,2 @@
-f00fd1b5a80f52baf9d1d83acddfa325  linux-2.6.11.tar.bz2
-2a1b060a89f350fb263975be0a87d22c  patch-2.6.12-rc5.bz2
-c90dbb398a13373f95ea363d1519aa1f  patch-2.6.12-rc5-git7.bz2
-a83e0f80a3fb8561e47ff208bb9207d9  patch-2.6.12-rc6.bz2
+c5d2a1b62e1dad502c871bba267337d5  linux-2.6.12.tar.bz2
+45f21f6b429e5ae503faf3f88156e910  patch-2.6.12-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- upstream	13 Jun 2005 04:41:12 -0000	1.88
+++ upstream	20 Jun 2005 20:42:47 -0000	1.89
@@ -1,3 +1,2 @@
-linux-2.6.11.tar.bz2
-patch-2.6.12-rc6.bz2
-patch-2.6.12-rc6-git5.bz2
+linux-2.6.12.tar.bz2
+patch-2.6.12-git2.bz2


--- linux-2.6.11.tar.bz2.sign DELETED ---


--- patch-2.6.12-rc6-git5.bz2.sign DELETED ---


--- patch-2.6.12-rc6.bz2.sign DELETED ---




More information about the fedora-cvs-commits mailing list