into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

Patch developed by Ian Wienand under advice from Bill Irwin.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

- fix pfm_stop() and pfm_flush_pmds() to correctly cleanup
  in case of a system-wide context which is closed while running
  from another processor. This was leading to an assertion failure
  in pfm_loads_regs() for the next user of the PMU on the monitored
  CPU.
signed-off-by: stephane eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

- fix a typo in the file /proc/pal/CPU*/processor_info w.r.t.
  to BERR promotion. Initially reported by Danny Kwong from HP.
Signed-off-by: stephane eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

o enable preempt per Andrew's request for testing
o enable CPU hotplug for testing
o add EXT2 and IDE disk support to make simulation easy
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

 
   This patch provides support for IA64 hardware performance counters via
   the perfmon interface. Please consider applying.
Signed-off-by: John Levon <levon@movementarian.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Add wrapper functions for SAL_CALL(), SAL_CALL_NOLOCK(), and
SAL_CALL_REENTRANT() that allow OEM written modules to make
calls to ia64 OEM SAL functions.
Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Patch created by Ian Wienand.
Signed-off-by: Tony Luck <tony.luck@intel.com>

VFAT filesystems need to have codepages and iocharsets specified these days,
so build some into the kernel to make it easier to mount /boot/efi on ia64
systems.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

I noticed when building with CONFIG_SWAP=n that tlb.h gave a warning about
some undefined symbols.  This is because it was pulling them in through
swap.h, but when CONFIG_SWAP=n, they're no longer pulled in.  Adding
pagemap.h to tlb.h fixes the problem.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Signed-off-by: Brian J. Johnson <bjohnson@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.8.1

This patch changes hose_list from a simple linked list to a
"list.h"-style list.  This is in preparation for the runtime
addition/removal of PCI Host Bridges.
Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On some platforms (notably power5) you can't enable surveillance
(firmware/service processor watchdog) from the kernel - you have to do
it in the firmware.

This patch changes enable_surveillance() to make the message that is
printed in this situation more informative.  Additionaly, the rtas_call
was changed to rtas_set_indicator so as to avoid having to handle
RTAS_BUSY returns.
Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

The code doesn't actually _care_ about 32/64-bit issues,
only about F_SETLK vs F_SETLKW, and the F_SETLK64 doesn't
exist except as a compatibility thing on 64-bit architectures
(since the regular one already _is_ 64-bit, of course).

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.6

   server are not allowed to be interrupted as that may result in the
   client and server disagreeing.

   recall ability.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   NFS4ERR_CB_PATH_DOWN error.

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

into fys.uio.no:/home/linux/bitkeeper/work/nfsclient-2.6

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.6

   rather than an inode argument. Fix up nfs_instantiate() and
   _nfs4_do_open to use this since doing a new lookup might be racy.

   NFS4ERR_DELAY on the GETATTR call.