First hunk is unexplained.
Second hunk had the 2.4 changeset comment 'fix warnings'

This made it into 2.4, and aparently fixes
a problem with some tape devices.

>From 2.4

Hello, I work on the Sun StorEdge[tm] arrays for Sun Microsystems, Inc.
As part of my testing of Linux, the attached changes are needed to enable
Sparse LUN support for Sun StorEdge[tm] arrays.

James' scsi tree already contains an big update to wd33c93 that will make
integrating pc980155 a lot easier - it will hopefully appear in 2.5.63.

I've done some more work on the bios parameter stuff, this is the patch
I came up with, James can you merge it into the linux-scsi tree?  It just
adds a new file for pc98-style bios geometry to the scsi core.

Data direction is now provided by the SCSI mid-layer

I had some discussion with Ben Collins on ow to properly allow
hotplugging of ieee1394 storage device (sbp2).  While the scsi_add_host/
scsi_remove_host interface allows hotpluging of ieee1394 adapters we
need a way to register the actual devices with the scsi layer when
they're plugged in.  I've restructured the code to handle the
/proc/scsi/scsi code to add/remove devices a bit to have an interface
the ieee1394 driver can use, and created the following new interface:

	struct scsi_device *scsi_add_device(struct Scsi_Host *shost,
			uint channel, uint id, uint lun)
	int scsi_remove_device(struct scsi_device *sdev)

in addition scsi_probe_and_add_lun() got some overhaul to become
readable and can now return the struct scsi_device it probed as an
optional argument.

spotted by Matthew Jacob

The PC98 folks have some updates in their tree to make the generic
wd33c93 driver usable in PIO mode, but unfortunately the way they do it
(include a header specific to their lowlevel driver in wd33c93.c
conditionally) is rather ugly.

I reworked it to provide different implementations of the access method
inside wd33c93.c independent of the lowlevel driver.  In addition the
patch contains various patches to actually get the driver compile in 2.5
and a reindent to follow kernel codingstyle (sorry, but the maintainer
hasn't touched it for four years and it made my eyes bleed..)

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

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