fs/ntfs/aops.c::ntfs_prepare_write() for now as it is not safe.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

        Cannot just call fs/ntfs/aops.c::mark_ntfs_record_dirty() since
        this also marks the page dirty so we create the buffers by hand
        and set them uptodate.
      - Revert the removal of the page uptodate check from
        fs/ntfs/aops.c::mark_ntfs_record_dirty() as it is no longer called
        from fs/ntfs/mft.c::ntfs_sync_mft_mirror().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

        fs/ntfs/aops.c::ntfs_write_mst_block(), mft.c::ntfs_sync_mft_mirror(),
        and write_mft_record_nolock().  From now on we require that the
        complete runlist for the mft mirror is always mapped into memory.
      - Add creation of buffers to fs/ntfs/mft.c::ntfs_sync_mft_mirror().
      - Do not check for the page being uptodate in mark_ntfs_record_dirty()
        as we now call this after marking the page not uptodate during mft
        mirror synchronisation (fs/ntfs/mft.c::ntfs_sync_mft_mirror()).
      - Improve error handling in fs/ntfs/aops.c::ntfs_{read,write}_block().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

into cantab.net:/home/src/ntfs-2.6-devel

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

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

If you call drivers/md/dm-io.c:resize_pool on an empty pool and
mempool_create is unable to make the pool, the condition is not handled
correctly, resulting in an oops in mempool_destroy.

Trivial fix.

Minor changes required to port kprobes for sparc64.

- arch_prepare_kprobe() returns an integer.

- added arch_remove_kprobe().

- changes to access copy of original instruction, since kprobe_opcode_t
  insn[MAX_INSN_SIZE] is moved from struct kprobe to a struct
  arch_specific_insn.
Signed-off-by: Prasanna S Panchamukhi <prasanna@in.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into cantab.net:/home/src/ntfs-2.6-devel

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

released the tasklist_lock.

Since it released the lock, the process lists may not
be valid any more, and we must repeat the loop rather than
continue with the next parent.

Use -EAGAIN to show this condition (separate from the
normal -EFAULT that may happen if rusage information could
not be copied to user space).

into kroah.com:/home/greg/linux/BK/i2c-2.6

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch integrates several fixes to the s3c2410 i2c
driver

Shannon Holland:

	- write IICCON in configuration code
	- add handling for s3c2410 i2c errata
	- fix clock rate divisor calculation

Ben Dooks:

	- s3c2440 detection
	- s3c2440 IICLC register setup
	- add __exit to the module exit
	- remove return from exit code
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Shannon Holland <holland@loser.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

The patch below makes some needlessly global code under i2c/busses/
static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

The patch adds a check at the beginning of i2c_del_adapter in case
someone attempts to remove an adapter that was never added in the first
place. This sounds like a good safety, as doing so will lead to an oops
at the moment. Also, I have a need for it in the latest version of my
i2c-amd756-s4882 patch. I need to remove the original adapter and
install the virtual ones instead, but I have no way to know if the
original adapter was succesfully added beforehand or not.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Justin Thiessen <jthiessen@penguincomputing.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

In big endian machines, the read*/write* accessors do a byteswap for an
inherently little endian PCI bus.  However, rivafb puts the hardwire in big
endian register access, thus the byteswap is not needed. So for 16- and
32-bit access, instead of read*/write*, use __raw_read*/__raw_write* for all
archs.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Typo introduced by latest cleanups by Antonino

At unload i8042 sets panic_blink to 0.  This will cause problems if kernel
panics later as it will just use it assuming that the pointer is correct.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The patch below fixes two flaws in minix_clear_inode.

The first is that it tests bh which is never initialized.  (&bh is a
parameter of minix_V1_raw_inode, but that routine can fail and return
before it has set bh)

The second is that generic_delete_inode() goes BUG() in case inode->i_state
!= I_CLEAR.  Clearly, it is expected that inode->i_sb->s_op->delete_inode
does a clear_inode() at some point.  But minix_delete_inode() calls
minix_free_inode() and that routine can print an error and return early,
before calling clear_inode().
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Peter Osterlund <petero2@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ppdev's ioctls are not available for 32bit apps on 64bit systems.  There
are four ioctls which take no argument at all (so they are compatible
between 32bit and 64bit), these numbers do not clash with any other ioctl
code, and so I see no reason why not applying patch below.

It solves problem VMware users are faced on 64bit systems if they want to
use direct access to the parallel port.
Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Although it was checking the per-character error flags supplied by the
driver for ordinary characters, the ppp_async line discipline code wasn't
checking the flags for special characters, such as the flag and escape
characters (~ and }).  This patch adds that check.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ia64 and ppc64 have function descriptors.  Booting with initcall_debug will
print the descriptor address, not the address and name of the actual
function.  Another indirection is required.

Tested on ppc, ppc64 and ia64.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When your plug-n-play BIOS is truly broken and generates a fault during
use, we report this and suggest disabling it.  The message produced
suggests using "nobiospnp" to achive this, the correct option is
"pnpbios=off".  This patch upates the message.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The following adds a __KERNEL__ check to <linux/crc-ccitt.h>.  The problem
is that the ppp package includes <linux/ppp_defs.h> via <net/ppp_defs.h>,
which in turn gets <linux/crc-ccitt.h>.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The add_hotplug_env_var() function is available and so use it in the
firmware class code.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

After 2.6.8.1, samba userland would no longer build with current
kernel headers, as it needs some of the samba kernel headers to work,
yet they included <linux/fs.h> outside of __KERNEL__.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove deleted module option in Documentation/kernel-parameters.txt
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Minor cleanup of Documentation/tipar.txt.
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unneeded file in drivers/char.  
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unneeded file from drivers/char.
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>