rpms/kernel/devel patch-2.6.12-rc1-bk1.bz2.sign, NONE, 1.1 .cvsignore, 1.137, 1.138 kernel-2.6.spec, 1.1198, 1.1199 linux-2.6.0-compile.patch, 1.148, 1.149 linux-2.6.3-printopen.patch, 1.18, 1.19 sources, 1.120, 1.121 upstream, 1.62, 1.63
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Mar 23 00:28:28 UTC 2005
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16081
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6.0-compile.patch
linux-2.6.3-printopen.patch sources upstream
Added Files:
patch-2.6.12-rc1-bk1.bz2.sign
Log Message:
-bk1
--- NEW FILE patch-2.6.12-rc1-bk1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBCPCA5yGugalF9Dw4RAhlXAKCAttXbDNn/WcqPUVca0HLx4e4XKQCfZMhr
GBbRF9k77OLwHPsNucAmKZM=
=W9AF
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- .cvsignore 22 Mar 2005 18:22:52 -0000 1.137
+++ .cvsignore 23 Mar 2005 00:28:25 -0000 1.138
@@ -7,3 +7,4 @@
kernel-2.6.11
linux-2.6.11.tar.bz2
patch-2.6.12-rc1.bz2
+patch-2.6.12-rc1-bk1.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1198
retrieving revision 1.1199
diff -u -r1.1198 -r1.1199
--- kernel-2.6.spec 22 Mar 2005 23:36:26 -0000 1.1198
+++ kernel-2.6.spec 23 Mar 2005 00:28:25 -0000 1.1199
@@ -211,7 +211,7 @@
# Patches 0 through 100 are meant for core subsystem upgrades
#
Patch1: patch-2.6.12-rc1.bz2
-#Patch3: patch-2.6.11-bk1.bz2
+Patch2: patch-2.6.12-rc1-bk1.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -482,8 +482,7 @@
# Patches 0 through 100 are meant for core subsystem upgrades
#
%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
+%patch2 -p1
#
# Patches to back out
@@ -1081,7 +1080,7 @@
%changelog
* Tue Mar 22 2005 Dave Jones <davej at redhat.com>
- Fix several instances of swapped arguments to memset()
-
+- 2.6.12rc1-bk1
* Fri Mar 18 2005 Dave Jones <davej at redhat.com>
- kjournald release race. (#146344)
linux-2.6.0-compile.patch:
linux-10000/arch/i386/Makefile | 4 ++--
linux-10000/arch/i386/kernel/Makefile | 6 +++---
linux-10000/arch/i386/kernel/nmi.c | 2 +-
linux-10000/arch/ppc64/Makefile | 2 +-
linux-10000/arch/ppc64/boot/Makefile | 3 +++
linux-10000/arch/x86_64/ia32/sys_ia32.c | 1 -
linux-10000/arch/x86_64/mm/init.c | 2 --
linux-10000/drivers/acpi/ec.c | 2 +-
linux-10000/drivers/md/raid5.c | 2 ++
linux-10000/drivers/net/3c59x.c | 2 +-
linux-10000/drivers/net/acenic.c | 2 +-
linux-10000/drivers/pci/search.c | 2 +-
linux-10000/drivers/usb/host/ehci-hcd.c | 1 +
linux-10000/drivers/usb/storage/scsiglue.c | 2 +-
linux-10000/drivers/usb/storage/usb.c | 2 +-
linux-10000/fs/open.c | 1 -
linux-10000/fs/proc/generic.c | 2 +-
linux-10000/include/linux/config.h | 4 +++-
linux-10000/include/linux/delay.h | 17 ++++++++---------
linux-10000/include/linux/gfp.h | 2 +-
linux-10000/include/linux/namei.h | 2 +-
linux-10000/init/Kconfig | 2 +-
linux-10000/init/main.c | 3 ++-
linux-10000/kernel/pid.c | 2 +-
linux-10000/scripts/reference_discarded.pl | 3 ++-
linux-10000/scripts/reference_init.pl | 1 +
linux-10000/sound/core/oss/pcm_oss.c | 7 +++++++
linux-10000/sound/pci/intel8x0.c | 18 ++++++++++++++++++
linux-2.6.11/drivers/scsi/ide-scsi.c | 7 ++++++-
29 files changed, 71 insertions(+), 35 deletions(-)
Index: linux-2.6.0-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.0-compile.patch,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- linux-2.6.0-compile.patch 22 Mar 2005 07:00:21 -0000 1.148
+++ linux-2.6.0-compile.patch 23 Mar 2005 00:28:25 -0000 1.149
@@ -165,10 +165,9 @@
spin_lock(&pci_bus_lock);
n = from ? from->global_list.next : pci_devices.next;
-diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/scsi/ide-scsi.c linux-10000/drivers/scsi/ide-scsi.c
---- linux-3022/drivers/scsi/ide-scsi.c
-+++ linux-10000/drivers/scsi/ide-scsi.c
-@@ -737,10 +737,16 @@ static ide_driver_t idescsi_driver = {
+--- linux-2.6.11/drivers/scsi/ide-scsi.c~ 2005-03-22 19:21:13.000000000 -0500
++++ linux-2.6.11/drivers/scsi/ide-scsi.c 2005-03-22 19:21:51.000000000 -0500
+@@ -764,6 +764,8 @@ static ide_driver_t idescsi_driver = {
.drives = LIST_HEAD_INIT(idescsi_driver.drives),
};
@@ -176,8 +175,12 @@
+
static int idescsi_ide_open(struct inode *inode, struct file *filp)
{
- ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
+ struct gendisk *disk = inode->i_bdev->bd_disk;
+@@ -776,7 +778,10 @@ static int idescsi_ide_open(struct inode
+ drive = scsi->drive;
+
drive->usage++;
+-
+ if (!ide_scsi_warned++) {
+ printk(KERN_WARNING "ide-scsi: Warning this device driver is only intended for specialist devices.\n");
+ printk(KERN_WARNING "ide-scsi: Do not use for cd burning, use /dev/hdX directly instead.\n");
linux-2.6.3-printopen.patch:
fs/exec.c | 7 +++++++
fs/namei.c | 17 +++++++++++++++++
fs/open.c | 43 +++++++++++++++++++++++++++++++++++++++++++
include/linux/jiffies.h | 2 +-
4 files changed, 68 insertions(+), 1 deletion(-)
Index: linux-2.6.3-printopen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-printopen.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6.3-printopen.patch 23 Mar 2005 00:04:23 -0000 1.18
+++ linux-2.6.3-printopen.patch 23 Mar 2005 00:28:25 -0000 1.19
@@ -1,15 +1,12 @@
diff -urNp --exclude-from=/home/davej/.exclude linux-2100/fs/exec.c linux-2999/fs/exec.c
--- linux-2100/fs/exec.c
+++ linux-2999/fs/exec.c
-@@ -1144,6 +1144,16 @@ int do_execve(char * filename,
+@@ -1144,6 +1144,13 @@ int do_execve(char * filename,
sched_exec();
+ {
+ static unsigned long prev_jiffies;
-+ //static char buf[1024];
-+ //char *p;
-+ //p = d_path(file->f_dentry, file->f_vfsmnt, buf, 1023);
+ if (jiffies < 600 * HZ)
+ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s exec'd %s\n", jiffies / HZ, jiffies % HZ, jiffies+(jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, current->comm, filename);
+ prev_jiffies = jiffies;
@@ -36,135 +33,36 @@
down(&dir->i_sem);
/*
-diff -urNp --exclude-from=/home/davej/.exclude linux-2100/fs/open.c linux-2999/fs/open.c
---- linux-2100/fs/open.c
-+++ linux-2999/fs/open.c
-@@ -952,6 +953,17 @@ asmlinkage long sys_open(const char __us
- if (IS_ERR(f))
- goto out_error;
- fd_install(fd, f);
-+ {
-+ static unsigned long prev_jiffies;
-+ static char buf[1024];
-+ char *p;
-+ p = d_path(f->f_dentry, f->f_vfsmnt, buf, 1023);
-+ if (jiffies < 600 * HZ)
-+ printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s open()'d %s\n", jiffies / HZ, jiffies % HZ,
-+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
-+ current->comm, p);
-+ prev_jiffies = jiffies;
-+ }
- }
- out:
- putname(tmp);
-diff -urNp --exclude-from=/home/davej/.exclude linux-2100/include/linux/jiffies.h linux-2999/include/linux/jiffies.h
---- linux-2100/include/linux/jiffies.h
-+++ linux-2999/include/linux/jiffies.h
-@@ -122,7 +122,7 @@ static inline u64 get_jiffies_64(void)
- * Have the 32 bit jiffies value wrap 5 minutes after boot
- * so jiffies wrap bugs show up earlier.
- */
--#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ))
-+#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (0*HZ))
-
- /*
- * Change timeval to jiffies, trying to avoid the
---- linux-2.6.11/fs/open.c~ 2005-03-22 14:42:56.000000000 -0500
-+++ linux-2.6.11/fs/open.c 2005-03-22 14:52:35.000000000 -0500
-@@ -958,9 +958,33 @@ asmlinkage long sys_open(const char __us
- char *p;
- p = d_path(f->f_dentry, f->f_vfsmnt, buf, 1023);
- if (jiffies < 600 * HZ)
-- printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s open()'d %s\n", jiffies / HZ, jiffies % HZ,
-+ printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s open()'d %s flags:[", jiffies / HZ, jiffies % HZ,
- (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
- current->comm, p);
-+ if (flags & O_CREAT)
-+ printk (" O_CREAT");
-+ if (flags & O_EXCL)
-+ printk (" O_EXCL");
-+ if (flags & O_NOCTTY)
-+ printk (" O_NOCTTY");
-+ if (flags & O_TRUNC)
-+ printk (" O_TRUNC");
-+ if (flags & O_APPEND)
-+ printk (" O_APPEND");
-+ if (flags & O_NONBLOCK)
-+ printk (" O_NONBLOCK");
-+ if (flags & O_SYNC)
-+ printk (" O_SYNC");
-+ if (flags & O_NOFOLLOW)
-+ printk (" O_NOFOLLOW");
-+ if (flags & O_DIRECTORY)
-+ printk (" O_DIRECTORY");
-+ if (flags & O_DIRECT)
-+ printk (" O_DIRECT");
-+ if (flags & O_LARGEFILE)
-+ printk (" O_LARGEFILE");
-+
-+ printk(" ] mode: %x\n", mode);
- prev_jiffies = jiffies;
- }
- }
---- linux-2.6.11/fs/namei.c~ 2005-03-22 15:57:14.000000000 -0500
-+++ linux-2.6.11/fs/namei.c 2005-03-22 16:21:23.000000000 -0500
-@@ -918,6 +918,18 @@ int fastcall link_path_walk(const char *
+@@ -909,6 +917,15 @@ int fastcall link_path_walk(const char *
+ {
struct nameidata save = *nd;
int result;
-
++
+ {
+ static unsigned long prev_jiffies;
-+ //static char buf[1024];
-+ //char *p;
-+ //p = d_path(f->f_dentry, f->f_vfsmnt, buf, 1023);
+ if (jiffies < 600 * HZ)
+ printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s link_path_walk()'d %s\n", jiffies / HZ, jiffies % HZ,
+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
+ current->comm, name);
+ prev_jiffies = jiffies;
+ }
-+
+
/* make sure the stuff we saved doesn't go away */
dget(save.dentry);
- mntget(save.mnt);
---- linux-2.6.11/fs/open.c~ 2005-03-22 18:27:03.000000000 -0500
-+++ linux-2.6.11/fs/open.c 2005-03-22 18:34:47.000000000 -0500
-@@ -954,37 +954,45 @@ asmlinkage long sys_open(const char __us
+diff -urNp --exclude-from=/home/davej/.exclude linux-2100/fs/open.c linux-2999/fs/open.c
+--- linux-2100/fs/open.c
++++ linux-2999/fs/open.c
+@@ -952,6 +952,49 @@ asmlinkage long sys_open(const char __us
+ if (IS_ERR(f))
+ goto out_error;
fd_install(fd, f);
- {
- static unsigned long prev_jiffies;
-- static char buf[1024];
++ {
++ static unsigned long prev_jiffies;
+ static char buf[512];
+ static char buf2[256];
+ int len=0;
- char *p;
- p = d_path(f->f_dentry, f->f_vfsmnt, buf, 1023);
-- if (jiffies < 600 * HZ)
-- printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s open()'d %s flags:[", jiffies / HZ, jiffies % HZ,
-- (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
-- current->comm, p);
-- if (flags & O_CREAT)
-- printk (" O_CREAT");
-- if (flags & O_EXCL)
-- printk (" O_EXCL");
-- if (flags & O_NOCTTY)
-- printk (" O_NOCTTY");
-- if (flags & O_TRUNC)
-- printk (" O_TRUNC");
-- if (flags & O_APPEND)
-- printk (" O_APPEND");
-- if (flags & O_NONBLOCK)
-- printk (" O_NONBLOCK");
-- if (flags & O_SYNC)
-- printk (" O_SYNC");
-- if (flags & O_NOFOLLOW)
-- printk (" O_NOFOLLOW");
-- if (flags & O_DIRECTORY)
-- printk (" O_DIRECTORY");
-- if (flags & O_DIRECT)
-- printk (" O_DIRECT");
-- if (flags & O_LARGEFILE)
-- printk (" O_LARGEFILE");
++ char *p;
++ p = d_path(f->f_dentry, f->f_vfsmnt, buf, 1023);
+ if (jiffies < 600 * HZ) {
+ memset(buf, 0, 512);
+ memset(buf2, 0, 256);
@@ -194,12 +92,25 @@
+ len+= sprintf(buf2+len, "%s", " O_DIRECT");
+ if (flags & O_LARGEFILE)
+ len+= sprintf(buf2+len, "%s", " O_LARGEFILE");
-
-- printk(" ] mode: %x\n", mode);
++
+ sprintf(buf2+len, " ] mode: %o\n", mode);
+
+ printk (KERN_ERR "%s\n", buf2);
+ }
- prev_jiffies = jiffies;
- }
++ prev_jiffies = jiffies;
++ }
}
+ out:
+ putname(tmp);
+diff -urNp --exclude-from=/home/davej/.exclude linux-2100/include/linux/jiffies.h linux-2999/include/linux/jiffies.h
+--- linux-2100/include/linux/jiffies.h
++++ linux-2999/include/linux/jiffies.h
+@@ -122,7 +122,7 @@ static inline u64 get_jiffies_64(void)
+ * Have the 32 bit jiffies value wrap 5 minutes after boot
+ * so jiffies wrap bugs show up earlier.
+ */
+-#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ))
++#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (0*HZ))
+
+ /*
+ * Change timeval to jiffies, trying to avoid the
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- sources 22 Mar 2005 18:22:52 -0000 1.120
+++ sources 23 Mar 2005 00:28:25 -0000 1.121
@@ -1,2 +1,3 @@
f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2
4a0ad3e1dc96d4a7bd93856df6c7adab patch-2.6.12-rc1.bz2
+944f644fa6bc6ef9118b599374006cae patch-2.6.12-rc1-bk1.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- upstream 18 Mar 2005 21:54:20 -0000 1.62
+++ upstream 23 Mar 2005 00:28:25 -0000 1.63
@@ -1,2 +1,4 @@
linux-2.6.11.tar.bz2
patch-2.6.12-rc1.bz2
+patch-2.6.12-rc1-bk1.bz2
+
More information about the fedora-cvs-commits
mailing list