rpms/kernel/devel kernel-2.6.spec, 1.1925, 1.1926 linux-2.6-compile-fixes.patch, 1.48, 1.49 linux-2.6-debug-oops-pause.patch, 1.9, 1.10 linux-2.6-netdump.patch, 1.3, 1.4 linux-2.6-tux.patch, 1.10, 1.11 linux-2.6-debunk-i2c.patch, 1.1, NONE linux-2.6-fs-namei-deadlock.patch, 1.1, NONE linux-2.6-net-suppress-msgs.patch, 1.1, NONE linux-2.6-percpu-NR_CPUS.patch, 1.1, NONE linux-2.6-snd-powermac.patch, 1.1, NONE linux-2.6-stradis-oops.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Feb 9 21:45:36 UTC 2006
- Previous message (by thread): rpms/kernel/devel/configs config-generic, 1.148, 1.149 config-ia64-generic, 1.19, 1.20 config-powerpc-generic, 1.14, 1.15 config-powerpc32-generic, 1.10, 1.11 config-s390-generic, 1.10, 1.11
- Next message (by thread): rpms/anaconda/devel .cvsignore, 1.214, 1.215 anaconda.spec, 1.333, 1.334 sources, 1.333, 1.334
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8913
Modified Files:
kernel-2.6.spec linux-2.6-compile-fixes.patch
linux-2.6-debug-oops-pause.patch linux-2.6-netdump.patch
linux-2.6-tux.patch
Removed Files:
linux-2.6-debunk-i2c.patch linux-2.6-fs-namei-deadlock.patch
linux-2.6-net-suppress-msgs.patch
linux-2.6-percpu-NR_CPUS.patch linux-2.6-snd-powermac.patch
linux-2.6-stradis-oops.patch
Log Message:
really apply git patches. Doh.
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1925
retrieving revision 1.1926
diff -u -r1.1925 -r1.1926
--- kernel-2.6.spec 9 Feb 2006 20:34:27 -0000 1.1925
+++ kernel-2.6.spec 9 Feb 2006 21:45:32 -0000 1.1926
@@ -222,12 +222,9 @@
Patch205: linux-2.6-edid-check.patch
Patch206: linux-2.6-x86_64-tif-restore-sigmask.patch
Patch207: linux-2.6-x86_64-generic-sigsuspend.patch
-Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
# 300 - 399 ppc(64)
Patch301: linux-2.6.15-cell-numa-init.patch
-Patch302: linux-2.6-debunk-i2c.patch
-Patch303: linux-2.6-snd-powermac.patch
#Patch304: linux-2.6.15-mv643xx-fixes.patch
Patch305: linux-2.6-cell-mambo-drivers.patch
Patch306: linux-2.6-hvc-console.patch
@@ -357,10 +354,6 @@
Patch1830: linux-2.6-w1-hush-debug.patch
Patch1840: linux-2.6-x86-hp-reboot.patch
Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-percpu-NR_CPUS.patch
-Patch1870: linux-2.6-net-suppress-msgs.patch
-Patch1880: linux-2.6-fs-namei-deadlock.patch
-Patch1890: linux-2.6-stradis-oops.patch
# Warn about usage of various obsolete functionality that may go away.
Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -594,9 +587,9 @@
# Update to latest upstream.
%patch1 -p1
-#%patch2 -p1
+%patch2 -p1
# Backout broken DRM changes.
-%patch3 -p1 -R
+#%patch3 -p1 -R
%patch4 -p1
#
@@ -635,18 +628,12 @@
%patch206 -p1
# Generic sys_rt_sigsuspend()
%patch207 -p1
-# Add ppoll/pselect syscalls
-%patch208 -p1
#
# ppc64
#
# Arnd says don't call cell_spumem_init() till he fixes it.
%patch301 -p1
-# Revert I2C Bunkage.
-%patch302 -p1
-# Fix I2C handling in snd_powermac
-%patch303 -p1
# Fix the MV643xx Gigabit Ethernet driver
#%patch304 -p1
# Support the IBM Mambo simulator; core as well as disk and network drivers.
@@ -856,14 +843,6 @@
%patch1840 -p1
# Fix compilation for MV643xx Ethernet
%patch1850 -p1
-# Fix percpu data accesses
-%patch1860 -p1
-# Suppress some network layer msgs
-%patch1870 -p1
-# Fix deadlock in do_path_lookup()
-%patch1880 -p1
-# Fix oops in stradis on init
-%patch1890 -p1
# Warn about obsolete functionality usage.
%patch1900 -p1
@@ -900,7 +879,7 @@
#
# misc small stuff to make things compile or otherwise improve performance
#
-%patch10000 -p1
+#%patch10000 -p1
# Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
%patch10001 -p1
linux-2.6-compile-fixes.patch:
0 files changed
Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- linux-2.6-compile-fixes.patch 3 Feb 2006 18:51:30 -0000 1.48
+++ linux-2.6-compile-fixes.patch 9 Feb 2006 21:45:32 -0000 1.49
@@ -1,71 +1,2 @@
---- linux-2.6.15/include/asm-generic/signal.h.orig 2006-01-06 16:05:09.000000000 +0000
-+++ linux-2.6.15/include/asm-generic/signal.h 2006-01-06 16:05:19.000000000 +0000
-@@ -9,6 +9,7 @@
- #endif
-
- #ifndef __ASSEMBLY__
-+#include <linux/compiler.h>
- typedef void __signalfn_t(int);
- typedef __signalfn_t __user *__sighandler_t;
-
---- linux-2.6.15/drivers/net/spider_net.c.orig 2006-01-06 16:38:43.000000000 +0000
-+++ linux-2.6.15/drivers/net/spider_net.c 2006-01-06 16:39:10.000000000 +0000
-@@ -48,6 +48,7 @@
- #include <asm/bitops.h>
- #include <asm/pci-bridge.h>
- #include <net/checksum.h>
-+#include <net/ip.h>
-
- #include "spider_net.h"
-
-Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC
-is enabled.
-Signed-off-by: Jes Sorensen <jes at sgi.com>
-----
- arch/ia64/Kconfig | 3 +++
- drivers/Makefile | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-Index: linux-2.6/arch/ia64/Kconfig
-===================================================================
---- linux-2.6.orig/arch/ia64/Kconfig
-+++ linux-2.6/arch/ia64/Kconfig
-@@ -374,6 +374,9 @@
- To use this option, you have to ensure that the "/proc file system
- support" (CONFIG_PROC_FS) is enabled, too.
-
-+config SGI_SN
-+ def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
-+
- source "drivers/firmware/Kconfig"
-
- source "fs/Kconfig.binfmt"
-Index: linux-2.6/drivers/Makefile
-===================================================================
---- linux-2.6.orig/drivers/Makefile
-+++ linux-2.6/drivers/Makefile
-@@ -69,7 +69,7 @@
- obj-$(CONFIG_CPU_FREQ) += cpufreq/
- obj-$(CONFIG_MMC) += mmc/
- obj-$(CONFIG_INFINIBAND) += infiniband/
--obj-$(CONFIG_SGI_IOC4) += sn/
-+obj-$(CONFIG_SGI_SN) += sn/
- obj-y += firmware/
- obj-$(CONFIG_CRYPTO) += crypto/
- obj-$(CONFIG_SUPERH) += sh/
-
---- linux-2.6.15.noarch/include/linux/suspend.h~ 2006-02-02 16:27:38.000000000 -0500
-+++ linux-2.6.15.noarch/include/linux/suspend.h 2006-02-02 16:28:07.000000000 -0500
-@@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone
- #ifdef CONFIG_PM
- /* kernel/power/swsusp.c */
- extern int software_suspend(void);
--
--extern int pm_prepare_console(void);
--extern void pm_restore_console(void);
--
- #else
- static inline int software_suspend(void)
- {
linux-2.6-debug-oops-pause.patch:
traps.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletion(-)
Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-debug-oops-pause.patch 9 Feb 2006 18:52:49 -0000 1.9
+++ linux-2.6-debug-oops-pause.patch 9 Feb 2006 21:45:32 -0000 1.10
@@ -36,10 +36,10 @@
static void show_trace_log_lvl(struct task_struct *task,
unsigned long *stack, char *log_lvl)
{
-@@ -176,6 +188,7 @@ static void show_trace_log_lvl(struct ta
- if (!stack)
+@@ -190,6 +190,7 @@ static void show_trace_log_lvl(struct ta
break;
- printk(KERN_EMERG " =======================\n");
+ printk(log_lvl);
+ printk(" =======================\n");
+ //pause_for_two_minutes();
}
}
linux-2.6-netdump.patch:
linux-2.6.12/drivers/net/netdump.c | 550 +++++++++++++++++++++++++++++
linux-2.6.12/drivers/net/netdump.h | 90 ++++
linux-2.6.12/include/asm-generic/netdump.h | 48 ++
linux-2.6.12/include/asm-i386/netdump.h | 79 ++++
linux-2.6.12/include/asm-ia64/netdump.h | 82 ++++
linux-2.6.12/include/asm-powerpc/netdump.h | 79 ++++
linux-2.6.12/include/asm-s390/netdump.h | 6
linux-2.6.12/include/asm-x86_64/netdump.h | 79 ++++
linux-2.6.12/include/linux/netdevice.h | 8
linux-2.6.12/include/linux/netpoll.h | 4
linux-2.6.12/net/core/netpoll.c | 17
linux-2.6.14/drivers/net/Makefile | 1
linux-2.6.15.noarch/drivers/net/Kconfig | 7
13 files changed, 1039 insertions(+), 11 deletions(-)
Index: linux-2.6-netdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-netdump.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-netdump.patch 27 Nov 2005 04:25:24 -0000 1.3
+++ linux-2.6-netdump.patch 9 Feb 2006 21:45:32 -0000 1.4
@@ -644,22 +644,22 @@
+
+module_init(init_netdump);
+module_exit(cleanup_netdump);
---- linux-2.6.12/drivers/net/Kconfig.netdump.orig 2005-08-19 17:45:43.052483533 -0400
-+++ linux-2.6.12/drivers/net/Kconfig 2005-08-19 17:48:14.835252548 -0400
-@@ -2545,6 +2545,13 @@ config NETCONSOLE
+--- linux-2.6.15.noarch/drivers/net/Kconfig~ 2006-02-09 16:15:49.000000000 -0500
++++ linux-2.6.15.noarch/drivers/net/Kconfig 2006-02-09 16:16:28.000000000 -0500
+@@ -2715,6 +2715,13 @@ config NETCONSOLE
If you want to log kernel messages over the network, enable this.
See <file:Documentation/networking/netconsole.txt> for details.
-+ config NETDUMP
++config NETDUMP
+ tristate "Network kernel crash dump support"
+ depends on NETPOLL && NETPOLL_TRAP && (X86 || PPC_PSERIES || IA64)
+ ---help---
+ Enable this option if you have a netdump server and you would like
+ to collect kernel crash dumps.
+
- endif #NETDEVICES
-
config NETPOLL
+ def_bool NETCONSOLE
+
--- linux-2.6.14/drivers/net/Makefile~ 2005-10-30 21:44:17.000000000 -0500
+++ linux-2.6.14/drivers/net/Makefile 2005-10-30 21:44:33.000000000 -0500
@@ -203,6 +203,7 @@ obj-$(CONFIG_IRDA) += irda/
linux-2.6-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 | 5
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-generic/fcntl.h | 4
include/asm-i386/unistd.h | 5
include/asm-ia64/unistd.h | 2
include/asm-sparc/fcntl.h | 1
include/asm-sparc64/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 | 2
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 | 8
include/net/tcp.h | 3
include/net/tux.h | 804 ++++++++++++++
include/net/tux_u.h | 163 ++
kernel/exit.c | 7
kernel/fork.c | 1
kernel/kmod.c | 28
kernel/signal.c | 1
mm/filemap.c | 19
mm/truncate.c | 2
net/Kconfig | 1
net/Makefile | 1
net/core/sock.c | 5
net/ipv4/tcp.c | 3
net/ipv4/tcp_input.c | 1
net/ipv4/tcp_output.c | 3
net/socket.c | 197 ++-
net/tux/Kconfig | 25
net/tux/Makefile | 12
net/tux/abuf.c | 190 +++
net/tux/accept.c | 863 +++++++++++++++
net/tux/cachemiss.c | 265 ++++
net/tux/cgi.c | 171 +++
net/tux/directory.c | 302 +++++
net/tux/extcgi.c | 329 +++++
net/tux/gzip.c | 40
net/tux/input.c | 641 +++++++++++
net/tux/logger.c | 837 ++++++++++++++
net/tux/main.c | 1417 +++++++++++++++++++++++++
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 | 1555 +++++++++++++++++++++++++++
net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++
net/tux/redirect.c | 172 +++
net/tux/times.c | 392 ++++++
net/tux/times.h | 26
net/tux/userspace.c | 27
72 files changed, 12775 insertions(+), 98 deletions(-)
Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-tux.patch 11 Jan 2006 00:39:36 -0000 1.10
+++ linux-2.6-tux.patch 9 Feb 2006 21:45:32 -0000 1.11
@@ -470,14 +470,14 @@
===================================================================
--- linux.orig/include/linux/dcache.h
+++ linux/include/linux/dcache.h
-@@ -108,6 +108,7 @@ struct dentry {
+@@ -107,6 +107,7 @@ struct dentry {
struct dentry_operations *d_op;
struct super_block *d_sb; /* The root of the dentry tree */
void *d_fsdata; /* fs-specific data */
+ void *d_extra_attributes; /* TUX-specific data */
+ #ifdef CONFIG_PROFILING
struct dcookie_struct *d_cookie; /* cookie, if any */
- int d_mounted;
- unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */
+ #endif
@@ -216,6 +217,7 @@ extern void shrink_dcache_sb(struct supe
extern void shrink_dcache_parent(struct dentry *);
extern void shrink_dcache_anon(struct hlist_head *);
--- linux-2.6-debunk-i2c.patch DELETED ---
--- linux-2.6-fs-namei-deadlock.patch DELETED ---
--- linux-2.6-net-suppress-msgs.patch DELETED ---
--- linux-2.6-percpu-NR_CPUS.patch DELETED ---
--- linux-2.6-snd-powermac.patch DELETED ---
--- linux-2.6-stradis-oops.patch DELETED ---
- Previous message (by thread): rpms/kernel/devel/configs config-generic, 1.148, 1.149 config-ia64-generic, 1.19, 1.20 config-powerpc-generic, 1.14, 1.15 config-powerpc32-generic, 1.10, 1.11 config-s390-generic, 1.10, 1.11
- Next message (by thread): rpms/anaconda/devel .cvsignore, 1.214, 1.215 anaconda.spec, 1.333, 1.334 sources, 1.333, 1.334
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list