From Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

From Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

This patch updates the x86-64's compat code to handle the new argument
to waitid.

Sorry for the oversight.

At the recent netfilter workshop in Erlangen, we was decided to remove
the backwards compatibility code for ipchains and ipfwadm.  This will
allow significant cleanup of interfaces, since we had to have a
mid-level interface for the backwards compatibility layer to use. 

Start off with a warning for 2.6.9, so any remaining users have a chance
to migrate.  Their firewall scripts might not check return values, and
they might get a nasty surprise when this goes away.

/proc/net/ip_conntrack_expect was changed over to seq_file, but a \n
is missing.

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

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

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

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

into starflyer.(none):/home/airlied/bitkeeper/drm-removecount

This removes all the __HAVE_COUNTER macro and replaces them with
the driver setting the values in its register_fns.
Signed-off-by: Dave Airlie <airlied@linux.ie>

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

Linus removed the "volatile" statement from the definition of the
__raw_* IO accessors on ppc64, which cause some real bad optisations to
happen in some fbdev's like matroxfb to happen (just imagine that
matroxfb loops reading an IO register waiting for a bit to change).

The __raw_xxxx() functions still want ordered accesses (they avoid the
byteswap, though)
Signed-off-by: Benjamin Herrenschmidt <benh@kenrel.crashing.org>

This allows platforms to hook in their card detection, power control
and power availability information.

Don't allow threads which are acking a suspend request to leave
the APM ioctl call.  This prevents the state machine breaking.

The previous change is not the whole story - the mmc queue
thread may be handling a request.  We must wait for outstanding
requests to complete before allowing the suspend to proceed,
otherwise we may suffer loss of data.

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>

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