Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Problem-spotted-by: Alan Stern <stern@rowland.harvard.edu>

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

Fix stupid thinkos in the fcntl f_op removal code.

Tssk. 

Pointed out by Kai Makisara.

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

Fixes two common boot failures due to buggy SMM BIOS code

SMP boot crash if SMI_CMD=ACPI written from CPU1
http://bugzilla.kernel.org/show_bug.cgi?id=2941

laptop crash due to LAPIC timer before SMI_CMD=ACPI
http://bugzilla.kernel.org/show_bug.cgi?id=1269

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

Update lasi 82596 driver:
 - Fix boot messages (Helge Deller)
 - Whitespace and __FILE__ usage (Joel Soete)
 - 64-bit compile warning fixes (James Bottomley)

This trivial fix allows mounting MO-drives readwrite.

Acked by Jens.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - __PAGE_OFFSET is 0x10000000 (Randolph Chung)
 - PA8800 support (Grant Grundler)
 - debuglocks (Thibaut Varene)
 - PDC chassis disabling (Thibaut Varene)
 - Distinguish between Dinos in request_irq (Thibaut Varene)
 - Document interrupt registers (Randolph Chung)
 - Revamp CONFIG_DISCONTIGMEM support (Randolph Chung)
 - Remove STI console warning and special casing (Randolph Chung)
 - n4000 defconfig (Randolph Chung)
 - iosapic fixes (Bjorn Helgaas)
 - Fix a bug in entry.S where pa_dbit_lock was being trashed (Randolph Chung)
 - SMP support (Randolph Chung, Grant Grundler, James Bottomley)
 - Clear the pte in the fault handler (Joel Soete)
 - Change _exit prototype (Carlos O'Donell)
 - Better unwinding support (Randolph Chung)
 - GCC 3.4 fixes (Carlos O'Donell, Randolph Chung)

The newly introduced ->fcntl file_operation is badly thought out,
not to mention undocumented.  This patch replaces it with two better
defined operations -- check_flags and dir_notify.  Any other fcntl()s
that filesystems are interested in can have their own properly typed
f_op method when they need it.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Use pci_request_regions()/pci_release_regions() instead of
request_region()/release_region()

Signed-off-by: Russell King <rmk@arm.linux.org.uk>   
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

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

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

Patch from Marc Singer

The work already done to rectify the timer code initialization missed
a necessary change.  This patch adds a timer initialization function
to the LPD7A400 machine type.  It also makes a small correction to the
kernel configuration that is out of step with the machine specific
Kconfig.

Patch from Marc Singer

This patch aligns the lh7a40x port with the updated structure of IDE
drivers.  It also removes an unused FIQ handler.  This patch is made
in order to get the lh7a40x port to build.

Patch from Catalin Marinas

This patch replaces the -mshort-load-bytes option with $(call
check_gcc,-malignment-traps,-mshort-load-bytes) in the CFLAGS
setting in arch/arm/Makefile.

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

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

In the *ppos cleanups, proc_dol2crvec was updated, but the prototype
found at the top of kernel/sysctl.h was not, generating warning.  This
corrects the prototype to match the code.

(I'm gonna take a stab at moving these into arch/ppc shortly)
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We allow more commands if the disk was opened read-write.

They'll need it for permission checking.

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

Signed-off-by: David S. Miller <davem@redhat.com>

Normal users shouldn't have access to the raw device anyway
unless they are in the trusted "disk" group, but let's require
RAWIO capabilities. That's what the original SCSI interfaces
did anyhoo.

We probably _should_ just require write access, but that will
need more of a code change to pass down the file descriptor.

We must setup the queue before calling elevator_init(), otherwise the
elevator cannot use the queue members. This really hurts cfq since it
checks ->nr_requests, which is zero at that time.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

CONFIG_SERIAL_8250_MANY_PORTS should not be set for these boards, as
they only have 2 serial ports.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

With 'len' being unsigned now, we must make sure it never tries
to go negative...

Thanks: griffon26@kfk4ever.com (Maurice van der Pot)
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Eliminates costly atomic bitops in do_sparc64_fault.
Signed-off-by: David S. Miller <davem@redhat.com>

It is bogus, plus it breaks the build with
CONFIG_SWAP disabled.

Based upon a patch from Ben Collins (bcollins@debian.org)
Signed-off-by: David S. Miller <davem@redhat.com>