[PATCH] cifs: annotate stat-related structures

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate fea{,list}, endianness bugfix

in CIFSSMSetEA() ->list_len got (__u32)cpu_to_le16() instead of cpu_to_le32().
Broken on big-endian...

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate TRANSACT_CHANGE_NOTIFY_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate file_..._info

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate TRANSACTION2_QFSI_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate TRANSACTION2_GET_DFS_REFER_{REQ,RESP}, minor endianness bugfix

missing le..._to_cpu() in debugging printk

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate TRANSACTION2_FNEXT_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate TRANSACTION2_FFIRST_{REQ,RESP}, typo fix in CIFSSMBFindSingle()

in CIFSSMBFindSingle() pSMB->TotalParameterCount got wrong value due to typo.

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate TRANSACT_IOCTL_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate TRANSACTION2_QPI_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate NT_RENAME_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate TRANSACTION2_SPI_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate COPY_{REQ,RESP}, minor endianness bugfix

missing le16_to_cpu() in debugging printk

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate TRANSACTION2_SFI_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate RENAME_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate LOCK_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate WRITE_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate READ_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate OPEN_{REQ,RESP}, endianness bugfix

in assignment to OPEN_REQ ->SecurityFlags we did u8 = cpu_to_le32(v8), which
breaks on big-endian.

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate CREATE_DIRECTORY_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate DELETE_DIRECTORY_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate DELETE_FILE_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] cifs: annotate NEGOTIATE_{REQ,RESP}

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Merge bk://kernel.bkbits.net/davem/atm-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge http://lia64.bkbits.net/linux-ia64-release-2.6.9
into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/sgi
into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

[IA64] sn2_defconfig update take 2

Please apply this one instead.  It turns on mmtimer and increases the number
of sg entries for the LSI driver.

Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

[IA64] ia32compat: Disable syscalls sys32_iopl() and sys32_ioperm() on ia64.

Disable syscalls sys32_iopl() and sys32_ioperm() on ia64.
To emulate these 2 syscalls correctly, we need to guarantee uncached
memory attributes on ia64, which is difficult. The only user of this
interface that we know of is X. So we think it's better to disable it.

Signed-off-by: Gordon Jin <gordon.jin@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

[IA64] ia32compat: Put signal restorer code on a gate page

When userland doesn't specify sigaction->sa_restorer, we try to put
the restorer code on the stack. But this breaks ia32 binaries with
non-executable stacks. We now put the restorer code on a gate page.

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6

[ATM]: [he] Make code more readable with list_for_each_entry

From Domen Puncer <domen@coderock.org>

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

[ATM]: [drivers] Use msleep() instead of schedule_timeout()

From Nishanth Aravamudan <nacc@us.ibm.com>

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

[ATM]: Use __iomem where appropriate.

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

[ATM]: [drivers] fix warnings related to readl/writel changes

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

[SPARC64]: Update compat code for sys_waitid changes.

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

[IPV4]: Zap CONFIG_IP_ROUTE_TOS

These facilities are now available by default.
The config option makes no sense because:
1) It makes no change to the layout of any
   data structure, therefore it has no impact
   upon memory usage of the routing tables.
2) It makes no significant change to code size,
   only a handfull of lookup comparisons are
   protected by the option.
3) It is needed for full RFC1812 compliance anyways.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

[IPV4]: Clean up fib_hash.c list handling.

1) Use linux/list.h facilities instead of by-hand
   list implementation.

2) Use fib_alias structure, hung off of fib_node,
   to represent routes which all have the same
   destination prefix, yet have different TOS and
   priority values.

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

[PATCH] x86-64: waitid fallout

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

Sorry for the oversight.

[PATCH] Warn that ipchains and ipfwadm are going away

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.

[PATCH] Another ip_conntrack seq fix: ip_conntrack_expect

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

Merge bk://bk.arm.linux.org.uk/linux-2.6-mmc
into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://are.twiddle.net/axp-2.6/
into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://drm.bkbits.net/drm-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

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

drm: drop __HAVE_COUNTER macros

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>

drm: complete fix for drm_scatter.h

Another issue from the macro conversion.

Signed-off-by: Dave Airlie <airlied@linux.ie>

[PATCH] ppc64: Fix __raw_* IO accessors

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>

[MMC] Ensure semaphores are initialised before use.  Gah.

[MMC] PXAMCI: enable use of platform specific data.

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

[ARM] Prevent state machine leakage in ARM APM emulation.

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

[ALPHA] Add compile-time assert concerning rt_sigframe layout.

Correct prototypes for sys_wait4 and sys_waitpid.

[ALPHA] Fix some compiler warnings from gcc 4.

[MMC] Ensure PXA MMC interrupts are disabled on chip.

[MMC] Fix mmc_block suspend/resume handling (again).

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.

[SPARC64]: Fix memset() in sunsu.c and sunzilog.c

sizeof(ptr) --> sizeof(*ptr)

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

[SPARC64]: Improve kernel stack backtraces.

In particular, handle init_task backtraces.

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

ppc32: merge network card Kconfig duplication

[PATCH] Compatibility fixes for different card versions

[PATCH] r8169: default on disabling PCIDAC

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>

[MMC] Fix suspend/resume buglet.

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

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-mmc
into ppc970.osdl.org:/home/torvalds/v2.6/linux

[MMC] Add v2.x and v3.x CID parsing.

[MMC] Clean up MMC card CID/CSD decoding, stage 1.

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.

[MMC] Export raw MMC card CID and CSD registers via device model.

[MMC] Save MMC card raw CSD structure.

[MMC] Use raw CID rather than decoded CID

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

usb: add host controller __iomem annotations

[PATCH] fix missing unlock_page in mm/rmap.c

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>

Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6

[ARM] i8042 is available on many footbridge hosts, not just ARCH_EBSA285

[IPV4]: Size fib_info_devhash[] correctly.

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>

[IPV4]: Fix BUG triggered in fib_sync_down()

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>

[XFRM] make xfrm_lookup() fully af-independent.

Simplified from 2 patches by Hideaki YOSHIFUJI
<yoshfuji@linux-ipv6.org>

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

[PATCH] fix driver name in eth1394 as returned by ETHTOOL_GDRVINFO

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>

fb: add __iomem annotations to cfbfillrect

fb: add __iomem annotations to cfbcopyarea

sym53c8xx_2: remove unnecessary IO pointer casts

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

Do __iomem annotations on VGA state handling

ppc64: Need to define HPAGE_SHIFT even when HUGETLB_PAGE not configured.

Required for the recent removal of LARGE_PAGE_SHIFT.

[PATCH] __iomem fixups for atiixp soundcards

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

Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

remove i2o_core.c

It is unused and obsolete.

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

[PATCH] sparc32: vmalloc address fix

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>

[PATCH] remove sh64 smplock.h

It is unused and obsolete.

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

[PATCH] Fix write() return values for reiserfs.

This patch fixes the direct I/O return value for reiserfs writes to be
ssize_t instead of int.

Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] Fix write() return values for tmpfs.

This patch makes the return from the write() syscall actually an ssize_t
instead of an int.

Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] tune vmalloc size

There are a few devices that use lots of ioremap space.  vmalloc space is a
showstopper problem for them.

this patch adds the vmalloc=<size> boot parameter to override
__VMALLOC_RESERVE.  The default is 128mb right now - e.g.  vmalloc=256m
doubles the size.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjanv@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] bio_alloc() cleanup

de-spaghettify this function.

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

[PATCH] Add MTD map driver for Intel IXP2000 NPU

The following patch adds the MTD map driver for Intel's IXP2000 NPU.  The
driver is already in MTD CVS and I've gotten the OK from David to push it
upstream.

Missing Kconfig bits from Lennert Buytenhek <buytenh@wantstofly.org>

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] Update IXP4xx MTD driver from CVS MTD

The following patch updates the IXP4xx MTD driver with a compile fix from
the CVS repository.  David has given me the OK to push this upstream.

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] Document ARM pci=firmware option

Added a new pci= command line option specific to ARM systems in
-rc2 and it should be added to kernel-parameters.txt.

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] time interpolators logic fix

Report the resolution of the time source correctly for time interpolators
with a frequency over 1 Ghz.

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

[PATCH] mips: fixed do_signal in arch/mips/kernel/signal.c

The change of get_signal_to_deliver() is followed.

Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] ide: remove obsolete CONFIG_BLK_DEV_ADMA

In drivers/ide/Kconfig there's a hidden config-item named BLK_DEV_ADMA.
Nowhere in the sources are any references to this item, so this option
simply is obsolete.

This patch removes the according item from drivers/ide/Kconfig.

Signed-off-by: Raphael Zimmerer <killekulla@rdrz.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] uml: update defconfig

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>