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

Without this patch, mainline via-rhine cannot wake the chip if some other
driver puts it to D3. The problem has hit quite a few people already.

This is a fix for the heisenbug with via-rhine refusing to work
sometimes. Patch "[9/9] Restructure reset code" contained a change made
necessary by patch [8/9]. Mainline merged [8/9] for 2.6.8 and is still
missing the fix, while -mm got it with [9/9].

Jesper Juhl provided crucial test data when no one else was able to
reproduce the symptoms.
Signed-off-by: Roger Luethi <rl@hellgate.ch>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is used by some IBM vscsi driver. It was using schedule_work(), but
should be using the block layer queue.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

- VISEntry clobbers %g3, so have to do %asi stuff
  after we invoke it.
- Need to or in 0x10 to TLB flush addresses when
  flushing in secondary context
- Context register restore using wrong address register
- Spitfire not so tolerant of membar in delay slot.
Signed-off-by: David S. Miller <davem@redhat.com>

This allows the VFS layer to the update rather than the
low-level drivers. 

Use the proper "pointer to pos" that is passed down instead.

It's causing massive user confusion, and breaks installers by
mounting the filesystem read-only.

Cset exclude: hirofumi@mail.parknet.co.jp[torvalds]|ChangeSet|20040802210150|02337

Although the current DVB stuff compiles fine, for correctness the following
patch adds the necessary include for __user annotations.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This looks like what was intended here..
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

- bootp.lds is a source file not a target
- vmlinux.lds doesn't need to depend on the top level Makefile

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Based upon a patch from Richard Mortimer.
Signed-off-by: David S. Miller <davem@redhat.com>

The old ones were not only hard to use, they were in fact
impossible or a low-level sound driver to get right, since
the core sound code didn't even export all the necessary
information.

Add the file offset to the /proc read interfaces, and make
them simpler to use. The core now does a offset updates, and
sanity-checks the values so that the low-level drivers don't
need to worry.

into nuts.davemloft.net:/disk1/BK/sparc-2.6

This makes the kernel profiles look much more
meaningful.
Signed-off-by: David S. Miller <davem@redhat.com>

It could never be enabled safely, so just toss
the code.
Signed-off-by: David S. Miller <davem@redhat.com>

The SLB rewrite removed a fix for a hard to hit bug, but the SFS guys
managed to hit it straight away. We need to check both r1 and PACAKSAVE
or else we could cast our kernel segment out when on the irq or softirq
stack.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- Do not save/restore existing TLB entries, that is
  expensive, complicated, and does not really help
  performance much at all.
- Only one unrolled loop for cheetah copy code.
- For spitfire, use %asi register for block commit
  handling so we do not need two copies of the code.
Signed-off-by: David S. Miller <davem@redhat.com>

This part got missed in the earlier merge, not sure where it escaped.

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

  Disable pre-emption around access to pgtable_cache_size, pgd_quicklist,
  and pmd_quicklist.
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Signed-off-by: Zou Nanhai <nanhai.zou@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Include compiler.h from sg.h as it uses the __user notation, and change
the types in scsi.h to use user exportable types.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Exports blk_queue_resize_tags since it is an exported interface.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The block layer SG should have the identical behaviour as SCSI sg when
it comes to SG_SET_RESERVED_SIZE - allow caller to specify a large
amount, truncate to largest we support, and return that with
SG_GET_RESERVED_SIZE.  Currently we fail with -EINVAL if the value is
too large, I think the SCSI sg behaviour is more sane to use.  This
one-liner fixes it up, please apply for 2.6.8.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

drivers/char/watchdog/wdt977.c:291:9: warning: incorrect type in initializer (different address spaces)
drivers/char/watchdog/wdt977.c:291:9:    expected char const [noderef] *register __p<asn:1>
drivers/char/watchdog/wdt977.c:291:9:    got char const *buf
...

drivers/char/nwbutton.c:177:24: warning: incorrect type in argument 1 (different address spaces)/home/rmk/bk/linux-2.6-rmk/drivers/char/nwbutton.c:177:24:    expected void [noderef] *to<asn:1>
drivers/char/nwbutton.c:177:24:    got char *buffer
drivers/char/nwbutton.c:177:24: warning: incorrect type in initializer (different address spaces)
drivers/char/nwbutton.c:177:24:    expected void [noderef] *to<asn:1>
drivers/char/nwbutton.c:177:24:    got char *buffer
drivers/char/nwbutton.c:189:11: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
drivers/char/nwbutton.c:189:11:    expected int [usertype] ( *read )( ... )
drivers/char/nwbutton.c:189:11:    got int ( static [addressable] [toplevel] *<noident> )( ... )

drivers/char/ds1620.c:230:19: warning: incorrect type in argument 1 (different address spaces)
drivers/char/ds1620.c:230:19:    expected void [noderef] *to<asn:1>
drivers/char/ds1620.c:230:19:    got char *buf
drivers/char/ds1620.c:230:19: warning: incorrect type in initializer (different address spaces)
drivers/char/ds1620.c:230:19:    expected void [noderef] *to<asn:1>
drivers/char/ds1620.c:230:19:    got char *buf
...
drivers/char/ds1620.c:383:52: warning: Using plain integer as NULL pointer

arch/arm/kernel/io.c:15:5: warning: generating address of non-lvalue
arch/arm/kernel/io.c:15:5: warning: loading unknown expression
arch/arm/kernel/io.c:29:5: warning: generating address of non-lvalue
arch/arm/kernel/io.c:29:5: warning: loading unknown expression

This fixes sparse warnings in fpa11_cpdt (coprocessor data transfer)
instruction emulation.  Note that pointers need to be cast to unsigned
long not unsigned int, so convert user registers to be unsigned long
type.

- Do not save/restore existing TLB entries, that is
  expensive, complicated, and does not really help
  performance much at all.
- Only one block store per loop iteration, doing more
  does not make things run any faster.
Signed-off-by: David S. Miller <davem@redhat.com>

We used to play games reporting the callers
PC in certain functions such as the rwlock
and atomic_t routines.  If anything, somethin
like this should be optional, not by default.
Signed-off-by: David S. Miller <davem@redhat.com>

This cleans up and simplifies drivers, and also allows us future
simplification in the VFS layer, since it removes knowledge about
internal VFS layer handling of "f_pos".

Nobody ever fixed the big FIXME in sysctl - but we really need
to pass around the proper "loff_t *" to all the sysctl functions
if we want them to be well-behaved wrt the file pointer position.

This is all preparation for making direct f_pos accesses go
away.