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

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

Keyspan/InnoSys approved this change.

Original patch from lucy@innosys.com

Changes include:
     Add support for new USA19H(s) USB Serial Adapter
     Improve handing of config/control messages for all devices

Note that the new adapter doesn't currently require a firmware download.
We will add support for re-programming the eeprom with updated firmware
when new firmware is  required.

into kroah.com:/home/greg/linux/BK/gregkh-2.6

 I'm getting this when compiling USB with all options enabled:

drivers/usb/host/uhci-debug.c:417: warning: `uhci_sprint_schedule' defined but not used

 my suggestion is to put under the #ifdef/#endif the functions which are
only used by the proc ones too. If one of them become necessary when
CONFIG_PROC_FS=n, the #ifdef/#endif for that function can be removed:

When compiling this driver with WRITE_DEBUG defined (for extra debug output),
gcc outputs warnings for three similar printf statements.

The specifier in each printf statement is not totally correct.
This patch removes these warnings.

This patch removes the reference to Documentation/modules.txt,
which has been removed.  The patch was made against the current
2.6-bk tree.

into kroah.com:/home/greg/linux/BK/gregkh-2.6

ide_pci_setup_ports() from setup-pci.c checks if port is disabled, if so
d->init_setup_dma() and d->init_hwif() won't be called.  There is no need
to check it once again inside init_hwif_amd74xx(), init_dma_amd74xx()
and amd74xx_tune_drive() (hwif->tuneproc will be NULL for disabled port).

Therefore remove amd_enabled variable and now unnecessary init_dma_amd74xx().
Also do not set .init_{iops, dma} to NULL in amd74xx.h (amd74xx_chipsets[]
is declared static).  Bump driver's version number to reflect changes.

Almost identical to the previous VIA case.

- common pdc4030_init() for built-in and module
- kill init_pdc4030() and enable_promise_support flag (no longer needed)
- minor cleanups

ide_pci_setup_ports() from setup-pci.c checks if port is disabled, if so
d->init_setup_dma() and d->init_hwif() won't be called.  There is no
need to check it once again inside init_hwif_via82cxxx(),
init_dma_via82cxxx() and via82cxxx_tune_drive() (hwif->tuneproc will be
NULL for disabled port).

Therefore remove via_enabled variable and now unnecessary
init_dma_via82cxx().  Also do not set .init_{iops, dma} to NULL in
via82cxxx.h (via82cxxx_chipsets[] is declared static).  Bump driver's
version number to reflect changes.

Acked by Vojtech

My change to core dumps that was included with the vsyscall DSO
implementation had a bug (braino on my part).  Core dumps don't include the
full page of the vsyscall DSO, and so don't accurately represent the whole
memory image of the process.  This patch fixes it.  I have tested it on
x86, but not tested the same change to 32-bit core dumps on AMD64 (haven't
even compiled on AMD64).

I've also included the corresponding change for the IA64 code that was
copied blindly from the x86 vsyscall implementation, which looks like more
change than it is since I preserved the formatting of the copied code
instead of arbitrarily diddling it along with the trivial symbol name
changes.  I haven't compiled or tested on ia64.

into kernel.bkbits.net:/home/lord/xfs-2.6

SGI Modid: 2.5.x-xfs:slinx:159477a

SGI Modid: 2.5.x-xfs:slinx:159439b

SGI Modid: 2.5.x-xfs:slinx:159439a

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

We do though need an I-cache flush on spitfire chips when
doing a module load.

Happily this allows us to kill off flush_cache_all() from
sparc64.

into mars.ravnborg.org:/home/sam/bk/kbuild

- Error out if specified directory does not exist
- Do not build the kernel three times wheh specifying "defconfig all"
- Removed warning when the target all was specified

into nuts.ninka.net:/disk1/davem/BK/net-2.5

into penguin.americas.sgi.com:/src/lord/bitkeeper/xfs-2.6

Balazs Scheidler pointed out that we can fail to call ip_nat_setup_info
for local NAT, which causes the connection to be added twice. Boom.
Also move the hash table insertion into ip_nat_setup_info.

This patch introduces the /proc/sys/net/ipv4/netfilter/ directory for=20
the tuneable parameters of the conntrack engine of netfilter.

The parameters which can currently be fine-tuned (if required at all)=20
are the ip_conntrack_max, and the conntrack timeout parameters in seconds.

The default timeout value for the TCP CLOSE_WAIT state is raised to 3
days, which should cause less problems with long-lived half-closed TCP
sessions.

For the sake of compatibility with 2.4,=20
/proc/sys/net/ipv4/netfilter/ip_conntrack_max is duplicated as=20
/proc/sys/net/ipv4/ip_conntrack_max as well.

the 25_natcore-nohelper.patch (incorporated in 2.4.22) did actually make
things not better.  If a NAT rule was matched, num_manips can still be 0.
However, some helpers (like PPTP) need to _always mangle the packets,
even if there is no NAT mapping for a particular connection.
On the other hand, as soon as CONFIG_IP_NF_LOCAL_NAT was disabled,
we did end up half-mangling local (non-NAT'ed) connections.  This patch
removes the LOCAL_OUT hook from the NAT core unless CONFIG_IP_NF_NAT_LOCAL
is enabled.