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

Here is trivial patch to enable the early console setup for UP as well.
Tested on zx1.
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into bkbits.net:/repos/c/cifs/linux-2.5cifs

Error mapping workaround for NT4 bug of reporting oldstyle DOS error for ERR invalid level (shows up on attempts to do SetPathInfo to NT4).
Call posix_lock_wait to avoid fs/locks.c panic per Trond's suggestion

Signed-off-by: Steve French (sfrench@us.ibm.com)

into sambaltcdom.austin.ibm.com:/home/sfrench/linux-2.5cifs

incorrectly limited to just over 512)

Pointed out by Shaggy.

Signed-off-by: Steve French (sfrench@us.ibm.com)

We notiecd proc_net_fops_create() failing, and cleaned up, but returned
0 anyway.

Found by the --failtest flag to nfsim-testsuite.  --failtest rocks my
world.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Found by nfsim (-Wmissing-prototypes is your friend).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The documentation says dma_set_api() returns 1 on success and
0 on error, which is plain wrong, standard kernel return codes
are used instead (0 on ok, -ESOMETHING on error).

The meye hardware needs to access the main memory for DMA using
32 bit addresses. The previous version of the meye driver used
dma_addr_t types to build those addresses and ensured that
sizeof(dma_addr_t) = 4 by disabling HIGHMEM64G in Kconfig.

However, this way of doing it also makes meye unavailable on
some kernel configurations. As Arjan said previously, future Fedora
kernels may have HIGHMEM64G activated by default (davej says it won't
happen, at least for now...). Other distributions may do the same and
this will require meye users to recompile the whole kernel.

The attached patch makes the meye driver use dma_addr_t addresses 
internally, but converts them to u32 before giving them to the
hardware.
Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch applies to the kernel 2.6.9 and fixes the initialisation of
the DMA channel polarity in the function ppc4xx_init_dma_channel() for
the PPC 4XX processor.
Signed-off-by: Colin P Wernham <cwernham@airspan.com>
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Newer binutils (2.15) when they know they aren't assembling for a
classic target (say e500 instead of 750) disallow certain opcodes,
causing the compile to fail.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into bkbits.net:/repos/c/cifs/linux-2.5cifs

servers to avoid mount oops.  Fix case in which tcp stack only returns 3 bytes
of larger peek of smb header (which would otherwise kill the
session and cause us to have to reconnect)

Signed-of-by: Steve French (sfrench@us.ibm.com)

Unfortunately the restoring of SPE state was causing data corruption
since we were restoring based on the size of the altivec context and not
the SPE context.  Also, fixed setting of last_task_used_spe on
start_thread, flush_thread, and exit_thread. 
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

It's "const volatile __iomem *". The "const" was missing.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

When adding or deleting from the source list make sure to find matches
by comparing against the new source address, not the group address.
Also, check each addr in the list rather than just the first one.
And, finally, only delete from list when there's a match rather than
vice-versa.  Drop the effort to keep list sorted, since it's not done
on full-state api and can create an sl_addr entry that the delta api
won't be able to delete. Without these fixes sl_count can be corrupted
which can allow for kernel memory corruption.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

- undo the pfm_context_free() call in pfm_handle_work().
  The logic is different. In the case of a controlling
  task exiting while monitored in pfm_handle_work. The
  context is freed in pfm_close() and not pfm_handle_work().
signed-off-by: stephane eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Andrew took the patch that created this, and Linus applied
it to his BK tree.  Remove my copy so that we can merge.
Signed-off-by: Tony Luck <tony.luck@intel.com>

into nuts.davemloft.net:/disk1/BK/net-2.6

- fix pfm_force_terminate() to really cleanup the state.
  There was a bug affecting sessions which use
  PFM_FL_OVFL_BLOCK flag. It could lead to an assertion
  failure in pfm_load_regs() in the case where the
  owner of the session died unexpectedly. The fix is to
  do the full unload operation.

- simplifies the debug output in pfm_flush_pmds()

- simplifies the debug output in pfm_overflow_handler()

- fix a minor typos in a comment in pfm_flush().
signed-off-by: stephane eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

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

Fix ZBOOT_ROM options help texts to describe what's going on there
bettwe.

Make ZBOOT_ROM depend on ZBOOT_ROM_TEXT and ZBOOT_ROM_BSS being
different values.  This allows all*config-created configurations
to work where ZBOOT_ROM_TEXT and ZBOOT_ROM_BSS were both zero.

emard<at>softhome!net discovered an embarrasing bug in dvb_net.c where
the NET_REMOVE_IF ioctl will cause an Oops when called with an invalid
interface number. 
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The hisax driver looks at dev_avm->irq before calling pci_enable_device(),
which means it requests the wrong IRQ.  This patch fixes it.

Thanks to Thorsten Doil for reporting the problem and testing the fix.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Avoid documenting something which isn't there.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add some configuration information to Documentation/rocket.txt that was
included with the external driver package.
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

I recently learnt that limiting RAM with by using only "mem=xxxM" is no
good on machines equipped with PCI.  In my case (vanilla 2.6.9) the cardbus
bridge on my laptop got mapped to the unused RAM area which resulted in
wierd errors due to the collision.

The right solution is to use "mem=" together with "memmap=" to mark the
unused RAM area reserved.

Henceforth I force the kernel to use 2016MiB by passing "mem=2016M
memmap=32M#2016M" instead of just "mem=2016M".
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- av7110: fixed av7110_before_after_tune()/av7110_fe_lock_fix(): firmware >=
  261d: wait for empty message queue, firmware <= 261c: wait 50ms

- av7110: add __user and __iomem annotations, remove some unnecessary cast
  (patch by C.Y.M)

- av7110: __av7110_send_fw_cmd(): added some sanity checks suggested by
  Werner Fin

- av7110: added support for full-featured DVB-C cards: 13c2:0000 Siemens
  DVB-C (full-length card) VES1820/Philips CD1516 and 13c2:0003 Haupauge DVB-C
  2.1 VES1820/ALPS TDBE2

- av7110: follow saa7146 changes, remove superflous casts, and other misc. 
  minor cleanups

- av7110: Fixed race condition between driver and av7110 while accessing the
  COMMAND register in DPRAM.  See
  http://www.linuxtv.org/mailinglists/vdr/2004/01-2004/msg00331.html

- budget: various cleanups by Adrian bunk 
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- dib3000: support for dynamically i2c addresses of the demod

- tda1004x: fixed firmware upload problems, forgot to include tune_settings
  for tda1004x, added setting to allow inversion of OCLK, set
  fesettings->min_delay_ms = 800 as suggested by Peter Siering

- stv0297: code cleanup

- mt312: added vp310 support

- mt352: decrease verbosity
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- dvb-core: remove unused frequency bending code, simplify internal frontend
  handling

- dvb-net: add ULE dvb-net support according to draft-ietf-ipdvb-ule-03
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- added new usb ids for some more clones
- added option to deliver the complete TS with USB2.0 devices
- added support for the dib3000mc/p frontend driver
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- B2C2: move generic b2c2 code a separate module, added basic b2c2-usb
  support

- [DVB] Skystar2: add mt312/vp310 support
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- saa7146: prefix IER_DISABLE and IER_ENABLE with SAA7146_, add
  SAA7146_ISR_CLEAR

- dvb-bt8xx/dst: fix typo

- cinergyT2: locking in SET_PARAMETERS and some VDR compatibility code for
  GET_EVENT (thanks to Stefan Lucke)
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>