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

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

Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:19744a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:19632a
Signed-off-by: Nathan Scott <nathans@sgi.com>

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

      and accessing the mft record in fs/ntfs/mft.c::ntfs_mft_writepage()
      by setting the page not uptodate throughout ntfs_mft_writepage().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

      fs/ntfs/aops.c::ntfs_mft_writepage().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

      the bug check from fs/ntfs/aops.c::ntfs_write_mst_block().  It is in
      fact required to write outside initialized size when preparing to
      extend the initialized size.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

      writes the mft record if the buffers belonging to it are dirty.
      Otherwise we assume that it was written out by other means already.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

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

      the mft record is already locked and otherwise behaves the same way
      as fs/ntfs/mft.c::map_mft_record().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

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

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

Fixes a data corruption issue. Because of a typo in the driver, IO packets
were wrongly shared by the IOCTL path. This caused the whole IO command
to be replaced by an incoming IOCTL command.

ACPI still explodes on my old PII and stops it booting.

Anyway, it is oopsing in drivers/acpi/scan.c line 207 where element
(which is NULL) gets dereferenced.

The ACPI bios on this thing has always seemed to be pretty broken, but
this at least allows the 'power' button to continue to work (the only
reason why I want ACPI).

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>