/Makefile~kbuild-build-a-single-module-using-make-dir-modulekoWed Jul
6 13:36:22 2005
+++ 25-akpm/MakefileWed Jul 6 13:36:22 2005
@@ -793,6 +793,9 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$
$(Q)$(MAKE) $(build)=$(@D) $@
%.o: %.c scripts FORCE
$(Q)$(MAKE) $(build)=$(@D
13:17:46 2005
+++ 25-akpm/drivers/connector/cn_exit.c Wed Jul 6 13:17:46 2005
@@ -73,9 +73,9 @@ void exit_connector(pid_t pid, pid_t pti
exitmsg = (struct cn_exit_msg *)msg-data;
exitmsg-type = EXIT_CN_MSG_P;
exitmsg-cpu = smp_processor_id
-puN arch/ppc64/kernel/sys_ppc32.c~ppc64-sys_ppc32c-cleanups
arch/ppc64/kernel/sys_ppc32.c
--- 25/arch/ppc64/kernel/sys_ppc32.c~ppc64-sys_ppc32c-cleanups Wed Jul 6
13:38:14 2005
+++ 25-akpm/arch/ppc64/kernel/sys_ppc32.c Wed Jul 6 13:38:14 2005
@@ -30,47 +30,26 @@
#include linux/sem.h
-states-for-systems-without
drivers/acpi/processor_idle.c
---
25/drivers/acpi/processor_idle.c~acpi-re-enable-c2-c3-cpu-states-for-systems-without
Wed Jul 6 13:52:39 2005
+++ 25-akpm/drivers/acpi/processor_idle.c Wed Jul 6 13:52:39 2005
@@ -881,7 +881,7 @@ static int
/madvise.c~madvise-does-not-always-return-ebadf-on-non-fileWed Jul
6 13:50:30 2005
+++ 25-akpm/mm/madvise.cWed Jul 6 13:51:56 2005
@@ -83,9 +83,6 @@ static long madvise_willneed(struct vm_a
{
struct file *file = vma-vm_file;
- if (!file)
- return -EBADF
2005
+++ 25-akpm/drivers/char/hvc_console.c Wed Jul 6 14:00:29 2005
@@ -22,6 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include linux/config.h
#include linux/console.h
#include linux/cpumask.h
#include linux/init.h
_
-
To unsubscribe from
-register-ops-when-setting-up-hvc_console
Wed Jul 6 14:00:41 2005
+++ 25-akpm/drivers/char/hvc_console.c Wed Jul 6 14:00:41 2005
@@ -85,6 +85,7 @@ struct hvc_struct {
char outbuf[N_OUTBUF] __ALIGNED__;
int n_outbuf;
uint32_t vtermno;
+ struct hv_ops *ops;
int
Wed Jul 6
14:00:18 2005
+++ 25-akpm/drivers/char/hvc_console.c Wed Jul 6 14:00:18 2005
@@ -61,16 +61,21 @@
*/
#define HVC_ALLOC_TTY_ADAPTERS 8
-static struct tty_driver *hvc_driver;
-#ifdef CONFIG_MAGIC_SYSRQ
-static int sysrq_pressed;
-#endif
-
#define N_OUTBUF 16
#define
-remove-num_vterms-and-some-dead-code
drivers/char/hvc_console.c
---
25/drivers/char/hvc_console.c~hvc_console-remove-num_vterms-and-some-dead-code
Wed Jul 6 14:00:31 2005
+++ 25-akpm/drivers/char/hvc_console.c Wed Jul 6 14:00:31 2005
@@ -146,8 +146,6 @@ struct hvc_struct *hvc_get_by_index(int
~hvc_console-match-vio-and-console-devices-using-vterm-numbers
Wed Jul 6 14:00:21 2005
+++ 25-akpm/drivers/char/hvc_console.c Wed Jul 6 14:00:21 2005
@@ -102,10 +102,11 @@ static struct list_head hvc_structs = LI
static DEFINE_SPINLOCK(hvc_structs_lock);
/*
- * This value is used to associate a tty
/kernel/hvconsole.c
---
25/arch/ppc64/kernel/hvconsole.c~hvc_console-separate-hvc_console-and-vio-code-2
Wed Jul 6 14:00:39 2005
+++ 25-akpm/arch/ppc64/kernel/hvconsole.c Wed Jul 6 14:00:39 2005
@@ -27,7 +27,6 @@
#include linux/module.h
#include asm/hvcall.h
#include asm/hvconsole.h
-printing-which-idle-loop-were-using
arch/ppc64/kernel/iSeries_setup.c
---
25/arch/ppc64/kernel/iSeries_setup.c~ppc64-be-consistent-about-printing-which-idle-loop-were-using
Wed Jul 6 14:10:24 2005
+++ 25-akpm/arch/ppc64/kernel/iSeries_setup.c Wed Jul 6 14:10:24 2005
@@ -946,9 +946,12 @@ void
-silence-perfmon-exception-warnings
Wed Jul 6 14:10:55 2005
+++ 25-akpm/arch/ppc64/kernel/sysfs.c Wed Jul 6 14:10:55 2005
@@ -112,7 +112,6 @@ void ppc64_enable_pmcs(void)
unsigned long hid0;
#ifdef CONFIG_PPC_PSERIES
unsigned long set, reset;
- int ret;
#endif
/kernel/iSeries_setup.c
---
25/arch/ppc64/kernel/iSeries_setup.c~ppc64-fixup-platforms-for-new-ppc_mdidle
Wed Jul 6 14:10:12 2005
+++ 25-akpm/arch/ppc64/kernel/iSeries_setup.c Wed Jul 6 14:10:12 2005
@@ -940,5 +940,6 @@ void __init iSeries_early_setup(void)
ppc_md.get_rtc_time
--- 25/arch/ppc64/kernel/idle.c~ppc64-make-idle_loop-a-ppc_md-function Wed Jul
6 14:10:06 2005
+++ 25-akpm/arch/ppc64/kernel/idle.cWed Jul 6 14:10:06 2005
@@ -33,6 +33,7 @@
#include asm/iSeries/ItLpQueue.h
#include asm/plpar_wrappers.h
#include asm/systemcfg.h
+#include asm/machdep.h
files changed, 1 insertion(+), 1 deletion(-)
diff -puN sound/pci/bt87x.c~bt87x-build-fix sound/pci/bt87x.c
--- 25/sound/pci/bt87x.c~bt87x-build-fixWed Jul 6 14:46:56 2005
+++ 25-akpm/sound/pci/bt87x.c Wed Jul 6 14:47:04 2005
@@ -804,7 +804,7 @@ static int __devinit snd_bt87x_detect_ca
deletion(-)
diff -puN
fs/nfsd/nfs4state.c~nfsd4-return-better-error-on-io-incompatible-with-open-mode
fs/nfsd/nfs4state.c
---
25/fs/nfsd/nfs4state.c~nfsd4-return-better-error-on-io-incompatible-with-open-mode
Wed Jul 6 13:09:10 2005
+++ 25-akpm/fs/nfsd/nfs4state.c Wed Jul 6 13:09:10 2005
-overusing-reclaim_bad Wed Jul 6
13:08:40 2005
+++ 25-akpm/fs/nfsd/nfs4state.c Wed Jul 6 13:08:40 2005
@@ -1531,8 +1531,6 @@ renew:
status = nfs_ok;
renew_client(sop-so_client);
out:
- if (status open-op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS)
- status
--- 25/fs/nfsd/nfs4recover.c~nfsd4-fix-syncing-of-recovery-directoryWed Jul
6 13:08:07 2005
+++ 25-akpm/fs/nfsd/nfs4recover.c Wed Jul 6 13:08:07 2005
@@ -119,25 +119,12 @@ out:
return status;
}
-static int
-nfsd4_rec_fsync(struct dentry *dentry)
+static void
+nfsd4_sync_rec_dir
13:03:41 2005
+++ 25-akpm/kernel/power/disk.c Wed Jul 6 13:03:41 2005
@@ -236,6 +236,16 @@ static int software_resume(void)
{
int error;
+ if (!swsusp_resume_device) {
+ if (!strlen(resume_file))
+ return -ENOENT
++
1 files changed, 2 insertions(+)
diff -puN drivers/message/i2o/config-osm.c~i2o-config-osm-build-fix
drivers/message/i2o/config-osm.c
--- 25-alpha/drivers/message/i2o/config-osm.c~i2o-config-osm-build-fix
2005-07-06 18:18:38.0 -0700
+++ 25-alpha-akpm/drivers/message/i2o/config-osm.c
--- devel/drivers/pci/setup-bus.c~yet-another-fix-for-setup-busc-x86-merge
2005-07-06 18:22:15.0 -0700
+++ devel-akpm/drivers/pci/setup-bus.c 2005-07-06 18:22:15.0 -0700
@@ -74,6 +74,7 @@ pbus_assign_resources_sorted(struct pci_
idx = res - list-dev-resource[0
-akpm/drivers/net/wireless/ipw2200.h2005-07-06
18:43:23.0 -0700
@@ -45,6 +45,8 @@
#include linux/firmware.h
#include linux/wireless.h
+#include linux/dma-mapping.h
+
#include asm/io.h
#include net/ieee80211.h
_
-
To unsubscribe from this list: send the line unsubscribe mm
/sparc64/solaris/timod.c~files-sparc64-fix-2
arch/sparc64/solaris/timod.c
--- devel/arch/sparc64/solaris/timod.c~files-sparc64-fix-2 2005-07-07
00:06:51.0 -0700
+++ devel-akpm/arch/sparc64/solaris/timod.c 2005-07-07 00:06:51.0
-0700
@@ -143,9 +143,11 @@ static struct T_primsg
:05.0 -0700
+++ devel-akpm/fs/exec.c2005-07-07 02:15:05.0 -0700
@@ -642,6 +642,19 @@ static inline int de_thread(struct task_
count = 2;
if (thread_group_leader(current))
count = 1;
+ else {
+ /*
+* The SIGALRM
drivers/char/ip2/i2lib.c~drivers-char-ip2-i2libc-replace-direct-assignment-with-set_current_state
drivers/char/ip2/i2lib.c
---
25/drivers/char/ip2/i2lib.c~drivers-char-ip2-i2libc-replace-direct-assignment-with-set_current_state
Fri Jul 8 16:14:04 2005
+++ 25-akpm/drivers/char/ip2/i2lib.c
Fri Jul 8 16:40:32 2005
+++ 25-akpm/include/linux/swap.hFri Jul 8 16:40:32 2005
@@ -7,6 +7,8 @@
#include linux/mmzone.h
#include linux/list.h
#include linux/sched.h
+#Include linux/pagemap.h
+
#include asm/atomic.h
#include asm/page.h
_
-
To unsubscribe from this list: send the line
-races
Fri Jul 8 16:45:32 2005
+++ 25-akpm/drivers/md/dm-mpath.c Fri Jul 8 16:45:32 2005
@@ -63,6 +63,7 @@ struct multipath {
unsigned nr_priority_groups;
struct list_head priority_groups;
unsigned pg_init_required; /* pg_init needs calling
-multipath-flush-workqueue-when-destroying
Fri Jul 8 16:45:28 2005
+++ 25-akpm/drivers/md/dm-mpath.c Fri Jul 8 16:45:28 2005
@@ -752,6 +752,8 @@ static int multipath_ctr(struct dm_targe
static void multipath_dtr(struct dm_target *ti)
{
struct multipath *m = (struct multipath *) ti
2005-07-08
22:34:39.0 -0700
+++ devel-akpm/mm/swapfile.c2005-07-08 22:34:39.0 -0700
@@ -1008,8 +1008,9 @@ reprobe:
}
ret = 0;
if (page_no == 0)
- ret = -EINVAL;
+ page_no = 1;/* force Empty message */
sis-max
-akpm/include/linux/swap.h 2005-07-08 22:34:44.0 -0700
@@ -115,8 +115,6 @@ enum {
/*
* The in-memory structure used to track swap areas.
- * extent_list.prev points at the lowest-index extent. That list is
- * sorted.
*/
struct swap_info_struct {
unsigned int flags;
diff
(-)
diff -puN mm/swapfile.c~swap-freeing-update-swap_listnext mm/swapfile.c
--- devel/mm/swapfile.c~swap-freeing-update-swap_listnext 2005-07-08
22:34:50.0 -0700
+++ devel-akpm/mm/swapfile.c2005-07-08 22:34:50.0 -0700
@@ -215,8 +215,6 @@ static struct swap_info_struct
-replace-listdevice
2005-07-08 22:35:00.0 -0700
+++ devel-akpm/Documentation/vm/locking 2005-07-08 22:35:00.0 -0700
@@ -83,19 +83,18 @@ single address space optimization, so th
vmtruncate) does not lose sending ipi's to cloned threads that might
be spawned underneath it and go
changed, 21 insertions(+), 30 deletions(-)
diff -puN drivers/media/video/ir-kbd-i2c.c~v4l-bttv-input
drivers/media/video/ir-kbd-i2c.c
--- devel/drivers/media/video/ir-kbd-i2c.c~v4l-bttv-input 2005-07-08
22:38:24.0 -0700
+++ devel-akpm/drivers/media/video/ir-kbd-i2c.c 2005-07-08 22:38
-message-fixMon Jul
11 15:25:37 2005
+++ 25-akpm/scripts/kconfig/kxgettext.c Mon Jul 11 15:25:37 2005
@@ -179,7 +179,11 @@ static void message__print_file_lineno(s
{
struct file_line *fl = self-files;
- printf(\n#: %s:%d, fl-file, fl-lineno);
+ putchar('\n
Documentation/kernel-parameters.txt~documentation-kernel-parameterstxt-fix-a-typo
Documentation/kernel-parameters.txt
---
25/Documentation/kernel-parameters.txt~documentation-kernel-parameterstxt-fix-a-typo
Mon Jul 11 15:11:45 2005
+++ 25-akpm/Documentation/kernel-parameters.txt Mon Jul 11 15:11
-irqs-patch-update Mon Jul
11 15:19:20 2005
+++ 25-akpm/arch/i386/kernel/mpparse.c Mon Jul 11 15:19:20 2005
@@ -1116,7 +1116,15 @@ int mp_register_gsi (u32 gsi, int edge_l
*/
int irq = gsi;
if (gsi MAX_GSI_NUM) {
- gsi
-for-buffer-lock fs/buffer.c
--- 25/fs/buffer.c~make-ll_rw_block-wait-for-buffer-lockMon Jul 11
16:31:50 2005
+++ 25-akpm/fs/buffer.c Mon Jul 11 16:31:50 2005
@@ -917,8 +917,7 @@ static int fsync_buffers_list(spinlock_t
* contents - it is a noop if I/O is still
-akpm/fs/ufs/balloc.c Mon Jul 11 16:31:56 2005
@@ -114,8 +114,7 @@ void ufs_free_fragments (struct inode *
ubh_mark_buffer_dirty (USPI_UBH);
ubh_mark_buffer_dirty (UCPI_UBH);
if (sb-s_flags MS_SYNCHRONOUS) {
- ubh_wait_on_buffer (UCPI_UBH
--
1 files changed, 24 insertions(+), 10 deletions(-)
diff -puN fs/jbd/commit.c~fix-jbd-race-in-t_forget-list-handling fs/jbd/commit.c
--- 25/fs/jbd/commit.c~fix-jbd-race-in-t_forget-list-handling Mon Jul 11
16:31:48 2005
+++ 25-akpm/fs/jbd/commit.c Mon Jul 11
deletions(-)
diff -puN fs/hfsplus/super.c~change-hfs-to-not-use-ll_rw_block
fs/hfsplus/super.c
--- 25/fs/hfsplus/super.c~change-hfs-to-not-use-ll_rw_block Mon Jul 11
16:31:58 2005
+++ 25-akpm/fs/hfsplus/super.c Mon Jul 11 16:31:58 2005
@@ -217,8 +217,7 @@ static void hfsplus_put_super(struct sup
--
2 files changed, 181 insertions(+), 125 deletions(-)
diff -puN drivers/s390/char/tape_core.c~s390-channel-tape-fixes
drivers/s390/char/tape_core.c
--- 25/drivers/s390/char/tape_core.c~s390-channel-tape-fixesMon Jul 11
16:37:32 2005
+++ 25-akpm/drivers
insertions(+), 193 deletions(-)
diff -puN arch/s390/kernel/head64.S~s390-spin-lock-retry
arch/s390/kernel/head64.S
--- 25/arch/s390/kernel/head64.S~s390-spin-lock-retry Mon Jul 11 16:37:17 2005
+++ 25-akpm/arch/s390/kernel/head64.S Mon Jul 11 16:37:17 2005
@@ -658,10 +658,8 @@ startup:basr %r13,0
/kernel/head.S |7 ++-
1 files changed, 6 insertions(+), 1 deletion(-)
diff -puN arch/s390/kernel/head.S~s390-31-bit-memory-size-limit
arch/s390/kernel/head.S
--- 25/arch/s390/kernel/head.S~s390-31-bit-memory-size-limitMon Jul 11
16:37:34 2005
+++ 25-akpm/arch/s390/kernel/head.S
-of-users-send-wr_id-in-mad
Mon Jul 11 17:06:21 2005
+++ 25-akpm/drivers/infiniband/core/mad.c Mon Jul 11 17:06:21 2005
@@ -847,9 +847,8 @@ static int ib_send_mad(struct ib_mad_age
unsigned long flags;
int ret;
- /* Replace user's WR ID with our own to find WR upon
Morton [EMAIL PROTECTED]
---
drivers/infiniband/include/ib_cm.h | 568 +
1 files changed, 568 insertions(+)
diff -puN /dev/null drivers/infiniband/include/ib_cm.h
--- /dev/null Thu Apr 11 07:25:15 2002
+++ 25-akpm/drivers/infiniband/include/ib_cm.h Mon Jul 11 17
]
---
Documentation/infiniband/core_locking.txt | 114 ++
1 files changed, 114 insertions(+)
diff -puN /dev/null Documentation/infiniband/core_locking.txt
--- /dev/null Thu Apr 11 07:25:15 2002
+++ 25-akpm/Documentation/infiniband/core_locking.txt Mon Jul 11 17:07:09 2005
-add-service-record-support-to-sa-client
Mon Jul 11 17:06:51 2005
+++ 25-akpm/drivers/infiniband/core/sa_query.c Mon Jul 11 17:06:51 2005
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2004 Topspin Communications. All rights reserved.
+ * Copyright (c) 2005 Voltaire, Inc. All rights reserved
insertions(+), 9 deletions(-)
diff -puN
drivers/infiniband/core/verbs.c~ib-add-ib_create_ah_from_wc-to-ib-verbs
drivers/infiniband/core/verbs.c
--- 25/drivers/infiniband/core/verbs.c~ib-add-ib_create_ah_from_wc-to-ib-verbs
Mon Jul 11 17:06:43 2005
+++ 25-akpm/drivers/infiniband/core/verbs.c
Mon Jul 11 17:06:59 2005
+++ 25-akpm/drivers/infiniband/core/user_mad.c Mon Jul 11 17:06:59 2005
@@ -1,5 +1,7 @@
/*
* Copyright (c) 2004 Topspin Communications. All rights reserved.
+ * Copyright (c) 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2005 Sun Microsystems, Inc
~ib-user-mad-abi-changes-to-support-rmpp
Mon Jul 11 17:06:57 2005
+++ 25-akpm/Documentation/infiniband/user_mad.txt Mon Jul 11 17:06:57 2005
@@ -28,13 +28,37 @@ Creating MAD agents
Receiving MADs
- MADs are received using read(). The buffer passed to read() must be
- large enough
17:07:05 2005
+++ 25-akpm/drivers/infiniband/core/MakefileMon Jul 11 17:07:05 2005
@@ -1,7 +1,7 @@
EXTRA_CFLAGS += -Idrivers/infiniband/include
obj-$(CONFIG_INFINIBAND) +=ib_core.o ib_mad.o ib_sa.o \
- ib_cm.o ib_umad.o
]
Signed-off-by: Andrew Morton [EMAIL PROTECTED]
---
drivers/infiniband/include/ib_user_cm.h | 328
1 files changed, 328 insertions(+)
diff -puN /dev/null drivers/infiniband/include/ib_user_cm.h
--- /dev/null Thu Apr 11 07:25:15 2002
+++ 25-akpm/drivers/infiniband
-rmpp-implementation
drivers/infiniband/core/mad.c
--- 25/drivers/infiniband/core/mad.c~ib-add-rmpp-implementation Mon Jul 11
17:06:49 2005
+++ 25-akpm/drivers/infiniband/core/mad.c Mon Jul 11 17:06:49 2005
@@ -1,5 +1,7 @@
/*
* Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved
deletions(-)
diff -puN drivers/infiniband/core/mad.c~ib-change-ib_mad_send_wr_private-struct
drivers/infiniband/core/mad.c
--- 25/drivers/infiniband/core/mad.c~ib-change-ib_mad_send_wr_private-struct
Mon Jul 11 17:06:23 2005
+++ 25-akpm/drivers/infiniband/core/mad.c Mon Jul 11 17:06:23 2005
/infiniband/core/mad.c~ib-add-mad-helper-functionsMon Jul
11 17:06:17 2005
+++ 25-akpm/drivers/infiniband/core/mad.c Mon Jul 11 17:06:17 2005
@@ -763,6 +763,82 @@ out:
return ret;
}
+static int get_buf_length(int hdr_len, int data_len)
+{
+ int seg_size, pad
+--
1 files changed, 1 insertion(+), 2 deletions(-)
diff -puN drivers/infiniband/core/mad.c~ib-simplify-calling-of-list_del-in-mad
drivers/infiniband/core/mad.c
--- 25/drivers/infiniband/core/mad.c~ib-simplify-calling-of-list_del-in-mad
Mon Jul 11 17:06:33 2005
+++ 25-akpm/drivers/infiniband
/mad_priv.h |1 +
2 files changed, 13 insertions(+), 2 deletions(-)
diff -puN drivers/infiniband/core/mad.c~ib-fix-timeout-cancelled-mad-handling
drivers/infiniband/core/mad.c
--- 25/drivers/infiniband/core/mad.c~ib-fix-timeout-cancelled-mad-handling
Mon Jul 11 17:06:25 2005
+++ 25-akpm
|1 +
5 files changed, 24 insertions(+), 40 deletions(-)
diff -puN drivers/infiniband/core/agent.c~ib-update-mad-client-api
drivers/infiniband/core/agent.c
--- 25/drivers/infiniband/core/agent.c~ib-update-mad-client-api Mon Jul 11
17:06:15 2005
+++ 25-akpm/drivers/infiniband/core/agent.c Mon
]
---
drivers/md/dm.c | 17 ++---
1 files changed, 6 insertions(+), 11 deletions(-)
diff -puN drivers/md/dm.c~device-mapper-fix-deadlocks-in-core drivers/md/dm.c
--- 25/drivers/md/dm.c~device-mapper-fix-deadlocks-in-core Mon Jul 11
17:23:27 2005
+++ 25-akpm/drivers/md/dm.c
/pcmcia/yenta_socket.c~yenta-allocate-resource-fixes Mon Jul
11 17:25:47 2005
+++ 25-akpm/drivers/pcmcia/yenta_socket.c Mon Jul 11 17:25:47 2005
@@ -591,24 +591,87 @@ static int yenta_sock_suspend(struct pcm
* Use an adaptive allocation for the memory resource,
* sometimes the memory
-deadlocks-in-core-prep
drivers/md/dm.c
--- 25/drivers/md/dm.c~device-mapper-fix-deadlocks-in-core-prep Mon Jul 11
17:23:24 2005
+++ 25-akpm/drivers/md/dm.c Mon Jul 11 17:23:24 2005
@@ -610,7 +610,7 @@ static int dm_flush_all(request_queue_t
int ret = -ENXIO;
if (map
--- 25/drivers/pcmcia/ds.c~pcmcia-reduce-dsc-stack-footprintMon Jul 11
17:25:40 2005
+++ 25-akpm/drivers/pcmcia/ds.c Mon Jul 11 17:25:40 2005
@@ -424,9 +424,13 @@ static int pcmcia_device_query(struct pc
{
cistpl_manfid_t manf_id;
cistpl_funcid_t func_id;
- cistpl_vers_1_t
| 14 ++
20 files changed, 81 insertions(+), 81 deletions(-)
diff -puN drivers/base/power/resume.c~add-type-checking-to-pm_message_t
drivers/base/power/resume.c
--- 25/drivers/base/power/resume.c~add-type-checking-to-pm_message_tMon Jul
11 17:16:29 2005
+++ 25-akpm/drivers
Mon Jul 11 17:28:12 2005
+++ 25-akpm/arch/xtensa/kernel/traps.c Mon Jul 11 17:28:28 2005
@@ -29,6 +29,7 @@
#include linux/module.h
#include linux/stringify.h
#include linux/kallsyms.h
+#include linux/delay.h
#include asm/ptrace.h
#include asm/timex.h
@@ -488,8 +489,7 @@ void die(const char
/dvb/frontends/lgdt3302.c~dvb-lgdt3302-qam256-initialization-fix
2005-07-11 18:48:04.0 -0700
+++ devel-akpm/drivers/media/dvb/frontends/lgdt3302.c 2005-07-11
18:48:04.0 -0700
@@ -1,6 +1,4 @@
/*
- * $Id: lgdt3302.c,v 1.5 2005/07/07 03:47:15 mkrufky Exp $
- *
*Support
-to-pm_message_t-pci-fix
2005-07-11 19:19:50.0 -0700
+++ devel-akpm/drivers/pci/pci.c2005-07-11 19:19:50.0 -0700
@@ -331,13 +331,13 @@ pci_power_t pci_choose_state(struct pci_
if (platform_pci_choose_state) {
ret = platform_pci_choose_state(dev, state
-to-pm_message_t-pci-tidy
include/linux/pm.h
--- devel/include/linux/pm.h~add-type-checking-to-pm_message_t-pci-tidy
2005-07-11 19:21:38.0 -0700
+++ devel-akpm/include/linux/pm.h 2005-07-11 19:22:46.0 -0700
@@ -213,9 +213,9 @@ typedef struct pm_message {
#define PM_EVENT_FREEZE 1
drivers/acpi/pci_link.c
--- devel/drivers/acpi/pci_link.c~pci_link-pm_message_t-fix 2005-07-11
19:27:55.0 -0700
+++ devel-akpm/drivers/acpi/pci_link.c 2005-07-11 19:28:19.0 -0700
@@ -719,10 +719,7 @@ end:
return_VALUE(result);
}
-static int
-irqrouter_suspend
+
1 files changed, 5 insertions(+)
diff -puN fs/ext3/xattr.h~ext3-enable-atomic-inode-security-labeling-fix
fs/ext3/xattr.h
--- devel/fs/ext3/xattr.h~ext3-enable-atomic-inode-security-labeling-fix
2005-07-11 19:37:49.0 -0700
+++ devel-akpm/fs/ext3/xattr.h 2005-07-11 19:37
/xattr.h~ext2-enable-atomic-inode-security-labeling-fix
fs/ext2/xattr.h
--- devel/fs/ext2/xattr.h~ext2-enable-atomic-inode-security-labeling-fix
2005-07-11 19:36:42.0 -0700
+++ devel-akpm/fs/ext2/xattr.h 2005-07-11 19:36:42.0 -0700
@@ -78,6 +78,11 @@ extern struct
-initialization-fix-fix
drivers/media/dvb/frontends/lgdt3302.c
---
devel/drivers/media/dvb/frontends/lgdt3302.c~dvb-lgdt3302-qam256-initialization-fix-fix
2005-07-11 20:51:45.0 -0700
+++ devel-akpm/drivers/media/dvb/frontends/lgdt3302.c 2005-07-11
20:51:45.0 -0700
@@ -222,6 +222,8
/aty128fb.c~add-type-checking-to-pm_message_t-aty-fix
2005-07-11 21:01:11.0 -0700
+++ devel-akpm/drivers/video/aty/aty128fb.c 2005-07-11 21:02:17.0
-0700
@@ -2333,7 +2333,8 @@ static int aty128_pci_suspend(struct pci
state = 2;
#endif /* CONFIG_PPC_PMAC
The patch titled
add-type-checking-to-pm_message_t-tuner-core-fix
has been added to the -mm tree. Its filename is
add-type-checking-to-pm_message_t-tuner-core-fix.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
name_to_dev_t-warning-fix.patch
-
1 files changed, 8 insertions(+), 1 deletion(-)
diff -puN fs/ext2/xattr.h~ext2-enable-atomic-inode-security-labeling-fix
fs/ext2/xattr.h
--- 25/fs/ext2/xattr.h~ext2-enable-atomic-inode-security-labeling-fix
2005-07-12 05:02:43.0 -0600
+++ 25-akpm/fs/ext2/xattr.h 2005-07-12
2005-07-12 02:56:22.0 -0700
+++ devel-akpm/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c 2005-07-12
02:56:22.0 -0700
@@ -175,7 +175,7 @@ static int dvb_usb_fe_sleep(struct dvb_f
int dvb_usb_fe_init(struct dvb_usb_device* d)
{
if (d-props.frontend_attach == NULL
deletion(-)
diff -puN fs/aio.c~aio-add-enosys-into-sys_io_cancel fs/aio.c
--- devel/fs/aio.c~aio-add-enosys-into-sys_io_cancel2005-07-12
12:57:44.0 -0700
+++ devel-akpm/fs/aio.c 2005-07-12 12:57:44.0 -0700
@@ -1669,7 +1669,7 @@ asmlinkage long sys_io_cancel(aio_contex
|6 ++
1 files changed, 6 insertions(+)
diff -puN drivers/md/dm-table.c~device-mapper-fix-deadlocks-in-core-prep-fix
drivers/md/dm-table.c
--- devel/drivers/md/dm-table.c~device-mapper-fix-deadlocks-in-core-prep-fix
2005-07-12 14:37:00.0 -0700
+++ devel-akpm/drivers/md/dm
-puN
arch/i386/kernel/cpu/mtrr/main.c~pm_message_t-vs-u32-confusion-warnings-fixed
arch/i386/kernel/cpu/mtrr/main.c
---
devel/arch/i386/kernel/cpu/mtrr/main.c~pm_message_t-vs-u32-confusion-warnings-fixed
2005-07-12 15:02:10.0 -0700
+++ devel-akpm/arch/i386/kernel/cpu/mtrr/main.c 2005-07-12
/null 2003-09-15 06:40:47.0 -0700
+++ devel-akpm/Documentation/input/appletouch.txt 2005-07-12
15:08:42.0 -0700
@@ -0,0 +1,84 @@
+Apple Touchpad Driver (appletouch)
+--
+ Copyright (C) 2005 Stelian Pop [EMAIL PROTECTED]
+
+appletouch
/cpu_setup_power4.S~ppc64-add-970mp-pvr
2005-07-12 15:11:04.0 -0700
+++ devel-akpm/arch/ppc64/kernel/cpu_setup_power4.S 2005-07-12
15:11:04.0 -0700
@@ -31,10 +31,13 @@ _GLOBAL(__970_cpu_preinit)
*/
mfspr r0,SPRN_PVR
srwir0,r0,16
- cmpwi cr0
| 10 ++
3 files changed, 50 insertions(+), 2 deletions(-)
diff -puN arch/s390/kernel/compat_linux.c~s390-fadvise-hint-values
arch/s390/kernel/compat_linux.c
--- devel/arch/s390/kernel/compat_linux.c~s390-fadvise-hint-values
2005-07-12 15:09:57.0 -0700
+++ devel-akpm
]
---
mm/shmem.c |1 +
1 files changed, 1 insertion(+)
diff -puN mm/shmem.c~update-filesystems-for-new-delete_inode-behavior-fix
mm/shmem.c
--- devel/mm/shmem.c~update-filesystems-for-new-delete_inode-behavior-fix
2005-07-12 15:16:05.0 -0700
+++ devel-akpm/mm/shmem.c 2005-07
-nfsi-flags-into-two-fields fs/nfs/dir.c
--- devel/fs/nfs/dir.c~nfs-split-nfsi-flags-into-two-fields 2005-07-12
15:24:50.0 -0700
+++ devel-akpm/fs/nfs/dir.c 2005-07-12 15:24:50.0 -0700
@@ -189,7 +189,7 @@ int nfs_readdir_filler(nfs_readdir_descr
goto error
-bitops-to-manipulate-flags-in-nfsi-flags
fs/nfs/dir.c
--- devel/fs/nfs/dir.c~nfs-use-atomic-bitops-to-manipulate-flags-in-nfsi-flags
2005-07-12 15:25:00.0 -0700
+++ devel-akpm/fs/nfs/dir.c 2005-07-12 15:25:00.0 -0700
@@ -182,7 +182,7 @@ int nfs_readdir_filler(nfs_readdir_descr
+++ devel-akpm/drivers/net/acenic.c 2005-07-12 15:21:38.0 -0700
@@ -53,7 +53,6 @@
#include linux/config.h
#include linux/module.h
#include linux/moduleparam.h
-#include linux/version.h
#include linux/types.h
#include linux/errno.h
#include linux/ioport.h
@@ -164,12 +163,6
-0700
+++ devel-akpm/arch/cris/arch-v32/drivers/nandflash.c 2005-07-12
15:21:48.0 -0700
@@ -14,7 +14,6 @@
*
*/
-#include linux/version.h
#include linux/slab.h
#include linux/init.h
#include linux/module.h
diff -puN
arch/cris/arch-v32/drivers/pcf8563.c~remove-linux-versionh
-0700
+++ devel-akpm/drivers/scsi/aic7xxx/aic79xx_core.c 2005-07-12
15:26:40.0 -0700
@@ -56,7 +56,7 @@
struct ahd_softc_tailq ahd_tailq = TAILQ_HEAD_INITIALIZER(ahd_tailq);
/* Lookup Tables
**/
-char *ahd_chip_names
insertion(+), 481 deletions(-)
diff -puN
drivers/scsi/arcmsr/arcmsr.c~remove-linux-versionh-from-drivers-scsi-for-mm
drivers/scsi/arcmsr/arcmsr.c
---
devel/drivers/scsi/arcmsr/arcmsr.c~remove-linux-versionh-from-drivers-scsi-for-mm
2005-07-12 15:21:52.0 -0700
+++ devel-akpm/drivers/scsi
files changed, 3 deletions(-)
diff -puN net/ieee80211/ieee80211_module.c~net-ieee80211-remove-pcih-includes
net/ieee80211/ieee80211_module.c
--- devel/net/ieee80211/ieee80211_module.c~net-ieee80211-remove-pcih-includes
2005-07-12 15:27:38.0 -0700
+++ devel-akpm/net/ieee80211
/platforms/pmac_pic.c
--- devel/arch/ppc/platforms/pmac_pic.c~more-u32-vs-pm_message_t-fixes-2
2005-07-12 16:21:31.0 -0700
+++ devel-akpm/arch/ppc/platforms/pmac_pic.c2005-07-12 16:21:31.0
-0700
@@ -619,7 +619,7 @@ not_found:
return viaint;
}
-static int
/reiserfs/item_ops.c~reiserfs-fix-up-case-where-indent-misreads-the-code
2005-07-12 16:24:17.0 -0700
+++ devel-akpm/fs/reiserfs/item_ops.c 2005-07-12 16:24:17.0 -0700
@@ -772,7 +772,7 @@ static struct item_operations errcatch_o
//
//
#if ! (TYPE_STAT_DATA == 0 TYPE_INDIRECT
-pid-numa_maps-to-show-on-which-nodes-pages-reside-tidy
fs/proc/task_mmu.c
---
devel/fs/proc/task_mmu.c~proc-pid-numa_maps-to-show-on-which-nodes-pages-reside-tidy
2005-07-12 17:17:18.0 -0700
+++ devel-akpm/fs/proc/task_mmu.c 2005-07-12 17:17:18.0 -0700
@@ -249,7
(-)
diff -puN fs/proc/base.c~proc-pid-numa_maps-to-show-on-which-nodes-pages-reside
fs/proc/base.c
--- devel/fs/proc/base.c~proc-pid-numa_maps-to-show-on-which-nodes-pages-reside
2005-07-12 17:12:08.0 -0700
+++ devel-akpm/fs/proc/base.c 2005-07-12 17:12:08.0 -0700
@@ -65,6 +65,7
+++ devel-akpm/arch/ia64/kernel/kprobes.c 2005-07-12 19:00:22.0
-0700
@@ -545,6 +545,38 @@ static void prepare_ss(struct kprobe *p,
ia64_psr(regs)-ss = 1;
}
+static int __kprobes is_ia64_break_inst(struct pt_regs *regs)
+{
+ unsigned int slot = ia64_psr(regs)-ri
+++ devel-akpm/arch/ia64/kernel/kprobes.c 2005-07-12 22:00:00.0
-0700
@@ -545,6 +545,38 @@ static void prepare_ss(struct kprobe *p,
ia64_psr(regs)-ss = 1;
}
+static int is_ia64_break_inst(struct pt_regs *regs)
+{
+ unsigned int slot = ia64_psr(regs)-ri;
+ unsigned
:39.0 -0700
+++ devel-akpm/arch/sparc64/kernel/kprobes.c2005-07-12 22:50:39.0
-0700
@@ -8,6 +8,7 @@
#include linux/kprobes.h
#include asm/kdebug.h
#include asm/signal.h
+#include asm/cacheflush.h
/* We do not have hardware single-stepping on sparc64.
* So we implement software
insertions(+), 25 deletions(-)
diff -puN
arch/i386/kernel/entry.S~kprobes-prevent-possible-race-conditions-i386-changes
arch/i386/kernel/entry.S
---
devel/arch/i386/kernel/entry.S~kprobes-prevent-possible-race-conditions-i386-changes
2005-07-12 22:50:30.0 -0700
+++ devel-akpm/arch/i386
-0700
+++ devel-akpm/arch/x86_64/kernel/entry.S 2005-07-12 22:50:33.0
-0700
@@ -784,8 +784,9 @@ ENTRY(execve)
ret
CFI_ENDPROC
-ENTRY(page_fault)
+KPROBE_ENTRY(page_fault)
errorentry do_page_fault
+ .previous .text
ENTRY(coprocessor_error
-07-12 22:50:35.0 -0700
+++ devel-akpm/arch/ppc64/kernel/kprobes.c 2005-07-12 22:50:35.0
-0700
@@ -44,7 +44,7 @@ static struct kprobe *kprobe_prev;
static unsigned long kprobe_status_prev, kprobe_saved_msr_prev;
static struct pt_regs jprobe_saved_regs;
-int
1 - 100 of 30738 matches
Mail list logo