rpms/kernel/devel patch-2.6.12-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.162, 1.163 kernel-2.6.spec, 1.1395, 1.1396 linux-2.6.0-sleepon.patch, 1.13, 1.14 linux-2.6.11-i2c-config.patch, 1.2, 1.3 linux-2.6.12-tux.patch, 1.1, 1.2 sources, 1.138, 1.139 upstream, 1.92, 1.93 patch-2.6.12-git2.bz2.sign, 1.1, NONE patch-2.6.12-git4.bz2.sign, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jun 23 18:06:46 UTC 2005
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16754
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6.0-sleepon.patch
linux-2.6.11-i2c-config.patch linux-2.6.12-tux.patch sources
upstream
Added Files:
patch-2.6.12-git5.bz2.sign
Removed Files:
patch-2.6.12-git2.bz2.sign patch-2.6.12-git4.bz2.sign
Log Message:
git5
--- NEW FILE patch-2.6.12-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBCuo84yGugalF9Dw4RAixIAKCGUpq8EhYsgWebLVum6hVSwNjC6QCeOqGB
bQuPusKPPzoADMsXINoSI/0=
=+V0R
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- .cvsignore 22 Jun 2005 18:36:57 -0000 1.162
+++ .cvsignore 23 Jun 2005 18:06:42 -0000 1.163
@@ -6,6 +6,4 @@
temp-*
kernel-2.6.12
linux-2.6.12.tar.bz2
-patch-2.6.12-git2.bz2
-patch-2.6.12-git3.bz2
-patch-2.6.12-git4.bz2
+patch-2.6.12-git5.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1395
retrieving revision 1.1396
diff -u -r1.1395 -r1.1396
--- kernel-2.6.spec 23 Jun 2005 01:25:16 -0000 1.1395
+++ kernel-2.6.spec 23 Jun 2005 18:06:42 -0000 1.1396
@@ -220,7 +220,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.12-git4.bz2
+Patch1: patch-2.6.12-git5.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -303,9 +303,6 @@
# NFS bits.
Patch1200: linux-2.6.9-NFSD-non-null-getxattr.patch
-Patch1201: linux-2.6.8-lockd-racewarn2.patch
-Patch1202: linux-2.6.9-lockd-block-nosleep.patch
-Patch1203: linux-2.6.9-lockd-reclaims.patch
# NIC driver updates
Patch1300: linux-2.6.9-net-tr-irqlock-fix.patch
@@ -713,9 +710,6 @@
# Various upstream NFS/NFSD fixes.
#
%patch1200 -p1
-%patch1201 -p1
-%patch1202 -p1
-%patch1203 -p1
# NIC driver fixes.
# Use correct spinlock functions in token ring net code
@@ -1255,6 +1249,9 @@
%endif
%changelog
+* Thu Jun 23 2005 Dave Jones <davej at redhat.com>
+- 2.6.12-git5
+
* Wed Jun 22 2005 Dave Jones <davej at redhat.com>
- 2.6.12-git4
- Bring back the IDE fixes from -ac
linux-2.6.0-sleepon.patch:
drivers/block/DAC960.c | 12 +++++++++++-
drivers/net/tokenring/ibmtr.c | 9 ++++++++-
include/linux/wait.h | 6 +++---
kernel/sched.c | 28 +++++++++++++++-------------
net/sunrpc/clnt.c | 9 ++++++++-
5 files changed, 45 insertions(+), 19 deletions(-)
Index: linux-2.6.0-sleepon.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.0-sleepon.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6.0-sleepon.patch 22 Mar 2005 07:00:21 -0000 1.13
+++ linux-2.6.0-sleepon.patch 23 Jun 2005 18:06:42 -0000 1.14
@@ -63,17 +63,6 @@
return i? 0 : -EAGAIN;
}
-diff -urNp --exclude-from=/home/davej/.exclude linux-1060/fs/lockd/clntlock.c linux-1070/fs/lockd/clntlock.c
---- linux-1060/fs/lockd/clntlock.c
-+++ linux-1070/fs/lockd/clntlock.c
-@@ -70,6 +70,7 @@ nlmclnt_block(struct nlm_host *host, str
- * nlmclnt_lock for an explanation.
- */
- sleep_on_timeout(&block.b_wait, 30*HZ);
-+ #warning race
-
- for (head = &nlm_blocked; *head; head = &(*head)->b_next) {
- if (*head == &block) {
diff -urNp --exclude-from=/home/davej/.exclude linux-1060/include/linux/wait.h linux-1070/include/linux/wait.h
--- linux-1060/include/linux/wait.h
+++ linux-1070/include/linux/wait.h
linux-2.6.11-i2c-config.patch:
Kconfig | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
Index: linux-2.6.11-i2c-config.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-i2c-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.11-i2c-config.patch 11 May 2005 23:23:44 -0000 1.2
+++ linux-2.6.11-i2c-config.patch 23 Jun 2005 18:06:42 -0000 1.3
@@ -15,8 +15,8 @@
config I2C_ALI1535
tristate "ALI 1535"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on X86 && I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on X86 && I2C && PCI
help
If you say yes to this option, support will be included for the SMB
Host controller on Acer Labs Inc. (ALI) M1535 South Bridges. The SMB
@@ -33,8 +33,8 @@
config I2C_ALI15X3
tristate "ALI 15x3"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on (X86 || MIPS) && I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on (X86 || MIPS) && I2C && PCI
help
If you say yes to this option, support will be included for the
Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -42,8 +42,8 @@
config I2C_AMD756
tristate "AMD 756/766/768/8111 and nVidia nForce"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on (X86 || PPC64 || ALPHA )&& I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on (X86 || PPC64 || ALPHA )&& I2C && PCI
help
If you say yes to this option, support will be included for the AMD
756/766/768 mainboard I2C interfaces. The driver also includes
@@ -60,8 +60,8 @@
config I2C_AMD8111
tristate "AMD 8111"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on (X86 || PPC64) && I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on (X86 || PPC64) && I2C && PCI
help
If you say yes to this option, support will be included for the
second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -69,8 +69,8 @@
config I2C_I801
tristate "Intel 82801 (ICH)"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on X86 && I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on X86 && I2C && PCI
help
If you say yes to this option, support will be included for the Intel
801 family of mainboard I2C interfaces. Specifically, the following
@@ -78,8 +78,8 @@
config I2C_I810
tristate "Intel 810/815"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on X86 && I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on X86 && I2C && PCI
select I2C_ALGOBIT
help
If you say yes to this option, support will be included for the Intel
@@ -105,8 +105,8 @@
config I2C_VIAPRO
tristate "VIA 82C596/82C686/823x"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on (X86 || PPC) && I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on (X86 || PPC) && I2C && PCI
help
If you say yes to this option, support will be included for the VIA
82C596/82C686/823x I2C interfaces. Specifically, the following
@@ -116,8 +116,8 @@
config I2C_SIS5595
tristate "SiS 5595"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on X86 && I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on X86 && I2C && PCI
help
If you say yes to this option, support will be included for the
SiS5595 SMBus (a subset of I2C) interface.
@@ -125,8 +125,8 @@
config I2C_SIS630
tristate "SiS 630/730"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on X86 && I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on X86 && I2C && PCI
help
If you say yes to this option, support will be included for the
SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@ -134,8 +134,8 @@
config I2C_SIS96X
tristate "SiS 96x"
-- depends on I2C && PCI && EXPERIMENTAL
-+ depends on X86 && I2C && PCI && EXPERIMENTAL
+- depends on I2C && PCI
++ depends on X86 && I2C && PCI
help
If you say yes to this option, support will be included for the SiS
96x SMBus (a subset of I2C) interfaces. Specifically, the following
linux-2.6.12-tux.patch:
arch/alpha/kernel/systbls.S | 8
arch/i386/kernel/syscall_table.S | 10
arch/ia64/kernel/entry.S | 8
arch/ia64/kernel/ia64_ksyms.c | 3
arch/ppc64/kernel/misc.S | 20
arch/x86_64/ia32/ia32entry.S | 10
fs/dcache.c | 36
fs/exec.c | 2
fs/fcntl.c | 4
fs/namei.c | 18
fs/namespace.c | 2
fs/open.c | 4
fs/pipe.c | 2
fs/read_write.c | 2
include/asm-alpha/fcntl.h | 1
include/asm-i386/fcntl.h | 1
include/asm-i386/unistd.h | 5
include/asm-ia64/fcntl.h | 1
include/asm-ia64/unistd.h | 2
include/asm-ppc/fcntl.h | 1
include/asm-ppc64/fcntl.h | 1
include/asm-s390/fcntl.h | 1
include/asm-sparc/fcntl.h | 1
include/asm-sparc64/fcntl.h | 1
include/asm-x86_64/fcntl.h | 1
include/asm-x86_64/unistd.h | 10
include/linux/buffer_head.h | 1
include/linux/dcache.h | 8
include/linux/errno.h | 3
include/linux/file.h | 2
include/linux/fs.h | 7
include/linux/kmod.h | 1
include/linux/namei.h | 2
include/linux/net.h | 1
include/linux/sched.h | 5
include/linux/skbuff.h | 2
include/linux/socket.h | 5
include/linux/sysctl.h | 50
include/net/sock.h | 6
include/net/tcp.h | 8
include/net/tux.h | 802 ++++++++++++++
include/net/tux_u.h | 163 ++
kernel/exit.c | 10
kernel/fork.c | 1
kernel/kmod.c | 25
kernel/signal.c | 1
mm/filemap.c | 19
mm/truncate.c | 2
net/Kconfig | 2
net/Makefile | 1
net/ipv4/tcp.c | 3
net/ipv4/tcp_input.c | 1
net/ipv4/tcp_ipv4.c | 5
net/ipv4/tcp_minisocks.c | 3
net/ipv4/tcp_output.c | 5
net/socket.c | 138 +-
net/tux/Kconfig | 25
net/tux/Makefile | 12
net/tux/abuf.c | 190 +++
net/tux/accept.c | 859 +++++++++++++++
net/tux/cachemiss.c | 265 ++++
net/tux/cgi.c | 160 ++
net/tux/directory.c | 302 +++++
net/tux/extcgi.c | 329 +++++
net/tux/gzip.c | 40
net/tux/input.c | 640 +++++++++++
net/tux/logger.c | 836 ++++++++++++++
net/tux/main.c | 1413 +++++++++++++++++++++++++
net/tux/mod.c | 262 ++++
net/tux/output.c | 352 ++++++
net/tux/parser.h | 102 +
net/tux/postpone.c | 77 +
net/tux/proc.c | 1149 ++++++++++++++++++++
net/tux/proto_ftp.c | 1549 +++++++++++++++++++++++++++
net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++
net/tux/redirect.c | 167 ++
net/tux/times.c | 392 ++++++
net/tux/times.h | 26
net/tux/userspace.c | 27
79 files changed, 12736 insertions(+), 72 deletions(-)
Index: linux-2.6.12-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.12-tux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.12-tux.patch 21 Jun 2005 15:23:40 -0000 1.1
+++ linux-2.6.12-tux.patch 23 Jun 2005 18:06:42 -0000 1.2
@@ -28,7 +28,7 @@
.owner = THIS_MODULE,
.llseek = no_llseek,
.aio_read = sock_aio_read,
-@@ -363,52 +364,63 @@ static struct dentry_operations sockfs_d
+@@ -363,51 +364,63 @@ static struct dentry_operations sockfs_d
* but we take care of internal coherence yet.
*/
@@ -79,9 +79,8 @@
+ file->f_flags = O_RDWR;
+ file->f_pos = 0;
-- sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
+- this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
- this.name = name;
-- this.len = strlen(name);
- this.hash = SOCK_INODE(sock)->i_ino;
-
- file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this);
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- sources 20 Jun 2005 20:42:47 -0000 1.138
+++ sources 23 Jun 2005 18:06:42 -0000 1.139
@@ -1,2 +1,2 @@
c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2
-45f21f6b429e5ae503faf3f88156e910 patch-2.6.12-git2.bz2
+0fb49cf3b412572808fb726746e16c96 patch-2.6.12-git5.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- upstream 22 Jun 2005 18:36:57 -0000 1.92
+++ upstream 23 Jun 2005 18:06:42 -0000 1.93
@@ -1,2 +1,2 @@
linux-2.6.12.tar.bz2
-patch-2.6.12-git4.bz2
+patch-2.6.12-git5.bz2
--- patch-2.6.12-git2.bz2.sign DELETED ---
--- patch-2.6.12-git4.bz2.sign DELETED ---
More information about the fedora-cvs-commits
mailing list