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

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

The patch below makes the following cleanups for code under drivers/mtd/ :
- make some needlessly global code static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

fs/jffs2/gc.c:832: warning: signed size_t format, different type arg 
(arg 3)
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

... and should include it directly rather than hoping it's been done.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

We had it already in the inocache structure we were being passed
Signed-off-by: Artem Bityuckiy <dedekind@infradead.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

We weren't correctly holding a lock when adding raw nodes to the 
per-inode list.
Signed-off-by: Artem Bityuckiy <dedekind@infradead.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Determine it from the CFI query data instead of hard-coding it.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: David Woodhouse <dwmw2@infradead.org> 

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Pete Popov <ppopov@embeddedalley.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Fix kernel NULL pointer dereference at mtd_erase_callback+6 when trying
to insmod INFTL or NFTL modules.
Signed-off-by: Kalev Lember <kalev@colleduc.ee>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

We weren't correctly resetting our idea of the chip's state on suspend
in all circumstances. Fix that.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Cleanups and fixes in preparation for XIP support -- fix unbalanced use
of get_chip() and put_chip(), and clean up the code a little in 
preparation for what's to come.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Originally from Joe Perches <joe@perches.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

The attached patch fixes the fork fix to avoid the divide-by-zero error I'd
previously fixed, but without using any sort of conditional.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

If the drain flag is set on the queue, get_request() needs to drop the
acquired iocontext to avoid leaks.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Missing goto.

Acked by Thomas Graf

Signed-off-by: Miles Bader <miles@gnu.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- changed initialization of spin locks from SPIN_LOCK_UNLOCKED into
  spin_lock_init()
Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- removed old queueing code and replaced it with new wait_event API
Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- remove unused code
- make needlessly global code static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- changed code with BUG() to use BUG_ON() which could be optimized by some
  platforms (original from Milton Miller)
Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

let find_mode search for nearest refresh rate
Signed-off-by: Alexander Kern <alex.kern@gmx.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix typo, and decrease amount of output
Signed-off-by: Alexander Kern <alex.kern@gmx.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fix hw cursor in doublescan modes
Signed-off-by: Alexander Kern <alex.kern@gmx.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- use symbol_get() to check for the presence of i2c

- allow mode changing even if EDID block is not found (no I2C support)

- fix crashes on chipsets that do not have i2c support

- shorten string in info->fix.id

- trivial chip name changes
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Problem reported by Gerd Knorr:

  (1) boot with vesafb (thats what I'm using, maybe it shows on other
      framebuffers and/or vgacon as well).
  (2) login into one terminal, then type "echo -ne '\033[?17;15;239c'".
      You should have a nice, yellow and *not* blinking cursor block.
      That is what I have in my .profile because I can't stand the
      blinking cursors.
  (3) Switch to another terminal.  The cursor goes into blinking
      underscore mode now (i.e. the default cursor).
  (4) Switch back to the first terminal.  Now you have a yellow block
      with the last two pixel lines (i.e. the underscore) blinking.

This bug is caused by both fbcon_cursor and vt softcursor being active at
the same time.

Fix:

- Disable fbcon_cursor if vt softcursor is active (vc->vc_cursor_type &
  0x10) != 0.

- Recheck/reload fbcon cursor for each vt switch
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- Add support for fonts bigger thatn 16x32 by dynamically allocating buffer
  based on font dimensions instead of statically allocating at 64 bytes.

- use softcursor if cursor size exceeds 32x32.

- fix rivafb_cursor if cursor width is not divisible by 2
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix crash if font font is bigger than 16x32 by dynamically allocating buffer
based on font dimensions instead of statically allocating at 64 bytes.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Jani Jaakkola <jjaakkol@cs.Helsinki.FI>:

The first one was that fbcon_set_font() used one byte padding for fonts having
width 16 <= width < 24, which was wrong since the pieces of code actually
using the font did not use any padding.  This is fixed in the included patch
and also fbcon_set_font() is made a little cleaner.  After the patch the
following font is not garbled in fb console:
http://www.cs.helsinki.fi/u/jjaakkol/psf/bitstream_vera_sans_mono_roman.16x30.psf

The other bug is that fonts having height == 32 crash the kernel.  I have no
fix for this (at least not yet), but it can be reproduced with font:
http://www.cs.helsinki.fi/u/jjaakkol/psf/bitstream_vera_sans_mono_roman.17x32.psf.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- add vram option to reserve more memory than stolen by BIOS if needed
- fix intelfbhw_pan_display typo
- add __initdata annotations
Signed-off-by: Sylvain Meyer <sylvain.meyer@worldonline.fr>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Currently userspace code using the dm ioctls must refer to a mapped device by
either its name or its uuid.  But in some circumstances you know neither of
those directly.

This patch lets you reference devices by their major/minor numbers as an
alternative.
Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add DM_TARGET_MSG ioctl so data can be passed to a dm target after its table
has been loaded.
Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix some DMERR macro usage. It already adds : and \n.
Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>