into kleikamp.austin.ibm.com:/home/shaggy/bk/resize-2.5

In order for JFS to be able to quiesce the current activity, while
blocking new transactions, the locking needed some rework.  New
transactions are stopped in the functions txBegin or txBeginAnon,
where the rdwrlock (IREAD_LOCK/IWRITE_LOCK) may be held.  Dirty
inodes may need to be committed while new transactions are blocked
here, so another lock is introduced (commit_sem) which is taken after
txBegin/txBeginAnon is called.  This ensures that the proper
serialization takes place, without the write_inode method needing to
grab the rdwrlock.

In addition, the use of IWRITE_LOCK and IREAD_LOCK has been removed
from directory inodes.  The serialization done by the VFS using i_sem
is sufficient to avoid races.

This patch removes JFS's dependency on down_write_trylock.

into kleikamp.austin.ibm.com:/home/shaggy/bk/jfs-2.5

various compilers

This patch removes an artifact of code left over from the 2.0 days when
the kernel didn't use flat segments.

The preceding memcpy() already takes care of the NULL ptr mapping.

Unfortunately, someone changed the inb and friends definitions and
broke ARM.  This patch allows ARM to build NE2000 based drivers
again.

The following patch adds support for CONFIG_GENERIC_ISA_DMA, which went
into the 2.4-ac kernel series prior to 2.5 happening.

The following patch allows architectures to decide whether they want
the generic ISA DMA functionality provided by kernel/dma.c and other
supporting files.

In addition, we move the procfs "/proc/dma" support code out of fs/proc
into kernel/dma.c, and adapt it to use the new seq_file code.

The following patch is required so that munmap(0x8000, *) does not cause
ARM kernels to crash.  The problem is that the machine vectors are at
virtual address 0.  Unfortunately, when free_pgtables() is called, it
clears first level page tables starting at 0 in this case, and takes
out the machine vectors.  This then results in an unrecoverable hang.

We already have FIRST_USER_PGD_NR to define the first entry in the pgd
which may be cleared, so we use this to clamp "start_index"
appropriately.  The following patch does this.  Tested on ARM.

Bitops are used with on the timer_alive variable.  Therefore, timer_alive
needs to be "unsigned long" not "int".

Trivial patch; removes cruft that got left over from the TLB shootdown
changes.  "dir" is never used in zap_page_range

Various modules (eg, rd.c) use simple_strtol.  This patch exports the
symbol so these modules can be loaded.

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

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

This patch (against 2.5.30) contains all of the changes to generic code
needed by UML.

CREDITS -
	Changes my address and adds a UML credit for Lars Brinkoff.

MAINTAINERS -
	Adds a UML entry.

Makefile -
	When ARCH=um is on the command line to do a UML build, the old value
	of ARCH is saved in $(SUBARCH) for the later use of the UML build.

drivers/char/Makefile -
	Sets KEYMAP, KEYBD, CONSOLE empty to prevent hardware drivers from
	being compiled in.

drivers/net/setup.c -
	Backs out a UML hook which leaked into your tree which UML no
	longer uses.

This a preparatory patch which allows UML to avoid changing linux/linkage.h.

It restructures linkage.h so that all of the arch-specific stuff is in
asm-*/linkage.h.  linux/linkage.h is now arch independent.  It should be
functionally unchanged.

Five arches, i386, ia64, sh, m68k, and arm, have non-empty linkage.h files.
The other arch linkage.h files are all empty.

Also, __ALIGN_STR is no longer defined independently of __ALIGN.  It is now
derived by stringizing __ALIGN.

Following a suggestion by Keith Owens, stringify.h was generalized to allow
commas in its argument, linkage.h now includes it, and no longer defines its
own stringify macros.

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

From Rusty.
The old form of designated initializers are obsolete: we need to
replace them with the ISO C forms before 2.6.  Gcc has always supported
both forms anyway.

(rmk - cleaned up spacing to be more reasonable)

From: (via Rusty) Art Haas <ahaas@neosoft.com>
Here are patches for files in fs/adfs. Patches are against 2.5.26.

(rmk - updated for 2.5.30, cleaned up spacing to be more reasonable)

From: (via Rusty) James Mayer <james@cobaltmountain.com>

3c503, hp-plus, smc-ultra, smc-ultra32, wd

Feedback from review by Arjan @ Redhat:
o Cleanup: Removed unneccesary #ifdef/#endif wrappers for features 
  already part of kernel.
o Bug fix: Use kernel funcs pci_[clear|set]_mwi rather than using direct
  calls to pci_write_config_word.
o Bug fix: Added read-behind-write calls to post writes before delays.
o Bug fix: removed calls to mdelay in interrupt context.
o Clean up: removed calls to memset followed by mb() and replaced with
  direct clearing of descriptor bits.

o Bug fix: fixed jumbo frames sized from 1514 to 2048.
o ASF support: disable ARP when driver is loaded or resumed; enable when 
  driver is removed or suspended.
o Bug fix: changed default setting for RxIntDelay to 0 for 82542/3/4
  controllers to workaround h/w errata where controller will hang when
  RxIntDelay <> 0 under certian network conditions.
o Bug fix: perform controller reset using I/O rather than mmio because
  some chipsets try to perform a 64-bit write, but the controller ignores
  the upper 32-bit write once the reset is intiated by the lower 32-bit
  write, causing a master abort.
o Clean up: removed unused and undocumented user-settable settings for
  PHY.
o Bug fix: ethtool GEEPROM was using byte address rather than word
  addressing.
o Feature: added support for ethtool SEEPROM.
o Feature: added support for entropy pool.

Feedback from review by Arjan @ Redhat:
o Cleanup: Removed unneccesary #ifdef/#endif wrappers for features 
  already part of kernel.
o Bug fix: Added read-behind-write calls to post writes before delays.
o Cleanup: added "e100" prefix to all driver messages.
o Cleanup: removed unnecessary barrier() call because spin_unlock
  already implies a barrier.
o Cleanup: removed __NO_VERSION__
o Cleanup: fixed some spelling mistakes.
o Cleanup: removed some proprietary /proc entries.

o Added device ID support for Dell LOM.
o Added device ID support for 82511QM mobile nics.
o Bug fix: ethtool get/set EEPROM routines modified to use byte
  addressing rather than word addressing.
o Feature: added MDIX mode support for 82550 and up.
o Bug fix: added reboot notifier to setup WOL settings when
  shutting system down.
o Cleanup: removed yield() redefinition (Andrew Morton,
  akpm@zip.com.au).
o Bug fix: flow control now working when link partner is
  autoneg capable but not flow control capable.
o Bug fix: added check for corrupted EEPROM
o Bug fix: don't report checksum offloading for the older
  controllers that don't support the feature.
o Bug fix: calculate cable diagnostics when link goes down
  rather than when queuering /proc file.
o Cleanup: move mdi_access_lock to local get/set mdi routines.

unaligned accesses.

to after C+ command register Rx/Tx enable.

Verified by Nathaniel <wfilardo@fuse.net>

This patch fixes memory leak of driverfs_mknod(), and changes odd
error code.

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

This adds the definitions for the IRQs coming from the H3800 asic.