into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

buffer without complaints.

*grrrrrrrr*

Wrong diff sent.  Sorry - normally the tree I'm working in is cp -rl'ed
from the -current, but right now it's a big mess.

This is the incremental fix.

This converts the 32-bit ppc htab code to use the seq_file interfaces.

Less code means fewer bugs..

This does the seq_file conversion + annotation + cleanup + race fixes
for arch/ppc64/kernel/rtas-proc.c.

How the fuck did that file manage to get anywhere near the tree, anyway?
Take a look at guy's "implementation" of sprintf(buf, "%04d", num), for
example:

<vomit>
	/* construct the sensor number like 0003 */
	/* fill with zeros */
	n = sprintf(tmp, "%d", s.token);
	len = strlen(tmp);
	while (strlen(tmp) < 4)
		n += sprintf (tmp+n, "0");

	/* invert the string */
	while (tmp[i]) {
		if (i<len)
			tmp2[4-len+i] = tmp[i];
		else
			tmp2[3-i] = tmp[i];
		i++;
	}
	tmp2[4] = '\0';
</vomit>

And it's full of that level of lusing ;-/

It would potentially remove dentries from the LRU list
without re-initializing the d_lru fields, causing later
accesses to that dentry to do bad things to the LRU list.

The following patch changes some 'unsigned long's into 'uint32_t's in
mktree (a program that runs on the host to frob the kernel image for
some firmwares).  Without it, the program is not correct when run
on/compiled on a 64bit host.
Signed-off-by: Dan Zink <dan.zink@hp.com>
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix bug #3125:

This should fix the problem; however, we will need to repeat that for all
PIO SCSI drivers (another immediate victim is ppa.c).

We should start looking for sane solution; I _really_ don't like the kludge
with using ->slave_alloc() for fixups after scsi_alloc_queue().
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

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

I just stumbled across this patch that's been sitting in my tree for ages.

I thought I'd sent this in before.  It's a trivial fix for the printing
of task state in /proc and sysrq dumps and such, so that TASK_DEAD shows
up correctly.  This state is pretty much only ever there to be seen when
there are exit/reaping bugs, but it's not like that hasn't come up.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from John Lenz

Add INITTIME macro to collie machine structure.

Patch from Ben Dooks

Fixed clock base for the H1940

thanks to Gerald Schneider <gerald@gerald-online.de>
for fixing this.

Patch from Ben Dooks

Patch for default configuration

Patch from Ben Dooks

Added more definitions for GPIO registers

New functions for modifying pin configuration and
bit-status (see include/asm-arm/arch-s3c2410/hardware.h)

Patch from Ben Dooks

Remove compile error with gcc-3.4 and empty part of case statememnt

Patch from Catalin Marinas

Gas translates the "msr [cs]psr, rN" instruction to "msr [cs]psr_cf, rN". This may cause problems on the ARMv6 architecture where the A and E bits can leak into the SVC mode from the USR mode via the exception handlers. The reverse can happen when returning to user mode. The patch adds _cxsf to all the msr instruction without the field specifier.

Patch from Catalin Marinas

The "err" is rotated in the blockops_check() function and all the error bits are cleared, the subsequent conditions being always true.

A number of drivers or special virtual devices really just want their
"read()" function to populate user space from some internal buffer.

This adds such a helper function - "simple_read_from_buffer()" - and
converts several ->read() instances to use it.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

For requests marked read-ahead, it can legitimately fail without it being a
path problem.  So don't fail a path just because this happens (can be the
atomic request allocation going nuts, for instance), or all paths will
quickly go away.

Cc: <neilb@cse.unsw.edu.au>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

I tried to get multipathing failover running and failed. It seems to be
that there are two bugs in multipath.c :

- If a path/request fails mp_bh->path doesn't get updated to the new
  path.  Thus multipath_end_request will access a NULL pointer if a
  redirected request returns.

- After fixing this I experienced several other errors.  First of all in
  bio->bi_flags the BIO_UPTODATE flag is not set when redirecting a
  request.

  Causing the md driver to think that every redirected request failed
  when it returns.  Since that alone didn't fix the problems, I simply
  copied the master_bio again and it looks like everything seems to work.

Cc: <neilb@cse.unsw.edu.au>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch reverts the i586 AES module.  A new one should be ready soon.
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into shinybook.infradead.org:/home/dwmw2/bk/mtd-2.6

one and turned on a few new options (some of which Altix needs).
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

nodes (configured for cell local memory) currently crashes because
MAX_NUMNODES defaults to 1.  The patch below sets up things to make this
work.
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Initial patch by Jesse Barnes, fixed by Ken Chen, rescued from
obscurity by Sourav Sen.
Signed-off-by: Tony Luck <tony.luck@intel.com>

situation where a flood of errors prevents boot.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

* register as as a sys_device so that we can get resume callbacks and restore
  interrupt routing state.
* add acpi_pci_link_resume(), which will be called when resuming from a suspend
  state that needs IRQ routing to be restored. This fixes issues reported on
  the mailing lists, e.g.:
http://marc.theaimsgroup.com/?l=acpi4linux&m=109142999328643&w=2
* rename setonboot --> initialized
* change to test acpi_noirq in init

We want to initialize everything on S3 resume in case the BIOS points an
interrupt link somewhere we didn't expect. (Doing so avoids "missing interrupt"
or "irq x: nobody cared" problems.) According to Len, past experience has shown
that it's a good idea to initialize only devices that exist or were explicitly
asked for, so we try to initialize only the IRQ's that were previously
initialized at some point before suspend, by checking the "initialized" flag.
This corresponds to links that have PCI devices attached.  Everything else, we
leave alone. Assuming the BIOS does the same thing on resume that it did on
boot, this will leave all the unused links in the same state that they were on
boot.

We are registered as a sysdev in order to do this work fairly early during
resume, before devices are resumed; some devices may not call
pci_device_enable.

Previous "setonboot once" behavior is left in place, to be conservative.

  Mark per_hub_init as __init and remove an unnecessary extern declaration of it
  in sgi_io_init.c.  This has the effect of killing a warning in the compile of
  that file.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

  REO/Grande defect AR2305 can cause TLB fetch timeouts if entries
  are purged while in use.  Round up IOVA allocations to power-of-two
  boundaries to prevent this.  This is originally due to Alex Williamson.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

  Make cyclone_setup() take no args, rather than an ignored "char *"
  and return void.  Fix typos and whitespace.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

irq.c:
  Fix IRQ type in platform irq_to_vector functions.  Should be
  "unsigned int", but some places were "u8".
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

Author: David Shaohua Li
http://bugzilla.kernel.org/show_bug.cgi?id=3049

into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

into intel.com:/home/lenb/src/linux-acpi-test-2.6.8