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

      - Change ntfs_{external_,}attr_find() to return 0 on success, -ENOENT
	if the attribute is not found, and -EIO on real error.  In the case
	of -ENOENT, the search context is updated to describe the attribute
	before which the attribute being searched for would need to be
	inserted if such an action were to be desired and in the case of
	ntfs_external_attr_find() the search context is also updated to
	indicate the attribute list entry before which the attribute list
	entry of the attribute being searched for would need to be inserted
	if such an action were to be desired.  Also make ntfs_find_attr()
	static and remove its prototype from attrib.h as it is not used
	anywhere other than attrib.c.  Update ntfs_attr_lookup() and all
	callers of ntfs_{external,}attr_{find,lookup}() for the new return
	values.
      - Force use of ntfs_attr_find() in ntfs_attr_lookup() when searching
	for the attribute list attribute itself.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

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

      ntfs_attr_{{re,}init,get,put}_search_ctx() as well as the type
      attr_search_context to ntfs_attr_search_ctx.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

      find_external_attr() to ntfs_external_attr_find() to cleanup the
      namespace a bit and to be more consistent with libntfs.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

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

sizeof(ptr) --> sizeof(*ptr)
Signed-off-by: David S. Miller <davem@davemloft.net>

In particular, handle init_task backtraces.
Signed-off-by: David S. Miller <davem@davemloft.net>

Another issue from the macro conversion.
Signed-off-by: Dave Airlie <airlied@linux.ie>

Default to disabling PCI DAC as this option appears unsafe on amd64
(original suggestion by Hans-Frieder Vogt <hfvogt@arcor.de>).

The driver will typically report PCI System error when something goes
wrong. The relevant interrupt is not masked any more and the driver
can thus be disabled.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Block wants the queue spinlock and interrupts disabled for
blk_stop_queue() and blk_start_queue().

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

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

Now that the raw CSD and CID information are available in mmc_card,
there's little point not passing the mmc_card structure into the
decode functions themselves.

This will be necessary, since there's several different formats of
CID decode, and the format appears to depend on data in the CSD.

If we are unable to decode the CID or CSD, we can mark the card bad
and refuse to bind it to any drivers.  Users can then retrieve the
raw undecoded CID and CSD from sysfs for debugging purposes.

Save the raw CID information, and use this to match cards
with their corresponding mmc_card structure.  Different
protocol revisions have different CID formats.

A required unlock_page will be missed in a very rare (but possible) race
condition. Acked by Hugh, who says:

	It'll be hard to hit because of the additional page_mapped test above,
	with truncate unmapping ptes from mms before it advances to removing
	pages from cache; but nothing to prevent it happening.
Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into kernel.bkbits.net:/home/davem/net-2.6

There is a thinko in the allocation for the devindex hash.  We're
only giving it 8 elements when it should be 1<<8 elements.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

If you modload then unload a network device,
without creating any ipv4 routes, it is possible
for the laddr hash to be not allocated yet
in fib_semantics.
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Simplified from 2 patches by Hideaki YOSHIFUJI
<yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

From: Thierry Vignaud <tvignaud@mandrakesoft.com>

The GDRVINFO command of the ETHTOOL ioctl returns a bogus driver name.
Signed-off-by: Andrew Morton <akpm@osdl.org>

They just meant that the __iomem annotation couldn't shine
through.

Required for the recent removal of LARGE_PAGE_SHIFT.

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

It is unused and obsolete.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Resolves the framebuffer errors on some older sparc32s (we triggered it on
a SparcStation 2).
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

It is unused and obsolete.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>