From Jay Estabrook:
> Here's a real short one that fixes a GENERIC build problem introduced
> in pre2, and finalizes the SABLE/LYNX support setting of HAE-4, making
> X servers finally work on those platforms.

into are.twiddle.net:/home/rth/BK/axp-2.5

hwif->udma_four is always preset to 0

Make the IDE driver return the proper status return
for unhandled interrupts.

- do not enable TCQ in ide_init_drive(), its too early
- enable TCQ in __ide_dma_on() only if CONFIG_BLK_DEV_IDE_TCQ_DEFAULT=y
- try to enable TCQ only on disk drives
- correct check for two drives on one channel

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

This patch moves all the duplicated cdrom Kconfig bits from arch/*/Kconfig
to drivers/cdrom/Kconfig

Add return statement to tty init function of 3215 driver.

Fix typos.

Pass correct argument to SET_MODULE_OWNER.

- Simplify long busy condition handling, add quiesce/resume ioctl.
- Add sense data area to reserve/release/steal_lock ccw-chains.

- Make ccwgroup online attribute consistent with ccw online attribute.
- Add link incident record handling to channel subsystem code.
- Do path grouping only if the device driver explicitly requests it.
- Fix multicast or broadcast flood ping hand on HiperSockets.

- Add missing includes to compat_ioctl.c.
- Fix 32 bit emulation of sys_settimeofday.

- Remove unused variables from smp.c.
- Reserve system call number 110 for sys_lookup_dcache.
- Fix show_trace.
- Remove superfluous asm include file.
- Add statfs64 structure.

into home.osdl.org:/home/torvalds/v2.5/linux

In general, it is more better to use get_cpu_var() and __get_cpu_var()
to access per-cpu variables on this CPU than to use smp_processor_id()
and per_cpu().  In the current default implemention they are equivalent,
but on IA64 the former is already faster, and other archs will follow.

Make the ROMfs copy in the startup code for NETtel/5272 board
conditional on actually using a ROMfs setup.

Make the ROMfs copy in the startup code for Motorola/M5206eLITE board
conditional on actually using a ROMfs setup.

Fix the m68knommu version of show_stack(). It expects the task as an
argument.

Architectures using the generic 32/64-bit ioctl() compatibility shims
will get a link error if CONFIG_VT is not defined, since the
compatbility ioctl() code calls functions in drivers/char/vt.c which
is only included in the build if CONFIG_VT is set.

This fixes the compile with a couple of #ifdefs:

This patch is to 2.5.73-bk4 and is purely cosmetic.  Please apply.
It removes the blank line after "testing the IO APIC....":

Call refrigerator() in svc_recv, so it is there for nfsd and
no longer needed explicitly in lockd.

Already defined in state.h

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>

sorry. i forgot to lock the nfsv4 state in nfsd4_read, nfsd4_write, and
nfsd4_setattr.

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>

this patch adds share state processing to nfsd4_setattr().

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>

this patch adds share state processing to nfsd4_write().

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>

this patch adds share state processing to nfsd4_read().

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>

Add the opendowngrade call with share state processing. it includes
nfs4_preprocess_stateid_op() which will be used in read and write
state processing.

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>

Add share state processing to nfsd4_close. it includes some more
debug counters.

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>

Add OPEN_CONFIRM functionality to the nfsv4 server, including a
preprocess_seqid_op function that will be used in subsequent patches.

this was need for paths, but now we have seq_path...