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

into cantab.net:/home/src/ntfs-2.6-devel

Fix printk arg type warnings on x86-64 (and OK on x86-32) (gcc 3.3.3):
fs/ntfs/dir.c:1272: warning: long long unsigned int format, long unsigned int arg (arg 6)
fs/ntfs/dir.c:1388: warning: long long unsigned int format, long unsigned int arg (arg 5
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

      mark_ntfs_record_dirty() and thus to set the buffers belonging to the
      mft record dirty as well as the page itself.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

As spotted by one of our Fedora users, we sometimes
oops during shutdown (http://www.roberthancock.com/kerneloops.png)
because disable_IO_APIC() wants to call find_isa_irq_pin(),
which we threw away during init.
Signed-off-by: Dave Jones <davej@redhat.com>
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

"lapic" is available to force enabling the LAPIC
in the event you know more than your BIOS vendor.
http://bugzilla.kernel.org/show_bug.cgi?id=3238

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

This is made possible by the previous resource allocation ordering
patch.

Now that we run the pre-existing PCI resource discovery _before_
ACPI resources have been added, we should not "insert" the resources
into any existing tree. If they clash with existing resources, we
should re-allocate them (later, when we have the full resource map).

This re-orders the PCI and ACPI IO resource assignment as suggested by
Linus.

With this patch, now the sequence of reserving resources is:
 1. PCI claim BAR
 2. ACPI reserve motherboard resources
 3. PNP reserve motherboard resources
 4. PCI allocate resources for uninitialized PCI devices

This way the kernel allocates new PCI resources after it has full
knowledge of the resource state, and at the same time allows ACPI and
PnP to be run _after_ we've filled in our knowledge about pre-allocated
resources. 

The way it is done is to make the last phase of the original PCI assign
resources code to be an 'fs_initcall', along with the ACPI and PnP
initializations.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Jens Axboe <axboe@suse.de>

The blacklist stuff is broken. When set_using_dma() calls into
->ide_dma_check(), it returns __ide_dma_off() for a blacklisted drive.
This of course succeeds, returning success to the caller of ->ide_dma_check().
Not so good... It then uncondtionally calls ->ide_dma_on(), which turns on
DMA for the drive.

This moves the check to __ide_dma_on() so we also catch the buggy
->ide_dma_check() defined by various chipset drivers.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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

Doing so apparently breaks every Dell on Earth.
http://bugzilla.kernel.org/show_bug.cgi?id=3238

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

FB_NEOMAGIC needs FB_MODE_HELPER (for vesa_modes).

Reported by Michel Angelo da Silva Pereira.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from Sascha Hauer

This patch supports the Hynix developer boards h7201 and h7202 for the
HMS30C7201 and HMS30C7202 CPUs.

Changes to previous patch:
- reorganized file structure. We now have common.c which shares stuff
  common to all h720x processors and cpu-h720[12].c files for the cpu
  specific stuff
- fixed timer handling for timers 1/2
- cleaned up h720x register definitions and splitted in files specific
  to each cpu and one generic part

Signed-off-by: Thomas Gleixner
Signed-off-by: Robert Schwebel
Signed-off-by: Sascha Hauer

This fixes the "Ignoring changed section attributes" warning by commenting
out the attributes appended by gcc.

The previous 'fix' created a section '.text,#alloc' (literally), which I
guess was not intended.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Since get_cpu_ptr() went away, we probably shouldn't tease developers by
telling them to use it in the comments.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The cpu mask fix-ups in 2.6.8 broke SMP kernels booting on a DP264.
Instead of not setting the DIM for cpus that did not exit, the patch
inadvertently doesn't set the DIM for CPUs that do exist.  Thus no device
interrupts get to the cpu.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

qeth network driver changes:
 - Unlock queue in qeth_do_sent_packet if there is no empty buffer
   in packing state.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

DCSS block device driver changes:
 - Add module/kernel parameter for loading segments.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

z/VM monitor stream changes:
 - Reduce stack usage of appldata_get_mem_data.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

dasd driver changes:
 - Free memory returned by read_conf_data.
 - Add warning message if use_diag is specified with a non-CMS
   formatted device.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Common i/o layer changes:
 - Fix error handling in io_subchannel_register.
 - Fix __MAX_SUBCHANNELS limit checking.
 - Clear slow_subchannel structure after kmalloc.
 - Update ssd_info if a different device appears at an already known
   subchannel to get the correct set of chpids.
 - Avoid struct initializers to reduce stack usage of ccwgroup_create,
   readall_cmb and io_subchannel_recog,
 - Setup fields in pmcw in each retry because msch might fail and a stsch
   overwrites them.
 - Prevent irq_exit() in cio_tpi from calling do_softirq by adding a
   local_bh_disable/__local_bh_enable pair.
 - Retry sense id after receiving an unsolicited interrupt.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Christian Borntrdger <cborntra@de.ibm.com>
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
From: Thomas Spatzier <tspat@de.ibm.com>

s390 core changes:
 - Add default storage key and introduce page_{set,get}_storage_key.
 - Fix access to siginfo in copy_siginfo_from_user32.
 - Regenerate default configuration.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This one removes the other occurences of "°C"; fixes displayed fan speed so
that it uses the same scale than other occurences of this parameter instead
of RPM only; fixes the RPM reading of the fan so that it shows zero instead
of 82 when it is effectively stopped.
Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

hugetblfs appears not to support the creation of files larger than 2GB. 
hugetlbfs_vmtruncate() checks against the s_maxbytes member of the super
block and returns EFBIG if the requested file size is too large.
Signed-off-by: Guy Cardwell <gcardwel@motorola.com>
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix warnings in kernel/power/console.c by only declaring orig_fgconsole
and orig_kmsg when required by SUSPEND_CONSOLE. Restore kmsg_redirect on
resume.
Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

request_region() returns NULL if failed.  The driver gets it wrong.
Signed-off-by: Li Shaohua <shaoh.li@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	i2o.h uses stuff defined in linux/dma-mapping.h but includes
asm/dma-mapping.h instead.  It works by accident on some platforms
(they end up pulling linux/dma-mapping.h from asm-generic/pci-dma-compat.h
before it hits the fan), but breaks on e.g. alpha.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch just cleans up the fact that all drm drivers include a
bunch of header files, it places them into one place (drm_core.h)
and uses that.

From: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

These are unused since the gamma driver was dropped, they 
cause problems with the via driver (coming soon).
Signed-off-by: Dave Airlie <airlied@linux.ie>