into samba.org:/scratch/anton/tmp3

into samba.org:/scratch/anton/tmp3

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

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

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

While there is a separate driver for 2104x tulips (CONFIG_DE2104X),
drivers/net/tulip/Kconfig states that CONFIG_TULIP also supports
2104x tulips. This is not the case since that support was removed
in December 2001. A user with an old tulip may thus be tricked into
configuring the wrong driver. (I was, on my PMac 4400.)

The patch below removes this misinformation from tulip's Kconfig.

(pulled change from 2.4)

the second patch:
replaces busy_loop with a simple macro doing a schedule_timeout. busy_loop was never
called from interrupt conext anyway, so no need for that. and the sti() is gone.

rgds
-daniel

hi

this patch does:
- net_device is no longer allocated as part of the driver's private structure,
  instead it's allocated via alloc_netdev
- xirc2ps_detach calls xirc2ps_release if necessary (like the other drivers)

against 2.5.70-bk.

rgds
-daniel

drivers/net/pcnet32.c: In function `pcnet32_init_ring':
drivers/net/pcnet32.c:1006: warning: comparison between pointer and integer

According to a report the my_inet_aton code in bond_main.c is copied
from 4.4BSD, but it doesn't carry a BSD copyright license. In addition
it is somewhat redundant with the standard in_aton.  Convert it
to use the linux function.

Error handling is a bit worse than before, but not much.

Patch for 2.5 bonding. The 2.4 version has the same problem, but afaik
it is scheduled to be replaced by the 2.5 codebase anyways.

-Andi

1) Use unsigned long for types holding jiffies.
2) Use size_t for read/write buffer lengths.
3) Use proper printf format string for size_t.

into groveronline.com:/root/bk/linux-acpi

- Fix To/FromBCD, eliminating the need for an arch-specific #define
- Do not acquire a semaphore in the S5 shutdown path
- Fix ex_digits_needed for 0 (Takayoshi Kochi)
- Fix sleep/stall code reversal (Andi Kleen)
- Revert a change having to do with control method calling semantics

1) Use proper size_t printf format specifier
2) Cast pointers properly when passing them to hashfind
3) Print pointers using proper printf format specifier
   instead of using ugly casts.

1) Do not pass NULL into cpu_to_le32(), use plain zero.
2) When storing DMA addresses to SCp.ptr, cast to ulong.

1) Use proper size_t printf format specifier.
2) Eliminate non-portable struct pointer casts
   used to calculate DMA structure offsets.

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

init_thread_union doesn't need to be exported to modules.

We haven't exported the symbol on ia64 for ages, and we should be able
to make the init_thread_union local to arch/ARCH/kernel/init_task.c and
that in turn would let us remove its declaration from
include/linux/sched.h altogether (i.e., no more ugly #ifdefs).

Trivial addition needed for the hp Itanium machines.

into samba.org:/scratch/anton/tmp3

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

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

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