cb_setup_cis_mem doesn't reference the pci device.  Remove this unused
argument.

cb_config() and cb_release() are just simple dummy functions that are
only used in the internals of the PCMCIA code.  We inline them where
used.

into home.transmeta.com:/home/torvalds/v2.5/linux

Fixes a typo in pnp_check_*_conflicts functions.  Without this fix the
resource algorithm will work but will take longer to assign resources.

Also contains some minor reordering in pnp_activate_dev.

Reduces the stack memory usage in the following PnP Functions:
pnp_printf
pnp_set_current_resources
pnp_manual_config_dev
pnp_activate_dev

into kanga.twiddle.net:/home/rth/linux/axp-2.5

Hi Richard.

I noticed you have set -Werror in all alpha architecture
specific makefiles - good initiative. I wish we could do that in general.

But the correct way to alter CFLAGS in kbuild makefiles is to use
EXTRA_CFLAGS.
The following patch fixes this.
You could argue that this is a stylistic issue, but in this way
you follow Documentation/kbuild/makefiles.txt

I stumbled over:
EXTRA_AFLAGS := $(CFLAGS)
I could not realise the purpose with this assignment, and I noticed
that it did not include -Werror, becuse you did hat assignment in
the following line.
Wanted to inform you about it but I see no problem. It is just that
I did not understand it.

In math-emu I see this:
EXTRA_CFLAGS := -Iinclude/math-emu -w
Grepping the src I see no reason to have the -Iinclude/math-emu
Relevant files are prefixed with math-emu (soft-fp, single, double)
I did not fix it, because I cannot compile alpha.

	Sam (the Makefile nitpicker)

===== arch/alpha/kernel/Makefile 1.24 vs edited =====

x86-64 vsyscalls require mapping the sequence number used by
gettimeofday in a magic way, so that userland can access it via
vsyscalls for user space time-of-day access.

Instead of putting the magic into generic code I just allowed to move it
into architecture specific files.

Fix some annoying warnings that happen on x86-64.

 - Predeclare pt_regs in binfmts.h.  For some reason it isn't included
   implicitely there.
 - use unsigned long, not long for interrupt flags in posix-timers.c

This still has a few problems; e.g. posix-timers.c seems to be miscompiled
by many x86-64 compilers when compiled with -O1. But overall it is better
than before.

 - Disable numa again that was enabled by mistake
 - Fix CPU detection in early boot. Force SSE when needed.
 - Hack for nested NMIs.
 - Fix typo in vsyscall code that lead to broken time reporting
 - Merge with 2.5.62-bk4 (new switch_to, printk cleanups, new timer calls etc.)
 - Fix bug in strace - don't assume syscall_trace doesn't clobber %rcx
 - Fix gs load workaround
 - Fix return value of ioperm (found by new LTP test)
 - Remove some unecessary boot output
 - Remove some obsolete code in setup.c
 - Report more in /proc/cpuinfo, fix extended cpu family computation
 - Fix thread_info access from interrupt/exception stacks - this
   fixes many problems that especially showed on SMP (lost reschedule
   interrupts etc.)
 - Fix UP compilation
 - Symlink hugetlbpage.c from i386
 - Fix buggy lazy fpu handling

Older compilers require that automatic variable declarations appear at the
start of a block.

non-exit code.

Instead of detecting when filp->private_data becomes NULL in
do_tty_hangup and check_tty_count, we remove the file descriptor
from the list of descriptors associated with the tty.  We use the
same method that dentry_open() uses.

(It also cleans that up to use a "file_kill()" instead of using a dummy
"kill_list()" that leaves pointers to stale stack entries that are never
used)

In addition, we change the for() loops into real list_for_each()
or list_for_each_entry loops as appropriate.

The patch below removes an unneeded #if from net/ipv6/af_inet6.c:
- kernel 2.0 is too ancient to check for
- the MODULE_* macros have empty definitions #if !MODULE

Move printing the header to s_start, removing the need for the special
pointer value.

into home.transmeta.com:/home/torvalds/v2.5/linux

into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

into samba.org:/scratch/anton/linux-2.5_ppc64_tmp

into samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/sfr

into home.transmeta.com:/home/torvalds/v2.5/linux

into samba.org:/scratch/anton/sfr