|
|
Subscribe / Log in / New account

2.6.12-rc4 long-format changelog

Changelog from 2.6.12-rc3 to 2.6.12-rc4
=======================================

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [SPARC64]: sparc64 preempt + smp

    PREEMPT+SMP support - see if it looks sane...

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>

James Bottomley <James.Bottomley@SteelEye.com>:
    [PATCH] Fix aic7xxx_osm.c compile with older gcc's

    My version of gcc doesn't warn about this error (declaration in the
    middle of a set of statements).

    The fix is simple (this also corrects return code; for init functions it
    should be zero or error).

Alexander Nyberg <alexn@telia.com>:
    [PATCH] x86_64: Bug in new out of line put_user()

    The new out of line put_user() assembly on x86_64 changes %rcx without
    telling GCC about it causing things like:

    http://bugme.osdl.org/show_bug.cgi?id=4515

    See to it that %rcx is not changed (made it consistent with get_user()).

    Signed-off-by: Alexander Nyberg <alexn@telia.com>
    Signed-off-by: ak@suse.de
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Karsten Keil <kkeil@suse.de>:
    [PATCH] fix for ISDN ippp filtering

    We do not longer use DLT_LINUX_SLL for activ/pass filters but
    DLT_PPP_WITHDIRECTION witch need 1 as outbound flag.

    Signed-off-by: Karsten Keil <kkeil@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

David Mosberger-Tang <davidm@hpl.hp.com>:
    [IA64] fix fls()

    The ia64-version of fls() never worked as intended (the bitnumbering
    was off by 1 and fls(0) was undefined).  This patch fixes the problem
    by using a popcnt-based fls(), which on McKinley-derived cores is
    slightly faster than both ia64_fls() and generic_fls().  The resulting
    code, however, is bigger (7-8 bundles instead of about 3 bundles).
    Also switch ia64_popcnt() to __builtin_popcountl() for GCC v3.4 or
    newer since the compiler can predicate that and schedule it better.

    Thanks to Simon Derr and Matt Mackall for tracking down this bug.

    Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Richard Henderson <rth@twiddle.net>:
    [PATCH] alpha: key management syscalls

    Allocate syscall numbers for add_key, request_key, keyctl.

Andrew Vasquez <andrew.vasquez@qlogic.com>:
    [SCSI] qla2xxx: remove a transport #include

    Make transport-functions structure non-static.  Replace #include of
    scsi_transport.h with a forward declaration.

    Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Christoph Hellwig <hch@lst.de>:
    [SCSI] aic7xxx: remove inquiry sniffing leftovers

    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Nate Dailey <nhdailey@verizon.net>:
    [SCSI] drivers/scsi/sr_ioctl.c: check for failed allocation

    I noticed a case in sr_ioctl.c's sr_get_mcn where a buffer is
    allocated, but the pointer isn't checked for null.

    Signed-off-by: Nate Dailey <nate.dailey@stratus.com>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Andreas Herrmann <aherrman@de.ibm.com>:
    [SCSI] zfcp: fix compile error

    Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] Fix tgafb.c compile failure

    The untested patch below should fix this compile error.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jody McIntyre <scjody@steamballoon.com>:
    [PATCH] ohci1394: tlabels misprinted in DBGMSG

    - Print the correct value in the DBGMSG in dma_rcv_tasklet().
      See OHCI 1.1 section 8.7, page 103 ff.
    - Print tlabels as %d everywhere.

    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jody McIntyre <scjody@steamballoon.com>:
    [PATCH] Fix non-legacy ISO receive regression

    Fix non-legacy multichannel ISO receive, broken by Parag Wardukar's
    allocation fix.  Multichannel ISO receive still sucks; it should be
possible
    to use both legacy and non-legacy modes at the same time, but with this
    patch, things are no worse than they were in 2.6.11 and allocation is
    still done at the correct time.

    Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

James Bottomley <James.Bottomley@SteelEye.com>:
    [PATCH] fix subarch breakage in amd dual core updates

    The patch to arch/i386/kernel/cpu/amd.c relies on the variable
    cpu_core_id which is defined in i386/kernel/smpboot.c.  This means it is
    only present if CONFIG_X86_SMP is defined, not CONFIG_SMP (alternative
    SMP harnesses won't have it, which is why it breaks voyager).

    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patrick McHardy <kaber@trash.net>:
    [NET]: Add missing newline for skb_*_panic

    While we're at it, lets also replace KERN_INFO by KERN_EMERG to
    make sure the user gets to see it.

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Chas Williams <chas@cmf.nrl.navy.mil>:
    [ATM]: sk_atm() conversion missed subtle change of vcc

    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Arnaldo Carvalho de Melo <acme@ghostprotocols.net>:
    [AX25]: make ax25_queue_xmit a net_device parameter

    I.e. not using skb->dev as a way to pass the parameter used to fill...
    skb->dev :-)

    Also to get the _type_trans open coded sequence grouped, next changesets
    will introduce ax25_type_trans.

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Adrian Bunk <bunk@stusta.de>:
    [ATM]: net/atm/resources.c: remove __free_atm_dev

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: add basic bcm5752 support

    Add ASIC_REV_5752 definition.

    Track-down all references to ASIC_REV_5750 and mirror them with
    references to the newly defined ASIC_REV_5752.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: add bcm5752 to tg3_pci_tbl

    Add hard-coded definition of bcm5752 PCI ID to tg3_pci_tbl.
    Next patch will change entry to use pci_ids.h-based definition.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: add bcm5752 entry to pci_ids.h

    Add proper entry for bcm5752 PCI ID to pci_ids.h, and use it in tg3.
    I did this separately in case patches like this (i.e. new PCI IDs)
    need to come from more "official" sources.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: use TG3_FLG2_5705_PLUS instead of multi-way if's

    Replace a number of three-way if statements checking for 5705, 5750,
    and 5752 to reference the equivalent TG3_FLG2_5705_PLUS flag instead.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: define TG3_FLG2_5750_PLUS flag

    Define TG3_FLG2_5750_PLUS flag and set it in tg3_get_invariants for
    ASIC_REV_5750 or ASIC_REV_5752.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: use new TG3_FLG2_5750_PLUS flag

    Replace a number of two-way if statements checking for 5750, and/or
    5752 to reference the newly-defined TG3_FLG2_5750_PLUS flag instead.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: more use of TG3_FLG2_5705_PLUS flag

    Rewrite of a couple of troublesome multi-way if statements to use
    TG3_FLG2_5705_PLUS flag.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: use TG3_FLG2_57{05,50}_PLUS flags in tg3_get_invariants

    Rewrite checks in tg3_get_invariants to use TG3_FLG2_5705_PLUS and
    TG3_FLG2_5750_PLUS flags.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: check TG3_FLG2_5750_PLUS flag to set TG3_FLG2_5705_PLUS flag

    Use check of TG3_FLG2_5750_PLUS in tg3_get_invariants to set
    TG3_FLG2_5705_PLUS flag.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

John W. Linville <linville@tuxdriver.com>:
    [TG3]: add support for bcm5752 rev a1

    Replace existing ASIC_REV_5752 definition with ASIC_REV_5752_A0,
    and add definition for ASIC_REV_5752_A1. Then, add ASIC_REV_5752_A1
    to check for setting TG3_FLG2_5750_PLUS in tg3_get_invariants.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Minor 5752 fixes

    Some minor 5752 fixes mostly for correctness and add 5752 PHY ID.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Split tg3_phy_probe into 2 functions

    Split the 1st half of tg3_phy_probe() into tg3_get_eeprom_hw_cfg() so
    that the TG3_FLAG_EEPROM_WRITE_PROT can be determined before calling
    tg3_set_power_state() in tg3_get_invariants(). This will allow
    tg3_set_power_state() to drive the GPIOs correctly based on the config.
    information in eeprom.

    On the 5752, there are no pull-up resistors on the GPIO pins and it is
    necessary to drive the unused GPIOs as output.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Setup proper GPIO settings

    Setup proper GPIO settings in tp->grc_local_ctrl before calling
    tg3_set_power() state in tg3_get_invariants() and after chip reset.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Fix tg3_set_power_state()

    Fix tg3_set_power_state to drive GPIOs properly based on the
    TG3_FLAG_EEPROM_WRITE_PROTECT flag. Some delays are also added after D0
    and D3 power state changes.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Workaround 5752 A0 chip ID

    The 5752 A0 chip ID is wrong in hardware. The simplest way to workaround
    it is to change it to the correct value in tp->pci_chip_rev_id. This
    way, it is easier to check for the ASIC_REV_5752 in the rest of the
    driver.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Add GPIO3 for 5752

    Add bit definitions for the new GPIO3 in 5752. GPIO3 must be driven as
    output when it is unused.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Add nvram detection for 5752

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Add nvram lock-out support for 5752 TPM

    Add support for the NVRAM lock-out feature for TPM in 5752. If lock-out
    is enabled, certain NVRAM registers cannot be written to.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Fix bug in tg3_set_eeprom()

    Fix a bug in tg3_set_eeprom() when the length is less than 4 and the
    offset is not 4-byte aligned.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Add msi support

    Add MSI support for 5751 C0 and 5752.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Add msi test

    Add MSI test for chips that support MSI. If MSI test fails, it will
    switch back to INTx mode and will print a message asking the user to
    report the failure.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Patrick McHardy <kaber@trash.net>:
    [XFRM]: Fix existence lookup in xfrm_state_find

    Use 'daddr' instead of &tmpl->id.daddr, since the latter
    might be zero.  Also, only perform the lookup when
    tmpl->id.spi is non-zero.

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@davemloft.net>:
    [SPARC64]: Provide a pgprot_noncached() implementation.

    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@sunset.davemloft.net>:
    [SPARC]: Provide generic ioctls in Sparc RTC driver.

    Provide support for drivers/char/rtc.c ioctls in the
    Mostek rtc driver as well as the Sparc specific RTCGET
    and RTCSET.

    This allows userspace to be much less messy.  Currently
    util-linux and other spots jump through hoops trying
    various ioctl variants until it hits the right one whatever
    driver actually being used supports.

    Eventually all of this should move over to the genrtc.c
    driver, but not today...

    While we are here, fix up the register types for sparse.

    Thanks to Frans Pop for helping point out this issue.

    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@davemloft.net>:
    [SPARC64]: In sunsu driver, make sure to fully init chip for kbd/ms

    We were forgetting to call sunsu_change_speed().  The reason
    that replugging in the mouse cable "fixes things" is that
    causes a BREAK interrupt which in turn caused a call to
    sunsu_change_speed() which would get the chip setup properly.

    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@davemloft.net>:
    [SPARC64]: In sunsab driver, make sure to set the uart timeout.

    This breaks serial consoles badly.  Thanks to Eric Brower
    for tracking down the problem.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Alexander Nyberg <alexn@telia.com>:
    [PATCH] x86_64: fix new out of line put_user()

    The labels after the last put_user patch were misplaced so
    exceptions on the real mov instructions would not be handled.

    Noted by Brian Gerst <bgerst@didntduck.org>

Arun Sharma <arun.sharma@intel.com>:
    [IA64] ia32_signal.c: erroneous use of memset/memcpy

    Found by Alexander Nyberg, improved by Bjorn Helgaas.

    - Fix the incorrect argument to sizeof()
    - looks like memcpy() code pass was dervived from code that used
      copy_from_user().  But in this case we are doing to kernel space
      to kernel space copy, so memcpy is the right routine, but it
      doesn't return an error code.

    Signed-off-by: Arun Sharma <arun.sharma@intel.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Ashok Raj <ashok.raj@intel.com>:
    [IA64] cpu hotplug: return offlined cpus to SAL

    This patch is required to support cpu removal for IPF systems. Existing
code
    just fakes the real offline by keeping it run the idle thread, and polling
    for the bit to re-appear in the cpu_state to get out of the idle loop.

    For the cpu-offline to work correctly, we need to pass control of this CPU
    back to SAL so it can continue in the boot-rendez mode. This gives the
    SAL control to not pick this cpu as the monarch processor for global MCA
    events, and addition does not wait for this cpu to checkin with SAL
    for global MCA events as well. The handoff is implemented as documented in
    SAL specification section 3.2.5.1 "OS_BOOT_RENDEZ to SAL return State"

Ashok Raj <ashok.raj@intel.com>:
    [IA64] Fix build errors for !HOTPLUG case.

    Signed-off-by: Ashok Raj <ashok.raj@intel.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>:
    [PATCH] USB: compilation failure on usb/image/microtek.c

    maybe typo?

    Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Sven Anderson <sven@anderson.de>:
    [PATCH] USB: clean up all iPod models in unusual_devs.h

    Phil Dibowitz wrote:
    > 1. You're adding product IDs 1202, 1203, 1204, and 1205. 1203 was
    > already there, but you remove it, OK, but 1205 is already there, so
    > you'll need to fix that.

    I was not removing 1203, it's just the extension of the bcd range. You are
    right about 1205, as I wrote, it was a patch against 2.6.11.7. Attached is
    a patch against 2.6.12-rc2.

    > 2. I'm OK with the full bcd range if Apple is changing it on firmware
    > revs... fine, but it's bcd, not hex... 0x9999 =)

    I just copied from other entries. There're a lot 0xffffs in unusual_dev.h,
    so I assumed it is correct. I changed it to 0x9999.

Greg KH <gregkh@suse.de>:
    [PATCH] USB: fix up the HP49G+ Calculator USB Serial driver

    Fix compiler warnings, and remove unneeded #includes

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Arthur Huillet <arthur.huillet@agoctrl.org>:
    [PATCH] USB: add HP49G+ Calculator USB Serial support

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Thomas Winischhofer <thomas@winischhofer.net>:
    [PATCH] USB: new SiS device id

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] USB: drivers/usb/media/pwc/: make code static

    This patch makes needlessly global code static.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] USB: drivers/usb/media/sn9c102_core.c: make 2 functions static

    This patch makes two needlessly global functions static.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] USB: drivers/usb/input/usbkbd.c: make a function static

    This patch makes a needlessly global function static.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] USB: drivers/usb/net/zd1201.c: make some code static

    This patch makes some needlessly global code static.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Roman Kagan <rkagan@mail.ru>:
    [PATCH] USB: scripts/mod/file2alias.c: handle numeric ranges for USB
bcdDevice

    Another attempt at that...

    The attached patch fixes the longstanding problem with USB bcdDevice
    numeric ranges incorrectly converted into patterns for MODULE_ALIAS
    generation.  Previously it put both the lower and the upper limits into
    the pattern, dlXdhY, making it impossible to fnmatch against except for
    a few special cases, like dl*dh* or dlXdhX.

    The patch makes it generate multiple MODULE_ALIAS lines covering the
    whole range with fnmatch-able patterns.  E.g. for a range between 0x0001
    and 0x8345 it gives the following patterns:

    000[1-9]
    00[1-9]*
    0[1-9]*
    [1-7]*
    8[0-2]*
    83[0-3]*
    834[0-5]

Roman Kagan <rkagan@mail.ru>:
    [PATCH] USB: MODALIAS change for bcdDevice

    The patch below adjusts the MODALIAS generated by the usb hotplug
    function to match the proposed change to scripts/mod/file2alias.c.

    Signed-off-by: Roman Kagan <rkagan@mail.ru>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

David Hollis <dhollis@davehollis.com>:
    [PATCH] usbnet: Convert ASIX code to use new status infrastructure

    Modify the ASIX USB Ethernet code to make use of the new status
    infrastructure in usbnet.

    Additionally, add a link_reset() handler to the struct usbnet
    structure to provide a generic means for a driver to perform link
    reset tasks such as a determining link speed and setting
    device flags accordingly.

    Signed-off-by: David Hollis <dhollis@davehollis.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

David Brownell <david-b@pacbell.net>:
    [PATCH] USB: better usbnet zaurus/mdlm/... fix

    This is a somewhat more comprehensive fix for the problem of devices
    like the newer Zaurii ... or in this case some Motorola cell phones.

    To recap, the problem's root cause is that these devices aren't using
    standard USB class specifications for their network links, and so far
    we've had to add lots of device-specific driver entries.  The vendor
    fix abuses the CDC MDLM descriptors (they _could_ have conformed to
    the spec, but didn't) and defines a "Belcarra firmware" pseudo-class.

    This patch recognizes that pseudo-class by the GUIDs in those descriptors,
    and handles the devices that just use the Zaurus framing.

    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

Patrick Boettcher <patrick.boettcher@desy.de>:
    [PATCH] USB: Fix for ati_remote

    when stealing code from ati_remote for a GPL-driver of my usbradio (because
of
    its neat usb int transfers) I found out, that the inbuf is freed twice.

    I don't have the ati-remote, so I don't know it is a problem at all, but
it
    looks strange to me anyway. Also I don't know if it has been fixed already
in
    newer kernel versions.

    From: Patrick Boettcher <patrick.boettcher@desy.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] mempolicy.c GFP fix

    zonelist_policy() forgot to mask non-zone bits from gfp when comparing
    zone number with policy_zone.

    ACKed-by: Andi Kleen <ak@suse.de>
    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] SCSI GFP fixes

    Somebody forgot that | has higher priority than ?:.  As the result,
    allocation is done with bogus flags - instead of GFP_ATOMIC + possibly
    GFP_DMA we always get GFP_DMA and no GFP_ATOMIC.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] msnd_pinnacle GFP fix

    Dumb typo - __get_free_page() takes gfp mask (in this case -
    GFP_KERNEL), not the page size...

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] __get_unaligned() turned into macro

    Turns __get_unaligned() and __put_unaligned into macros.  That is
    definitely safe; leaving them as inlines breaks on e.g.  alpha [try to
    build ncpfs there and you'll get unresolved symbols since we end up
    getting __get_unaligned() not inlined].

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] broken dependency for floppy on ARM

    (!ARCH_S390 && !M68K && !IA64 && !UML) is obviously always true on ARM.

    Intended behaviour for ARM is "absent unless we are on RiscPC or
    EBSA285".  So what we want is added && !ARM in the first term - without
    it the last part (|| ARCH_RPC || ARCH_EBSA285, that is) doesn't do
    anything.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] missing include in hisax

    Missing include, breaks at least on arm.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] broken dependency for I2C_MPC

    All boards dealt with by I2C_MPC are 32bit.  Moreover, driver simply
    won't build on ppc64 - it uses ppc32-only types all over the place.
    Dependency fixed - it's PPC32, not PPC.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] missing dependency on sparc64

    CONFIG_HW_CONSOLE selects vt.c; without the stuff pulled by CONFIG_VT it
    will not build.  Normally we get both in drivers/char/Kconfig and there
    HW_CONSOLE depends on VT.  sparc64 does not pull drivers/char/Kconfig
    and has that sutff in arch/sparc64/Kconfig instead.  However, it forgets
    to add the same dependency.  As the result, turning VT off [which is
    possible] will end up with broken build.  For no good reason...

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] mostek bogus sparse annotations fixed

    void * __iomem foo is not a pointer to iomem - it's an iomem variable
    containing void *.  A pile of such guys in arch/sparc64/kernel/time.c,
    drivers/sbus/char/rtc.c and include/asm-sparc64/mostek.h turned into
    intended void __iomem *.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] missing include in mthca

    Missing include - usual portability problems...

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc trivial iomem annotations: pmac_time.c

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc trivial iomem annotations: pmac_smp.c

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc trivial iomem annotations: chrp

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patrick McHardy <kaber@trash.net>:
    [NETFILTER]: Fix NAT sequence number adjustment

    The NAT changes in 2.6.11 changed the position where helpers
    are called and perform packet mangling. Before 2.6.11, a NAT
    helper was called before the packet was NATed and had its
    sequence number adjusted. Since 2.6.11, the helpers get packets
    with already adjusted sequence numbers.

    This breaks sequence number adjustment, adjust_tcp_sequence()
    needs the original sequence number to determine whether
    a packet was a retransmission and to store it for further
    corrections. It can't be reconstructed without more information
    than available, so this patch restores the old order by
    calling helpers from a new conntrack hook two priorities

Patrick McHardy <kaber@trash.net>:
    [NETFILTER]: Ignore PSH on SYN/ACK in TCP connection tracking

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Arnaldo Carvalho de Melo <acme@ghostprotocols.net>:
    [AX25] Introduce ax25_type_trans

    Replacing the open coded equivalents and making ax25 look more like
    a linux network protocol, i.e. more similar to inet.

    Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

chas williams <chas@cmf.nrl.navy.mil>:
    [ATM]: [he] Use the DMA_32BIT_MASK constant from dma-mapping.h

    Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>

chas williams <chas@cmf.nrl.navy.mil>:
    [ATM]: [fore200e] pci doesn't use global board list; use
pci_register_driver()

    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Jesper Juhl <juhl-lkml@dif.dk>:
    [SLIP]: Remove redundant NULL pointer checks prior to kfree

    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@sunset.davemloft.net>:
    [TCP]: skb pcount with MTU discovery

    The problem is that when doing MTU discovery, the too-large segments in
    the write queue will be calculated as having a pcount of >1.  When
    tcp_write_xmit() is trying to send, tcp_snd_test() fails the cwnd test
    when pcount > cwnd.

    The segments are eventually transmitted one at a time by keepalive, but
    this can take a long time.

    This patch checks if TSO is enabled when setting pcount.

    Signed-off-by: John Heffner <jheffner@psc.edu>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Andrew Morton <akpm@osdl.org>:
    [ATM]: ENI155P error handling fix

    From: Panagiotis Issaris <takis@lumumba.luc.ac.be>

    In the ENI155P device driver in six possible failure cases the requested
    irq is not being released.

    In three of the above possible failure cases additionally there seems to
    be a memory leak.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@davemloft.net>:
    [TG3]: Update driver version and release date.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Jamal Hadi Salim <hadi@cyberus.ca>:
    [PKT_SCHED]: Introduce simple actions.

    And provide an example simply action in order to
    demonstrate usage.

    Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Ben Greear <greearb@candelatech.com>:
    [NET]: Document ->hard_start_xmit() locking in comments.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Ben Greear <greearb@candelatech.com>:
    [NET]: Document ->hard_start_xmit() locking in netdevices.txt

    Signed-off-by: David S. Miller <davem@davemloft.net>

Herbert Xu <herbert@gondor.apana.org.au>:
    [SELINUX]: Fix ipv6_skip_exthdr() invocation causing OOPS.

    The SELinux hooks invoke ipv6_skip_exthdr() with an incorrect
    length final argument.  However, the length argument turns out
    to be superfluous.

    I was just reading ipv6_skip_exthdr and it occured to me that we can
    get rid of len altogether.  The only place where len is used is to
    check whether the skb has two bytes for ipv6_opt_hdr.  This check
    is done by skb_header_pointer/skb_copy_bits anyway.

    Now it might appear that we've made the code slower by deferring
    the check to skb_copy_bits.  However, this check should not trigger
    in the common case so this is OK.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Thomas Graf <tgraf@suug.ch>:
    [PKT_SCHED]: improve hashing performance of cls_fw

    Calculate hashtable size to fit into a page instead of a hardcoded
    256 buckets hash table. Results in a 1024 buckets hashtable on
    most systems.

    Replace old naive extract-8-lsb-bits algorithm with a better
    algorithm xor'ing 3 or 4 bit fields at the size of the hashtable
    array index in order to improve distribution if the majority of
    the lower bits are unused while keeping zero collision behaviour
    for the most common use case.

    Thanks to Wang Jian <lark@linux.net.cn> for bringing this issue
    to attention and to Eran Mann <emann@mrv.com> for the initial
    idea for this new algorithm.

    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Arnaldo Carvalho de Melo <acme@ghostprotocols.net>:
    [IPV6]: export inet6_sock_nr

    Please apply, SCTP/DCCP needs this when INET_REFCNT_DEBUG
    is set.

    Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Tom 'spot' Callaway <tcallawa@redhat.com>:
    [SPARC]: module version cleanups

    Minor cleanups for sparc specific drivers (sunbmac, sunqe, sunlance,
    sunhme, esp) so that they have a full module version definition that is
    consistent with other upstream drivers.

    Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Tom 'spot' Callaway <tcallawa@redhat.com>:
    [SPARC]: Stop-A printk cleanup

    This patch is incredibly trivial, but it does resolve some of the user
    confusion as to what "L1-A" actually is.

    Clarify printk message to refer to Stop-A (L1-A).

    Gentoo has a virtually identical patch in their kernel sources.

    Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Tom 'spot' Callaway <tcallawa@redhat.com>:
    [SPARC]: TCX Framebuffer fixes

    Using the same logic as the other framebuffer fixes committed in 2.6.11,
    this is a set of fixes to make TCX functional on the console again. Adds
    the tcx_pan_display function, sets the
    all->info.var.{red,green,blue}.length values to 8, and runs fb_set_cmap.
    Also looks for the correct SUNW,tcx prom value.

    This patch just slipped through the cracks.

    Originally by: Georg Chini <georg.chini@triaton-webhosting.com>

    Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Tom 'spot' Callaway <tcallawa@redhat.com>:
    [SPARC]: Missing sparc32 ksyms

    This patch adds some missing sparc32 ksyms that are needed.
    Specifically, ___rw_read_enter, ___rw_read_exit, ___rw_write_enter, and
    sys_close.

    Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Bob Breuer <breuerr@mc.net>:
    [SPARC]: Enable sun logo on sparc32

    This enables the sun linux logo to be selected on sparc32.

    Signed-off-by: Bob Breuer <breuerr@mc.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Tom 'spot' Callaway <tcallawa@redhat.com>:
    [SPARC]: More sparc32 ksyms cleanups

    The sparc32 ksyms is missing a few more symbols, these are primarily
    related to SMP, and will be needed as SMP gets beaten back into
    functionality.

    Specifically, add __cpu_data (PER_CPU), cpu_online_map, and
    phys_cpu_present_map.

    This patch assumes that the earlier "linux-2.6.11-sparc-fixksyms.patch"
    is applied, otherwise, it will apply with fuzz.

    Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Tom 'spot' Callaway <tcallawa@redhat.com>:
    [SPARC]: Fix mxcc warning

    Peter Jones uncovered this one while we were debugging the framebuffer
    issues. There are some references to -1 in the mxcc asm code, which
    should be 0xffffffff.

    This patch gets rid of the -1s.

    Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Tom 'spot' Callaway <tcallawa@redhat.com>:
    [SPARC]: dump_stack for sparc

    Bob Breuer wrote a patch to add dump_stack for sparc. Supposedly, this
    was applied, but it doesn't exist in 2.6.11.

    This is the same patch, rediffed against 2.6.11.

    Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@sunset.davemloft.net>:
    [SPARC64]: Fix SMP build.

    Kill build failures in the SMP+!PREEMPT case introduced
    by Al Viro's spinlock.h changes.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc user annotations: sigcontext

    sigcontext.regs is a userland pointer

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc iomem annotations: ->io_base_virt

    * ->io_base_virt in struct pci_controller is iomem pointer.  Marked as
such.
      Most of the places that used it are already annotated to expect iomem.
    * places that did gratitious (and wrong) casts a-la
    	isa_io_base = (unsigned long)ioremap(...);
    	hose->io_base_virt = (void *)isa_io_base;
      turned into
    	hose->io_base_virt = ioremap(...);
    	isa_io_base = (unsigned long)hose->io_base_virt;
    * pci_bus_io_base() annotated as returning iomem pointer.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc sparse annotations: emulate_string_inst()

    replaced declaration of EA from u32 to unsigned long - this beast is
    used only to cast it to (userland) pointer and proper integer type for
    that is unsigned long.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc iomem annotations: ebony_setup_pcix()

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc iomem annotations: pmac_low_i2c

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc iomem annotations: mv643xx_eth

    void * __iomem replaced with intended void __iomem *.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc user annotations: debug_setconetext(2)

    3rd argument of sys_debug_setcontext() is also a userland pointer.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] fs/aio.c: make some code static

    This patch makes some needlessly global code static.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Acked-by: Benjamin LaHaise <bcrl@kvack.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Lucas Correia Villa Real <lucasvr@org.rmk.(none)>:
    [PATCH] ARM: 2640/1: Adds DRAM/BANKSIZE_MASK definitions for S3C2400

    Patch from Lucas Correia Villa Real

    Adds DRAM refresh definitions and sets the BANKSIZE_MASK for the S3C2400
on
    include/asm-arm/arch-s3c2400/regs-mem.h

    Signed-off-by: Lucas Correia Villa Real
    Signed-off-by: Ben Dooks
    Signed-off-by: Russell King

Lucas Correia Villa Real <lucasvr@org.rmk.(none)>:
    [PATCH] ARM: 2641/1: Adds S3C2400_SPPIN_nCS to arch-s3c2410/regs-spi.h

    Patch from Lucas Correia Villa Real

    Adds a define to the SPI Card Select bit on the S3C2400 into
    include/asm-arm/arch-s3c2410/regs-spi.h

    Signed-off-by: Lucas Correia Villa Real
    Signed-off-by: Russell King

Mark Maule <maule@sgi.com>:
    [IA64-SGI] sn2-pci-dma-abstraction.patch

    Provide an abstraction of the altix pci dma runtime layer so that multiple
    pci-based bridges can be supported.

    Signed-off-by: Mark Maule <maule@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Mark Maule <maule@sgi.com>:
    [IA64-SGI] sn2-move-pci-headers.patch

    Move a couple of headers out of arch/ia64/sn/include/pci and into
    include/asm-ia64/sn.

    Signed-off-by: Mark Maule <maule@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Mark Maule <maule@sgi.com>:
    [IA64-SGI] altix: tioca chip driver (agp)

    Provide a driver for the altix TIOCA AGP chipset.  An agpgart backend will
    be provided as a separate patch.

    Signed-off-by: Mark Maule <maule@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Jack Steiner <steiner@sgi.com>:
    [IA64-SGI] Change SAL call request code for SN systems

    Change the value of the SAL call number for a new SAL request. The
    initial implementation in the PROM did not match what the OS expected.
    Since the OS can run on PROMs that do not implement the new call,
    changing the call number avoids the issue. New PROMs will implement
    the new call number. (This avoids problems with the 4.05 PROM).

    Signed-off-by: Jack Steiner <steiner@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

David Mosberger-Tang <davidm@hpl.hp.com>:
    [IA64] add missing cpu_relax() in ITC syncing code

    Call cpu_relax() in busy-waiting loops of the ITC-syncing code.

    Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Keith Owens <kaos@sgi.com>:
    [IA64] Tighten up unw_unwind_to_user check

    Detect user space by the unwind frame with predicate PRED_USER_STACK
    set, instead of a user space IP.  Tighten up the last ditch check for
    running off the top of the kernel stack.

    Based on a suggestion by David Mosberger, reworked to fit the current
    tree.  This survives my stress test which used to break 2.6.9 kernels.
    Unlike 2.6.11, the stress test now unwinds to the correct point, so
    gdb can get the user space registers.

    Signed-off-by: Keith Owens <kaos@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Yasuyuki KOZAKAI <yasuyuki.kozkaai@toshiba.co.jp>:
    [NETFILTER]: Fix truncated sequence numbers in FTP helper

    Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozkaai@toshiba.co.jp>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Patrick McHardy <kaber@trash.net>:
    [NETFILTER]: Drop conntrack reference when packet leaves IP

    In the event a raw socket is created for sending purposes only, the
creator
    never bothers to check the socket's receive queue.  But we continue to
    add skbs to its queue until it fills up.

    Unfortunately, if ip_conntrack is loaded on the box, each skb we add to
the
    queue potentially holds a reference to a conntrack.  If the user attempts
    to unload ip_conntrack, we will spin around forever since the queued skbs
    are pinned.

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@sunset.davemloft.net>:
    [PKT_SCHED]: Eliminate unnecessary includes in simple.c

    Noted by Al Viro.

    Signed-off-by: David S. Miller <davem@davemloft.net>

David Mosberger-Tang <davidm@hpl.hp.com>:
    [IA64] speed up syscall path a bit more

    Recently I noticed that clearing ar.ssd/ar.csd right before srlz.d is
    causing significant stalling in the syscall path.  The patch below
    fixes that by moving the register-writes after srlz.d.  On a Madison,
    this drops break-based getpid() from 241 to 226 cycles (-15 cycles).

    Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Mark Goodwin <markgw@sgi.com>:
    [IA64-SGI] Altix SN topology support for new chipsets and pci topology

    please accept this patch to the Altix SN platform topology export
    interface to support new chipsets and to export PCI topology.

    This follows on top of Jack Steiner's patch dated March 1st
    ("New chipset support for SN platform").

    Signed-off-by: Mark Goodwin <markgw@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Mark Goodwin <markgw@sgi.com>:
    [IA64-SGI] Altix SN topology fix potential infinite loop

    Fix infinite loop if sn_hwperf_location_to_bpos() fails.

    Signed-off-by: Mark Goodwin <markgw@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Colin Ngam <cngam@sgi.com>:
    [IA64-SGI] Shub2 provides an addition of 2 External Interrupt events.

    Signed-off-by: Colin Ngam <cngam@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Colin Ngam <cngam@sgi.com>:
    [IA64-SGI] support variable length nasids in shub2

    This patch enables our TIO IO chipset to support variable length nasids in
    Shub2 chipset.

    Signed-off-by: Colin Ngam <cngam@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Stephane Eranian <eranian@hpl.hp.com>:
    [IA64] perfmon: make pfm_sysctl a global, and other cleanup

    - make pfm_sysctl a global such that it is possible
      to enable/disable debug printk in sampling formats
      using PFM_DEBUG.

    - remove unused pfm_debug_var variable

    - fix a bug in pfm_handle_work where an BUG_ON() could
      be triggered. There is a path where pfm_handle_work()
      can be called with interrupts enabled, i.e., when
      TIF_NEED_RESCHED is set. The fix correct the masking
      and unmasking of interrupts in pfm_handle_work() such
      that we restore the interrupt mask as it was upon entry.

    signed-off-by: stephane eranian <eranian@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Bruce Losure <blosure@sgi.com>:
    [IA64-SGI] Bus driver for the CX port of SGI's TIO chip.

    This patch is to provide CX port infrastructure for SGI TIO-based
    h/w.   Also a 'core services' driver for SGI FPGA-based h/w.

    Signed-off-by: Bruce Losure <blosure@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Aaron J Young <ayoung@sgi.com>:
    [IA64-SGI] Altix: enable poweroff

    This patch adds the necessary "hook" to allow SGI/SN
    machines to perform a system power off upon a
    'init 0', 'halt -p', 'poweroff' or 'shutdown -h'.

    The "hook" is to set the pm_power_off callback
    to ia64_sn_power_down(). pm_power_off is checked
    in machine_power_off()/do_poweroff() and, if set, is executed.
    ia64_sn_power_down() is a function already present (but not
    used currently) in the sn kernel.
    ia64_sn_power_down() makes a SAL call to execute the
    power off.

    Signed-off-by: Aaron J Young <ayoung@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Bruce Losure <blosure@sgi.com>:
    [IA64-SGI]

    Missed the "bk new" for this file in the last commit.

    Signed-off-by: Bruce Losure <blosure@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Robin Holt <holt@sgi.com>:
    [IA64] Percpu quicklist for combined allocator for pgd/pmd/pte.

    This patch introduces using the quicklists for pgd, pmd, and pte levels
    by combining the alloc and free functions into a common set of routines.
    This greatly simplifies the reading of this header file.

    This patch is simple but necessary for large numa configurations.
    It simply ensures that only pages from the local node are added to a
    cpus quicklist.  This prevents the trapping of pages on a remote nodes
    quicklist by starting a process, touching a large number of pages to
    fill pmd and pte entries, migrating to another node, and then unmapping
    or exiting.  With those conditions, the pages get trapped and if the
    machine has more than 100 nodes of the same size, the calculation of

Alex Williamson <alex.williamson@hp.com>:
    [IA64] sba_iommu bug fixes

       This fixes a couple of bugs in the zx1/sx1000 sba_iommu.  These are
    all pretty low likelihood of hitting.  The first problem is a simple off
    by one, deep in the sba_alloc_range() error path.  Surrounding that was
    a lock ordering problem that could have potentially deadlocked with the
    order the locks are grabbed in sba_unmap_single().  I moved the resource
    locking into sba_search_bitmap() to prevent this.  Finally, there's a
    potential race between unmapping pdir entries and marking incoming DMA
    pages clean.  If you see any oddities, please let me know, but I've
    tested it pretty thoroughly here.  Tony, please apply.  Thanks,

    BTW, many of the options in this driver not on by default are becoming

Tony Luck <tony.luck@intel.com>:
    [IA64] fix: warning: `ql_size' might be used uninitialized

    Oops.  Should have caught this before I checked it in.

    Signed-off-by: Tony Luck <tony.luck@intel.com>

Tony Luck <tony.luck@intel.com>:
    [IA64] MAX_PGT_FREES_PER_PASS must be 'L' to avoid warning

    'min' is very picky about types of arguments, make it happy

    Signed-off-by: Tony Luck <tony.luck@intel.com>

Mark Maule <maule@sgi.com>:
    [IA64-SGI] disable TIOCA GART TLB prefetching

    Patch to disable SGI TIOCA GART TLB prefetching due to hw bug.

    Signed-off-by: Mark Maule <maule@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Russ Anderson <rja@sgi.com>:
    [IA64-SGI] Add new MMR definitions/Modify BTE initialiation&copy.

    patch 1:
    	Add new MMR definitions.
    	Modify BTE initialiation.
    	Modify BTE copy.

    Signed-off-by: Russ Anderson <rja@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Russ Anderson <rja@sgi.com>:
    [IA64-SGI] Shub2 BTE support - BTE recovery code

    patch 2:
    	Shub2 BTE recovery code will be implemented in SAL.
    	Define the SAL interface.
    	Modify bte_error to call SAL for shub2.

    Signed-off-by: Russ Anderson <rja@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

David Mosberger-Tang <davidm@hpl.hp.com>:
    [IA64] fix syscall-optimization goof

    Sadly, I goofed in this syscall-tuning patch:

    ChangeSet 1.1966.1.40 2005/01/22 13:31:05 davidm@hpl.hp.com
      [IA64] Improve ia64_leave_syscall() for McKinley-type cores.

      Optimize ia64_leave_syscall() a bit better for McKinley-type cores.
      The patch looks big, but that's mostly due to renaming r16/r17 to r2/r3.
      Good for a 13 cycle improvement.

    The problem is that the size of the physical stacked registers was
    loaded into the wrong register (r3 instead of r17).  Since r17 by
    coincidence always had the value 1, this had the effect of turning
    rse_clear_invalid into a no-op.  That poses the risk of leaking kernel
    state back to user-land and is hence not acceptable.

Mark Goodwin <markgw@sgi.com>:
    [IA64-SGI] Altix SN add support for slots in geoid_t locator

    This patch against ia64-test-2.6.12 is needed for forthcoming
    Altix chipsets. It renames geoid_any_t to geoid_common_t and
    splits the 8bit 'slab' field into two 4bit fields for 'slab'
    and 'slot'. Similar changes in the Altix SAL will retain backward
    compatibility for old kernels.

    Signed-off-by: Mark Goodwin <markgw@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Tony Luck <tony.luck@intel.com>:
    [IA64] Need to handle lfetch in "no_context" case.

    Thanks to Mark for tracking down this one.  Users of
__copy_from_user_inatomic()
    will be sad if we don't handle lfetch faults for the "no_context" case.

    Signed-off-by: Tony Luck <tony.luck@intel.com>

Keith Owens <kaos@sgi.com>:
    [IA64] __copy_user breaks on unaligned src

    memcpy_mck.S::__copy_user breaks in the prefetch code under these conditions
:-

    * src is unaligned and
    * dst is near the end of a page and
    * the page after dst is unmapped.

    Signed-off-by: Keith Owens <kaos@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Suresh Siddha <suresh.b.siddha@intel.com>:
    [IA64] multi-core/multi-thread identification

    Version 3 - rediffed to apply on top of Ashok's hotplug cpu
    patch.  /proc/cpuinfo output in step with x86.

    This is an updated MC/MT identification patch based on the
    previous discussions on list.

    Add the Multi-core and Multi-threading detection for IPF.
      - Add new core and threading related fields in /proc/cpuinfo.
    		Physical id
    		Core id
    		Thread id
    		Siblings
      - setup the cpu_core_map and cpu_sibling_map appropriately
      - Handles Hot plug CPU

    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Gordon Jin <gordon.jin@intel.com>
    Signed-off-by: Rohit Seth <rohit.seth@intel.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>:
    [IA64] vector sharing (Large I/O system support)

    Current ia64 linux cannot handle greater than 184 interrupt sources
    because of the lack of vectors. The following patch enables ia64 linux
    to handle greater than 184 interrupt sources by allowing the same
    vector number to be shared by multiple IOSAPIC's RTEs. The design of
    this patch is besed on "Intel(R) Itanium(R) Processor Family Interrupt
    Architecture Guide".

    Even if you don't have a large I/O system, you can see the behavior of
    vector sharing by changing IOSAPIC_LAST_DEVICE_VECTOR to fewer value.

    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Tony Luck <tony.luck@intel.com>:
    [IA64] print "siblings" before {physical,core,thread} id

    Rohit and Suresh changed their mind about the order to print things
    in /proc/cpuinfo, but didn't include the change in the version of
    the patch they sent to me.

    Signed-off-by: Tony Luck <tony.luck@intel.com>

Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>:
    [IA64] iosapic.c: typo ... s/spin_unlock_irq/spin_unlock/

    vector sharing patch had a typo ... mismatched spin_lock() with
    a spin_unlock_irq().  Fix from Kenji Kaneshige.

    Signed-off-by: Tony Luck <tony.luck@intel.com>

Greg Howard <ghoward@sgi.com>:
    [IA64] Altix system controller event handling

    The following is an update of the patch I sent yesterday
    (3/9/05) incorporating suggestions from Christoph Hellwig and
    Andreas Schwab.  It allows Altix and Altix-like systems to
    handle environmental events generated by the system controllers,
    and should apply on top of Jack Steiner's patch of 3/1/05 ("New
    chipset support for SN platform") and Mark Goodwin's patch of
    3/8/05 ("Altix SN topology support for new chipsets and pci
    topology").

    Signed-off-by: Greg Howard <ghoward@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Greg Howard <ghoward@sgi.com>:
    [IA64-SGI] snsc_event.c new file

    Forgot the "bk new" to add this file. Part of the patch
    from Greg Howard

    Signed-off-by: Tony Luck <tony.luck@intel.com>

Jesse Barnes <jbarnes@sgi.com>:
    From: jbarnes@sgi.com

    [IA64] fix ia64 Kconfig to allow CONFIG_PM on sn2

    This probably should have been fixed when I fixed up the generic build for
    discontig+numa machines, but oh well.

    CONFIG_PM is allowable for generic builds but not for sn2 builds, which
    doesn't make much sense, and in fact breaks the build if recent ACPI bits
are
    added to the tree.  It looks like the only arch that needs to prevent
    CONFIG_PM stuff is the ski simulator (though those options could probably
use
    some cleanup as well), so remove the big conditional and replace it with a
    simple test for IA64_HP_SIM instead.

    Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Lucas Correia Villa Real <lucasvr@org.rmk.(none)>:
    [PATCH] ARM: 2644/1: Adds S3C2400 support to uncompress.h

    Patch from Lucas Correia Villa Real

    The S3C2400 doesn't have a cpuid information stored anywhere. This patch
adds
    support to the S3C2400 at include/asm-arm/arch-s3c2400/uncompress.h by
    initializing the cpuid variable to the S3C2410, as they share the same
    routine. The GSTATUS1 pin is then used only if not compiling for the
S3C2400.

    Signed-off-by: Lucas Correia Villa Real
    Signed-off-by: Ben Dooks
    Signed-off-by: Russell King

Lucas Correia Villa Real <lucasvr@org.rmk.(none)>:
    [PATCH] ARM: 2645/1: Adds IIS definitions for the S3C2400

    Patch from Lucas Correia Villa Real

    Adds IISFCON definitions for the S3C2400 at
    include/asm-arm/arch-s3c2400/regs-iis.h.

    Signed-off-by: Lucas Correia Villa Real
    Signed-off-by: Ben Dooks
    Signed-off-by: Russell King

Michael Chan <mchan@broadcom.com>:
    [TG3]: Fix bug in tg3_rx()

    This patch fixes a bug that causes tg3_has_work() to always return 1.

    rx work is determined by comparing tp->rx_rcb_ptr with the current hw
    producer index. The hw producer index is modulo the ring size, but tp-
    >rx_rcb_ptr is a free running counter that goes up beyond the ring size.
    After the ring wraps around once, tg3_has_work() will always return 1.

    The fix is to always do modulo arithmetic on tp->rx_rcb_ptr.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Refresh hw index in tg3_rx()

    This patch refreshes the hw rx producer in tg3_rx() so that additional
    work posted by the hardware can be processed.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Fix tg3_restart_ints()

    tg3_restart_ints() is called to re-enable interrupts after tg3_poll()
    has finished all the work. It calls tg3_cond_int() to force an interrupt
    if the status block updated bit is set. The updated bit will be set if
    there is a new status block update sometime during tg3_poll() and it can
    be very often. The worst part is that even if all the work has been
    processed, the updated bit remains set and an interrupt will be forced
    unnecessarily.

    The fix is to call tg3_has_work() instead to determine if new work is
    posted before forcing an interrupt. The way to force an interrupt is
    also changed to use "coalesce_now" instead of "SETINT". The former is
    generally a safer way to force the interrupt.

Jeff Lackey <jlackey@net.rmk.(none)>:
    [PATCH] ARM: 2650/1: PXA27x sleep - workaround Errata 39 & 50 (Patch 2667)

    Patch from Jeff Lackey

    This patch updates arch/arm/mach-pxa/sleep.S to support
    the PXA270 CPU.  It works around Errata 39 & 50 from the
    Intel(R) PXA27x Processor Family Specification Update.

    Signed-off-by: Jeff Lackey
    Signed-off-by: Russell King

Deepak Saxena <dsaxena@net.rmk.(none)>:
    [PATCH] ARM: 2653/1: Fix memset and memzero macro double-reference of
parameters

    Patch from Deepak Saxena

    The current memset() and memzero() macros on ARM reference the
    incoming parameters more than once and this can cause uninted
    side-effects. The issue was found while debugging SCTP protocol
    and with the specific usage of memzero(skb_put(skb,size),size).
    This call would call skb_put(skb,size) twice leading to badness.
    The fixed version copies the incoming parameters into local
    variables and uses those instead.

    Signed-off-by: Deepak Saxena
    Signed-off-by: Russell King

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc annotations: mpsc

    Usual iomem annotations + NULL noise removal.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc annotations: i2c-mpc

    Usual iomem annotations and NULL noise removal.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] isofs includes sanitized

    fs/isofs includes trimmed down to something resembling sanity.

    Kernel-only parts of linux/iso_fs.h and entire linux/iso_fs_{sb,i}.h
    moved to fs/isofs/isofs.h.

    A lot of useless #include in fs/isofs/*.c killed.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] kill gratitious includes of major.h under net/*

    A lot of places in there are including major.h for no reason whatsoever.
    Removed.  And yes, it still builds.

    The history of that stuff is often amusing.  E.g.  for net/core/sock.c
    the story looks so, as far as I've been able to reconstruct it: we used
    to need major.h in net/socket.c circa 1.1.early.  In 1.1.13 that need
    had disappeared, along with register_chrdev(SOCKET_MAJOR, "socket",
    &net_fops) in sock_init().  Include had not.  When 1.2 -> 1.3 reorg of
    net/* had moved a lot of stuff from net/socket.c to net/core/sock.c,
    this crap had followed...

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

James Morris <jmorris@redhat.com>:
    [TCP]: Trivial tcp_data_queue() cleanup

    This patch removes a superfluous intialization from tcp_data_queue().

    Signed-off-by: James Morris <jmorris@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [NET]: kill gratitious includes of major.h

    	A lot of places in there are including major.h for no reason
    whatsoever.  Removed.  And yes, it still builds.

    	The history of that stuff is often amusing.  E.g. for net/core/sock.c
    the story looks so, as far as I've been able to reconstruct it: we used to
    need major.h in net/socket.c circa 1.1.early.  In 1.1.13 that need had
    disappeared, along with register_chrdev(SOCKET_MAJOR, "socket", &net_fops)
    in sock_init().  Include had not.  When 1.2 -> 1.3 reorg of net/* had
moved
    a lot of stuff from net/socket.c to net/core/sock.c, this crap had
followed...

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: remove some entry initialisation asm code

    Convert the trivial vector entry initialisation code to C code.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Remove argument for disable_irq/enable_irq

    Since we do not require a register for these operations, we can
    remove this unnecessary argument.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: pt_regs offsets

    Generate pt_regs S_xx offsets from the structure itself instead
    of #defining them.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Use __NR_SYSCALL_BASE and __ARM_NR_BASE in asm code

    Don't define our own local constants, but use those already defined
    in asm/unistd.h instead.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Remove SVC_MODE definition

    SVC_MODE reflects the MODE_SVC definition in asm/ptrace.h.  Use
    the asm/ptrace.h definition instead, and remove SVC_MODE.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: remove PT_TRACESYS

    PT_TRACESYS is unused, remove it.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Remove single-use user save/restore macros

    Assembly macros are pointless if they're only used once.  Move
    them inline.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: make entry*.S includes more logical

    Move common includes to entry-header, and file specific includes
    to the relevant file.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] Serial: Ensure error paths are marked with unlikely()

    Ensure ARM serial driver error paths are marked with the
    unlikely() compiler hint.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] Serial: Move error path processing inline

    With unlikely() there's no need for the error path to
    use gotos.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] Serial: Convert 8250_hp300 to use serial8250_{un,}register_port

    Convert 8250_hp300 to use serial8250_register_port() and
    serial8250_unregister_port().

    Tested by Kars de Jong, 4/4/2005.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] fix SND_POWERMAC dependencies

    This beast is pmac-only; moreover, it won't build on other
    subarchitectures.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] savagefb iomem annotations

    trivial iomem annotations + memset() replaced with memset_io() in a
    place that deals with ioremapped area.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ppc-opc NULL noise removal

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] pegasus NULL noise removal

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] tpm 64bit fixes (size_t)

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] drivers/scsi NULL noise removal

    NULL noise in sbus scsi drivers got missed

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] amd64 rt_sigframe user annotation

    ->pretcode in struct rt_sigframe is a userland pointer (and already
    treated as such by code using that field).

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] oprofile trivial user annotations

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] imsttfb missing iomem annotations

    write_reg_le32() and read_reg_le32() expect iomem pointers...

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] qla trivial iomem annotation

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Martin Hicks <mort@sgi.com>:
    [IA64] re-enable preempt before page allocation for pgtable quicklist

    This is a fix to the pgtable_quicklist code.  There is a GFP_KERNEL
    allocation in pgtable_quicklist_alloc(), which spews the usual warnings
    if the kernel is under heavy VM pressure and the reclaim code is
    invoked.  re-enable preempt before we allocate the new page.

    This patch is against 2.6.12-rc2-mm2

    Signed-off-by:  Martin Hicks <mort@sgi.com>
    Signed-off-by:  Tony Luck <tony.luckintel.com>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] size_t portability fixes - drivers/usb

    size_t is zu, ssize_t is zd...

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] ppc64: trivial user annotations

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Marcelo Tosatti <marcelo.tosatti@cyclades.com>:
    [PATCH] PC300 pci_enable_device fix

    Call pci_enable_device() before looking at IRQ and resources,
    and pci_disable_device() when shutting the interface down.

    The driver requires this fix or the "pci=routeirq" workaround
    on 2.6.10 and later kernels.

    Reported and tested by Artur Lipowski.

    From: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mark Haverkamp <markh@osdl.org>:
    [SCSI] aacraid: Fix adapter open error

    This fixes an error on the device open code that allows a non-existent
    device to be opened causing later panic problems.

    Signed-off-by: Mark Haverkamp <markh@osdl.org>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Add further explaination for clk_get()

    clk_get() comments can be confusing.  Add extra explaination of
    the dev and id parameters to ensure correct usage.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

David Howells <dhowells@redhat.com>:
    [PATCH] NFS4: Don't use __user with compat_uptr_t

    The attached patch removes __user from compat_uptr_t types in the NFS4
mount
    32-bit->64-bit compatibility structures.

    Signed-Off-By: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc64: Fix return value of some vDSO calls

    The ppc vDSO would not properly clear the return value for some calls,
    which will be a problem when interfacing those calls with glibc. This
    should be fixed before 2.6.12 is released (as it is the first kernel
    with the ppc vDSO) so that we don't have to play with symbol versioning
    and ugly workarounds.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Fix AMBA CLCD fb driver for 1bpp/STN mono panels

    Fix the AMBA CLCD framebuffer driver for 1bpp modes and STN
    monochrome LCD panels.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Fix AMBA CLCD fb driver for 32bpp

    We were supporting 24bpp.  However, the pixel organisation in
    memory was 0RGB, so it was 24bpp in 32bit words.  This means
    we're actually supporting 32bpp and not 24bpp.

    Also, add a check to ensure that we don't exceed the available
    framebuffer when changing display resolutions.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: AMBA CLCD: X resolutions must be multiples of 16

    We ignore the bottom 4 bits of the X resolution, so we should
    round X resolutions up to the nearest multiple of 16.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Christoph Lameter <clameter@engr.sgi.com>:
    [PATCH] time interpolator: Fix settimeofday inaccuracy

    settimeofday will set the time a little bit too early on systems using
    time interpolation since it subtracts the current interpolator offset
    from the time. This used to be necessary with the code in 2.6.9 and
earlier
    but the new code resets the time interpolator after setting the time.
    Thus the time is set too early and gettimeofday will return a time
slightly
    before the time specified with settimeofday if invoked immeditely after
    settimeofday.

    This removes the obsolete subtraction of the time interpolator offset
    and makes settimeofday set the time accurately.

    Signed-off-by: Christoph Lameter <clameter@sgi.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

David S. Miller <davem@sunset.davemloft.net>:
    [TG3]: Set SA_SAMPLE_RANDOM in request_irq() calls.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Vladislav Yasevich <vladislav.yasevich@hp.com>:
    [SCTP] Fix SCTP_ASSOCINFO getsockopt for 1-1 style

    Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Jerome Forissier <jerome.forissier@hp.com>:
    [SCTP] Implement Sec 2.41 of SCTP Implementers guide.

    - Fixed sctp_vtag_verify_either() to comply with impguide 2.41 B) and C).
    - Make sure vtag is reflected when T-bit is set in SHUTDOWN-COMPLETE sent
      due to an OOTB SHUTDOWN-ACK and in ABORT sent due to an OOTB packet.
    - Do not set T-Bit in ABORT chunk in response to INIT.
    - Fixed some comments to reflect the new meaning of the T-Bit.

    Signed-off-by: Jerome Forissier <jerome.forissier@hp.com>
    Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Brian Haley <Brian.Haley@hp.com>:
    [SCTP] Use ipv6_addr_any() rather than ipv6_addr_type() in
sctp_v6_is_any().

    Signed-off-by: Brian Haley <Brian.Haley@hp.com>
    Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Neil Horman <nhorman@redhat.com>:
    [SCTP] Fix bug in sctp_init() error handling code.

    Signed-off-by: Neil Horman <nhorman@redhat.com>
    Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Sridhar Samudrala <sri@us.ibm.com>:
    [SCTP] Replace incorrect use of dev_alloc_skb with alloc_skb in
sctp_packet_transmit().

    Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Neil Horman <nhorman@redhat.com>:
    [SCTP] Fix SCTP sendbuffer accouting.

    - Include chunk and skb sizes in sendbuffer accounting.
    - 2 policies are supported. 0: per socket accouting, 1: per association
      accounting

    DaveM: I've made the default per-socket.

    Signed-off-by: Neil Horman <nhorman@redhat.com>
    Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Dave Jones <davej@redhat.com>:
    [IPV4]: Incorrect permissions on route flush sysctl

    This has been brought up before.. http://lkml.org/lkml/2000/1/21/116
    but didnt seem to get resolved.  This morning I got someone
    file a bugzilla about it breaking sysctl(8).

    Signed-off-by: Dave Jones <davej@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Dave Jones <davej@redhat.com>:
    [IPV6]: Incorrect permissions on route flush sysctl

    On Mon, Apr 25, 2005 at 12:01:13PM -0400, Dave Jones wrote:
     > This has been brought up before.. http://lkml.org/lkml/2000/1/21/116
     > but didnt seem to get resolved.  This morning I got someone
     > file a bugzilla about it breaking sysctl(8).

    And here's its ipv6 counterpart.

    Signed-off-by: Dave Jones <davej@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Nicolas Dichtel <nicolas.dichtel@6wind.com>:
    [PKT_SCHED]: Fix range in psched_tod_diff() to 0..bound

    Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Olaf Rempel <razzor@kopf-tisch.de>:
    [NET]: /proc/net/stat/* header cleanup

    Signed-off-by: Olaf Rempel <razzor@kopf-tisch.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Roland McGrath <roland@redhat.com>:
    [PATCH] Fix error recovery path for arch_setup_additional_pages

    If arch_setup_additional_pages fails, the error path will do some
double-frees.
    This fixes it.

    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Only send POSIX ACL calls to server if server claims to support that capability
bit

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Gracefully turn off serverino (when serverino is enabled on
mount)

    Old servers such as NT4 do not support this level of FindFirst (and
    retry with a lower infolevel)

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Enable ioctl support in POSIX extensions to handle lsattr

    remove sparse warnings, unnecessary pad in QueryFileInfo and redundant
    function define.

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: add support for chattr/lsattr in new CIFS POSIX extensions

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Add new mount parm mapchars

    For handling seven special characters that shells use for filenames.

    This first parts implements conversions from Unicode.

    Signed-off-by: Steve French
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Fix multiuser packet signing to use the right sequence number and mac session
key

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: fix rare oops in cifs_close

    Protect access to cifs file list in cifs_close path

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: remove a few redundant null pointer checks, and cleanup misc source
formatting

    Mostly suggested by Jesper Juhl

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: finish up of special character mapping capable unicode conversion routine part 2
of 3

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: character mapping of special characters (part 3 of 3)

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Fix PPC64 compile error

    .. and do not double endian convert the special characters whem mounted
    with mapchars mount parm.

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Missing initialization for largeBuf flag left out of previous
changeset

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Do not interpret oplock break responses as responses to an unrelated
command

    .. even if the multiplex ids match.

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Do not use large smb buffers in response path

    unless response is larger than 256 bytes.  This cuts more than 1/3 of
    the large memory allocations that cifs does and should be a huge help to
    memory pressure under stress.

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: cleanup of ifdefs usage so it is more consistent

    And fix to not needlessly send new POSIX QFSInfo when server does not
    explicitly claim support for the new protocol extensions.

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: CIFS ioctl needed by umount.cifs utility

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: improve check for search entry going beyond end of SMB
transact

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: remove cifs_kcalloc and check for NULL return on kcalloc in session
initialization

    Suggested by: Adrian Bunk and Dave Miller

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Fix caching problem

    pointed out by Dave Stahl and Vince Negri in which cifs can update the
    last modify time on a server modified file without invalidating the
    local cached data due to an intervening readdir.

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Ease memory pressure, do not use large buffers in byte range lock
requests.

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Better handle errors on second socket recv message call

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: missing semicolon from previous fix

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Handle multiple response transact2 part 1 of 2

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Fix mapping of EMLINK case

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: cleanup various long lines

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: handle termination of cifs oplockd kernel thread

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Handle case of multiple trans2 responses for one SMB request (part 2 of
2)

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Do not sleep interruptible after socket connect failure

    .. since it can be due to pending kill.

    Update readme information to better describe cifs umount

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Do not init smb requests or block when sending requests

    if cifsd thread is no longer running to demultixplex responses.

    Do not send FindClose request when FindFirst failed without reaching end
    of search.

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Roland McGrath <roland@redhat.com>:
    [PATCH] x86_64: fix PT_NOTE addition to IA32 vDSO

    The addition of the PT_NOTE didn't take in the x86_64 version of the i386
    vDSO, because I forgot the linker script bit in that copy.

    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] Add suspend method to cpufreq core

    In order to properly fix some issues with cpufreq vs. sleep on
    PowerBooks, I had to add a suspend callback to the pmac_cpufreq driver.
    I must force a switch to full speed before sleep and I switch back to
    previous speed on resume.

    I also added a driver flag to disable the warnings in suspend/resume
    since it is expected in this case to have different speed (and I want it
    to fixup the jiffies properly).

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 <dwmw2@shinybook.infradead.org>:
    AUDIT: Avoid log pollution by untrusted strings.

    We log strings from userspace, such as arguments to open(). These could
    be formatted to contain \n followed by fake audit log entries. Provide
    a function for logging such strings, which gives a hex dump when the
    string contains anything but basic printable ASCII characters. Use it
    for logging filenames.

    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Andrew Morton <akpm@osdl.org>:
    audit_log_untrustedstring() warning fix

    kernel/audit.c: In function `audit_log_untrustedstring':
    kernel/audit.c:736: warning: comparison is always false due to limited range of data
type

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Prasanna Meda <pmeda@akamai.com>:
    namei: add audit_inode to all branches in path_lookup

    Main change is in path_lookup: added a goto to do audit_inode
    instead of return statement, when emul_lookup_dentry for root
    is successful.The existing code does audit_inode only when
    lookup is done in normal root or cwd.

    Other changes: Some lookup routines are returning zero on success,
    and some are returning zero on failure. I documented the related
    function signatures in this code path, so that one can glance over
    abstract functions without understanding the entire code.

    Signed-off-by: Prasanna Meda <pmeda@akamai.com>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

 <dwmw2@shinybook.infradead.org>:
    [AUDIT] Don't allow ptrace to fool auditing, log arch of audited syscalls.

    We were calling ptrace_notify() after auditing the syscall and arguments,
    but the debugger could have _changed_ them before the syscall was actually
    invoked. Reorder the calls to fix that.

    While we're touching ever call to audit_syscall_entry(), we also make it
    take an extra argument: the architecture of the syscall which was made,
    because some architectures allow more than one type of syscall.

    Also add an explicit success/failure flag to audit_syscall_exit(), for
    the benefit of architectures which return that in a condition register
    rather than only returning a single register.

    Change type of syscall return value to 'long' not 'int'.

Steve Grubb <sgrubb@redhat.com>:
    [AUDIT] Fix signedness of 'serial' in various routines.

    Attached is a patch that corrects a signed/unsigned warning. I also
noticed
    that we needlessly init serial to 0. That only needs to occur if the
kernel
    was compiled without the audit system.

    -Steve Grubb

    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Peter Martuccelli <peterm@redhat.com>:
    [AUDIT] Avoid using %*.*s format strings.

    They don't seem to work correctly (investigation ongoing), but we don't
    actually need to do it anyway.

    Patch from Peter Martuccelli <peterm@redhat.com>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Amy Griffis <amy.griffis@hp.com>:
    [PATCH] fix ia64 syscall auditing

    Attached is a patch against David's audit.17 kernel that adds checks
    for the TIF_SYSCALL_AUDIT thread flag to the ia64 system call and
    signal handling code paths.The patch enables auditing of system
    calls set up via fsys_bubble_down, as well as ensuring that
    audit_syscall_exit() is called on return from sigreturn.

    Neglecting to check for TIF_SYSCALL_AUDIT at these points results in
    incorrect information in audit_context, causing frequent system panics
    when system call auditing is enabled on an ia64 system.

    Signed-off-by: Amy Griffis <amy.griffis@hp.com>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Yoichi Yuasa <yuasa@hh.iij4u.or.jp>:
    mips: warning fix audit_arch()

    arch/mips/kernel/ptrace.c:305: warning: function declaration isn't a
prototype
    Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

 <dwmw2@shinybook.infradead.org>:
    audit: update pointer to userspace tools, remove emacs mode tags

Serge Hallyn <serue@us.ibm.com>:
    Add audit uid to netlink credentials

    Most audit control messages are sent over netlink.In order to properly
    log the identity of the sender of audit control messages, we would like
    to add the loginuid to the netlink_creds structure, as per the attached
    patch.

    Signed-off-by: Serge Hallyn <serue@us.ibm.com>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Chris Wright <chrisw@osdl.org>:
    [AUDIT] Requeue messages at head of queue, up to audit_backlog

    If netlink_unicast() fails, requeue the skb back at the head of the queue
    it just came from, instead of the tail. And do so unless we've exceeded
    the audit_backlog limit; not according to some other arbitrary limit.

    From: Chris Wright <chrisw@osdl.org>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Steve Grubb <sgrubb@redhat.com>:
    [AUDIT] LOGIN message credentials

    Attached is a new patch that solves the issue of getting valid credentials
    into the LOGIN message. The current code was assuming that the audit
context
    had already been copied. This is not always the case for LOGIN messages.

    To solve the problem, the patch passes the task struct to the function
that
    emits the message where it can get valid credentials.

    Signed-off-by: Steve Grubb <sgrubb@redhat.com>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Linus Torvalds <torvalds@ppc970.osdl.org>:
    Remove bogus BUG() in kernel/exit.c

    It's old sanity checking that may have been useful for debugging, but
    is just bogus these days.

    Noticed by Mattia Belletti.

Linus Torvalds <torvalds@ppc970.osdl.org>:
    x86: make traps on 'iret' be debuggable in user space

    This makes a trap on the 'iret' that returns us to user space
    cause a nice clean SIGSEGV, instead of just a hard (and silent)
    exit.

    That way a debugger can actually try to see what happened, and
    we also properly notify everybody who might be interested about
    us being gone.

    This loses the error code, but tells the debugger what happened
    with ILL_BADSTK in the siginfo.

Lennert Buytenhek <buytenh@org.rmk.(none)>:
    [PATCH] ARM: 2657/1: export ixp2000_pci_config_addr

    Patch from Lennert Buytenhek

    Export ixp2000_pci_config_addr, to be used by the IXDP2800 platform
    setup code to coordinate booting the master and slave NPU.

    Signed-off-by: Lennert Buytenhek
    Signed-off-by: Deepak Saxena
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Lennert Buytenhek <buytenh@org.rmk.(none)>:
    [PATCH] ARM: 2658/1: start ixp2000 pci memory resource at 0xe0000000

    Patch from Lennert Buytenhek

    On the IXDP2800, the bootloader does an awful job of configuring
    the PCI bus, so we make linux reconfigure everything.  Having a 1:1
    pci:phys address mapping generally simplifies everything, so try to
    allocate PCI addresses from the [e0000000..ffffffff] range, which is
    the physical address range of the outbound PCI window on the IXP2000.
    This does not affect any of the other IXP2000 platforms since they
    all use their bootloader's PCI resource assignment.

    Signed-off-by: Lennert Buytenhek
    Signed-off-by: Deepak Saxena
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Lennert Buytenhek <buytenh@org.rmk.(none)>:
    [PATCH] ARM: 2659/1: do not assign PCI I/O address zero on IXP2000

    Patch from Lennert Buytenhek

    Assigning the address zero to a PCI device BAR causes some part of the
    PCI subsystem to believe that resource allocation for that BAR failed
    due to resource conflicts, which will make attempts to enable the
    device fail.  Work around this by assigning I/O addresses starting
    from 00010000.
    While we're at it, make the PCI I/O resource end at 0001ffff, since we
    only have 64k of outbound I/O window on the IXP2000, and we don't do
    bank switching.

    Signed-off-by: Lennert Buytenhek
    Signed-off-by: Deepak Saxena
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Nicolas Pitre <nico@org.rmk.(none)>:
    [PATCH] ARM: 2651/3: kernel helpers for NPTL support

    Patch from Nicolas Pitre

    This patch entirely reworks the kernel assistance for NPTL on ARM.
    In particular this provides an efficient way to retrieve the TLS
    value and perform atomic operations without any instruction emulation
    nor special system call.  This even allows for pre ARMv6 binaries to
    be forward compatible with SMP systems without any penalty.
    The problematic and performance critical operations are performed
    through segment of kernel provided user code reachable from user space
    at a fixed address in kernel memory.  Those fixed entry points are
    within the vector page so we basically get it for free as no extra
    memory page is required and nothing else may be mapped at that

George G. Davis <davis_g@com.rmk.(none)>:
    [PATCH] ARM: 2655/1: ARM1136 SWP instruction abort handler fix

    Patch from George G. Davis

    As noted in http://www.arm.com/linux/patch-2.6.9-arm1.gz, the
    "Faulty SWP instruction on 1136 doesn't set bit 11 in DFSR." So the
    v6_early_abort handler does not report the correct rd/wr direction
    for the SWP instruction which may result in SEGVS or hangs.  In
    order to work around this problem, this patch merely updates the fix
    contained in the ARM Ltd.  patch to use the macroised abort handler
    fixups. 

    Signed-off-by: George G. Davis
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Olav Kongas <ok@ee.rmk.(none)>:
    [PATCH] ARM: 2649/1: Fix 'sparse -Wbitwise' warnings from MMIO macros

    Patch from Olav Kongas

    On ARM, the outX() and writeX() families of macros take the
    result of cpu_to_leYY(), which is of restricted type __leYY,
    and feed it to __raw_writeX(), which expect an argument of
    unrestricted type. This results in 'sparse -Wbitwise'
    warnings about incorrect types in assignments. Analogous
    type mismatch warnings are issued for inX() and readX()
    counterparts. The below patch resolves these warnings by
    adding forced typecasts.

    Signed-off-by: Olav Kongas
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

George G. Davis <davis_g@com.rmk.(none)>:
    [PATCH] ARM: 2656/1: Access permission bits are wrong for kernel XIP sections on
ARMv6

    Patch from George G. Davis

    This patch is required for kernel XIP support on ARMv6 machines.  It
    ensures that the access permission bits for kernel XIP section
    descriptors are APX=1 and AP[1:0]=01, which is Kernel read-only/User
    no access permissions.  Prior to this change, kernel XIP section
    descriptor access permissions were set to Kernel no access/User no
    access on ARMv6 machines and the kernel would therefore hang upon
    entry to userspace when set_fs(USER_DS) was executed. 

    Signed-off-by: Steve Longerbeam
    Signed-off-by: George G. Davis
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Lennert Buytenhek <buytenh@org.rmk.(none)>:
    [PATCH] ARM: 2660/2: fix ixdp2800 boot and pci init

    Patch from Lennert Buytenhek

    The IXDP2800 is an evalution platform for the IXP2800 processor that
    has two IXP2800s connected to the same PCI bus.  This is problematic
    as both CPUs will try to configure the PCI bus as they boot linux.
    Contrary to on the other IXP2000 platforms, the boot loader on the
    IXDP2800 doesn't configure the PCI bus properly, so we do want the
    linux instance on one of the CPUs to do that.
    Making one of the CPUs ignore the PCI bus (and thus act like a pure
    PCI slave device) is not an option because there is a 82559 NIC on
    the PCI bus for each of the CPUs.
    The chosen solution is to have the master CPU configure the PCI bus

Sascha Hauer <sascha@de.rmk.(none)>:
    [PATCH] ARM: 2654/1: i.MX UART initialization sets and honors UFCR value

    Patch from Sascha Hauer

    This patch adds UCFR_RFDIV setting into i.MX serial driver.
    This is required, if loader does not fully agree with Linux kernel
    about UART setup manner. Linux only blindly expected some values until
    now. This should enable to use even serial ports not recognized by
    boot-loader as for example third UART found in the bluethoot module.
    Patch also enables to detect original setup baudrate in more cases.

    Signed-off-by: Pavel Pisa
    Signed-off-by: Sascha Hauer
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Andrew Morton <akpm@osdl.org>:
    netlink audit warning fix

    scumbags!

    net/netlink/af_netlink.c: In function `netlink_sendmsg':
    net/netlink/af_netlink.c:908: warning: implicit declaration of function
`audit_get_loginuid'

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: RTC: allow driver methods to return error

    Allow RTC drivers to return error codes from their read_time
    or read_alarm methods.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: PXA I2C: add platform device

    Add the PXA I2C platform device.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: fix 32-bit signal frame back link

    When the kernel creates a signal frame on the user stack, it puts the
    old stack pointer value at the beginning so that the signal frame is
    linked into the chain of stack frames like any other frame.
    Unfortunately, for 32-bit processes we are writing the old stack
    pointer as a 64-bit value rather than a 32-bit value, and the process
    sees that as a null pointer, since it only looks at the first 32 bits,
    which are zero since ppc is bigendian and the stack pointer is below
    4GB.  This bug is in SLES9 and RHEL4 too, hence the ccs.

    This patch fixes the bug by making the signal code write the old stack
    pointer as a u32 instead of an unsigned long.

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: append \* properly on ASCII servers

    For older servers which do not support Unicode

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steve French <smfrench@austin.rr.com>:
    [PATCH] cifs: Update cifs todo list

    Signed-off-by: Steve French (sfrench@us.ibm.com)
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: AMBA CLCD: program palette for pseudocolor visuals

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: IntegratorCP: 16bpp is RGB565 not RGB555

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: IntegratorCP: Fix CLCD MUX selection values

    The documentation on these values seems to be rather wrong.
    These values have been determined by mere trial and error.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Sam Ravnborg <sam@ravnborg.org>:
    [PATCH] kbuild/i386: re-introduce dependency on vmlinux for install target, and add
kernel_install

    Removing the dependency on vmlinux for the install target raised a few
    complaints, so instead a new target i added: kernel_install.

    kernel_install will install the kernel just like the ordinary install
target.
    The only difference is that install has a dependency on vmlinux,
    kernel_install does not. Therefore kernel_install is the best choice
    when accessing the kernel over a NFS mount or as another user.

    kernel_install is similar to modules_install in the fact that neither does
    a full kernel compile before performing the install.
    In this way they are good for root use. Also added back the

Sam Ravnborg <sam@ravnborg.org>:
    [PATCH] kbuild/ppc: tell when uimage was not built

    Tom Rini said:
      Note that there is still a trivial'ish change to make.  When mkimage
      doesn't exist on the host we should say "uImage not made" or
      something similar.

    So I did like Tom asked.

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Sam Ravnborg <sam@ravnborg.org>:
    [PATCH] kbuild: Set NOSTDINC_FLAGS late to speed up compile (a little)

    Move definition of NOSTDINC_FLAGS below inclusion of arch Makefile, so
    any arch specific settings to $(CC) takes effect before looking up the
    compiler include directory.

    The previous solution that replaced ':=' with '=' caused gcc to be
    invoked one additional time for each directory visited.

    This decreases kernel compile time with 0.1 second (3.6 -> 3.5 seconds)
when
    running make on a fully built kernel

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

akpm@osdl.org <akpm@osdl.org>:
    [PATCH] RLIMIT_AS checking fix

    Address bug #4508: there's potential for wraparound in the various places
    where we perform RLIMIT_AS checking.

    (I'm a bit worried about acct_stack_growth().  Are we sure that vma->vm_mm
is
    always equal to current->mm?  If not, then we're comparing some other
    process's total_vm with the calling process's rlimits).

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

akpm@osdl.org <akpm@osdl.org>:
    [PATCH] ultrastor build fix

    Fix a typo.

    James Bottomley <James.Bottomley@steeleye.com>

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

akpm@osdl.org <akpm@osdl.org>:
    [PATCH] generic_file_buffered_write fixes

    Anton Altaparmakov <aia21@cam.ac.uk> points out:

    - It calls fault_in_pages_readable() which is completely bogus if @nr_segs
>
      1.  It needs to be replaced by a to be written
      "fault_in_pages_readable_iovec()".

    - It increments @buf even in the iovec case thus @buf can point to random
      memory really quickly (in the iovec case) and then it calls
      fault_in_pages_readable() on this random memory.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nikita Danilov <nikita@clusterfs.com>:
    [PATCH] mm: rmap.c cleanup

    mm/rmap.c:page_referenced_one() and mm/rmap.c:try_to_unmap_one() contain
    identical code that

     - takes mm->page_table_lock;

     - drills through page tables;

     - checks that correct pte is reached.

    Coalesce this into page_check_address()

    Signed-off-by: Nikita Danilov <nikita@clusterfs.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nick Piggin <nickpiggin@yahoo.com.au>:
    [PATCH] mm: pcp use non powers of 2 for batch size

    Jack Steiner reported this to have fixed his problem (bad colouring):
    "The patches fix both problems that I found - bad
     coloring & excessive pages in pagesets."

    In most workloads this is not likely to be such a pronounced problem,
    however it should help corner cases.  And avoiding powers of 2 in these
    types of memory operations is always a good idea.

    Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nick Piggin <nickpiggin@yahoo.com.au>:
    [PATCH] mempool: NOMEMALLOC and NORETRY

    Mempools have 2 problems.

    The first is that mempool_alloc can possibly get stuck in __alloc_pages
    when they should opt to fail, and take an element from their reserved
pool.

    The second is that it will happily eat emergency PF_MEMALLOC reserves
    instead of going to their reserved pools.

    Fix the first by passing __GFP_NORETRY in the allocation calls in
    mempool_alloc.  Fix the second by introducing a __GFP_MEMPOOL flag which
    directs the page allocator not to allocate from the reserve pool.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nikita Danilov <nikita@clusterfs.com>:
    [PATCH] doc: Locking update

    Make the Locking document truer.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nick Piggin <nickpiggin@yahoo.com.au>:
    [PATCH] mempool: simplify alloc

    Mempool is pretty clever.  Looks too clever for its own good :) It
    shouldn't really know so much about page reclaim internals.

    - don't guess about what effective page reclaim might involve.

    - don't randomly flush out all dirty data if some unlikely thing
      happens (alloc returns NULL). page reclaim can (sort of :P) handle
      it.

    I think the main motivation is trying to avoid pool->lock at all costs.
    However the first allocation is attempted with __GFP_WAIT cleared, so it
    will be 'can_try_harder' if it hits the page allocator.  So if allocation
    still fails, then we can probably afford to hit the pool->lock - and
what's
    the alternative?  Try page reclaim and hit zone->lru_lock?

Nick Piggin <nickpiggin@yahoo.com.au>:
    [PATCH] mm: use __GFP_NOMEMALLOC

    Use the new __GFP_NOMEMALLOC to simplify the previous handling of
    PF_MEMALLOC.

    Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>:
    [PATCH] count bounce buffer pages in vmstat

    This is a patch for counting the number of pages for bounce buffers.  It's
    shown in /proc/vmstat.

    Currently, the number of bounce pages are not counted anywhere.  So, if
    there are many bounce pages, it seems that there are leaked pages.  And
    it's difficult for a user to imagine the usage of bounce pages.  So, it's
    meaningful to show # of bouce pages.

    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Chris Wright <chrisw@osdl.org>:
    [PATCH] RLIMIT_MEMLOCK checking fix

    Always use page counts when doing RLIMIT_MEMLOCK checking to avoid
possible
    overflow.

    Signed-off-by: Chris Wright <chrisw@osdl.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Manfred Spraul <manfred@dbl.q-ag.de>:
    [PATCH] add kmalloc_node, inline cleanup

    The patch makes the following function calls available to allocate memory
    on a specific node without changing the basic operation of the slab
    allocator:

     kmem_cache_alloc_node(kmem_cache_t *cachep, unsigned int flags, int
node);
     kmalloc_node(size_t size, unsigned int flags, int node);

    in a similar way to the existing node-blind functions:

     kmem_cache_alloc(kmem_cache_t *cachep, unsigned int flags);
     kmalloc(size, flags);

    kmem_cache_alloc_node was changed to pass flags and the node information
    through the existing layers of the slab allocator (which lead to some
minor
    rearrangements).  The functions at the lowest layer (kmem_getpages,

William Lee Irwin III <wli@holomorphy.com>:
    [PATCH] sync_page() smp_mb() comment

    The smp_mb() is becaus sync_page() doesn't have PG_locked while it
accesses
    page_mapping(page).  The comments in the patch (the entire patch is the
    addition of this comment) try to explain further how and why smp_mb() is
    used.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nikita Danilov <nikita@clusterfs.com>:
    [PATCH] mpage_writepages() page locking fix

    When ->writepage() returns WRITEPAGE_ACTIVATE, the page is still locked.
    Explicitly unlock the page in mpage_writepages().

    Signed-off-by: Nikita Danilov <nikita@clusterfs.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Stephen Smalley <sds@tycho.nsa.gov>:
    [PATCH] SELinux: cleanup ipc_has_perm

    This patch removes the sclass argument from ipc_has_perm in the SELinux
    module, as it can be obtained from the ipc security structure.  The use of
    a separate argument was a legacy of the older precondition function
    handling in SELinux and is obsolete.  Please apply.

    Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
    Signed-off-by: James Morris <jmorris@redhat.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

akpm@osdl.org <akpm@osdl.org>:
    [PATCH] drop_buffers() oops fix

    In rare situations, drop_buffers() can be called for a page which has
buffers,
    but no ->mapping (it was truncated, but the buffers were left behind
because
    ext3 was still fiddling with them).

    But if there was an I/O error in a buffer_head, drop_buffers() will try to
get
    at the address_space and will oops.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc32: refactor FPU exception handling

    Moved common FPU exception handling code out of head.S so it can be used
by
    several of the sub-architectures that might of a full PowerPC FPU.

    Also, uses new CONFIG_PPC_FPU define to fix alignment exception handling
    for floating point load/store instructions to only occur if we have a
    hardware FPU.

    Signed-off-by: Jason McMullan <jason.mcmullan@timesys.com>
    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Chris Elston <chris.elston@radstone.co.uk>:
    [PATCH] ppc32: fix for misreported SDRAM size on Radstone PPC7D platform

    This patch fixes the SDRAM output from /proc/cpuinfo.  The previous code
    assumed that there was only one bank of SDRAM, and that the size in the
memory
    configuration register was the total size.

    Signed-off-by: Chris Elston <chris.elston@radstone.co.uk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

James Morris <jmorris@redhat.com>:
    [PATCH] SELinux: add finer grained permissions to Netlink audit processing

    This patch provides finer grained permissions for the audit family of
    Netlink sockets under SELinux.

    1.  We need a way to differentiate between privileged and unprivileged
       reads of kernel data maintained by the audit subsystem.  The AUDIT_GET
       operation is unprivileged: it returns the current status of the audit
       subsystem (e.g.  whether it's enabled etc.).  The AUDIT_LIST operation
       however returns a list of the current audit ruleset, which is
considered
       privileged by the audit folk.  To deal with this, a new SELinux
       permission has been implemented and applied to the operation:
       nlmsg_readpriv, which can be allocated to appropriately privileged

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc32: Fix errata for some G3 CPUs

    Some G3 CPUs can crash in funny way if a store from an FPU register
    instruction is executed on a register that has never been initialized
since
    power on.  This patch fixes it by making sure all FP registers have been
    properly initialized at kernel boot and when waking from sleep.  It also
makes
    the code that decides wether HID0_BTIC and HID0_DPM are allowed on a given
CPU
    smarter (it can actually _clear_ them now if they are not allowed instead
of
    just setting them when they are allowed in case the firmware got them
wrong)

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Andreas Jaggi <andreas.jaggi@waterwave.ch>:
    [PATCH] macintosh/adbhid.c: adb buttons support for aluminium PowerBook G4

    This patch adds support for the special adb buttons of the aluminium
    PowerBook G4.

    Signed-off-by: Andreas Jaggi <andreas.jaggi@waterwave.ch>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc32: Fix IDE related crash on wakeup

    I noticed an occasional crash on wakeup from sleep on my powerbook
    (strangly never happened before, probably timing related) that appears to
    be due to a dangling interrupt while the chip is put to sleep and beeing
    reset on wakeup.

    This patch fixes is by disabling the irq in the ide pmac driver while
    asleep and only re-enable it after the chip has been fully reset.  This is
    safe to do so as the interrupt of these apple IDE cells is never shared.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Chris Elston <chris.elston@radstone.co.uk>:
    [PATCH] ppc32: add rtc hooks in PPC7D platform file

    This patch adds the hooks into the PPC7D platforms file to support the
DS1337
    RTC device as the clock device for the PPC7D board.

    Signed-off-by: Chris Elston <chris.elston@radstone.co.uk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dan Malek <dan@embeddededge.com>:
    [PATCH] ppc32: workaround for spurious IRQs on PQ2

    There is a problem with large amounts of spurious IRQs on PowerPC 82xx
    systems.

    The problem is corrected by adding sync at the end of cpm2_mask_and_ack.
    This may be needed on 8xx as well but has not yet been confirmed.

    Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
    Signed-off-by: Dan Malek <dan@embeddedalley.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc32: Fix a sleep issues on some laptops

    Some earlier models of aluminium powerbooks and ibook G4s have a clock
chip
    that requires some tweaking before and after sleep.  It seems that without
    that magic incantation to disable and re-enable clock spreading, RAM isn't
    properly refreshed during sleep.  This fixes it.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc32: Fix address checking on lmw/stmw align exception

    The handling of misaligned load/store multiple instructions did not check
    to see if the address was ok to access before using __{get,put}_user().

    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Colin Leroy <colin@colino.net>:
    [PATCH] pmac: save master volume on sleep

    Ben's patch that shutdowns master switch and restores it after resume
    ("pmac: Improve sleep code of tumbler driver") isn't enough here on an
    iBook (snapper chip).

    The master switch is correctly saved and restored, but somehow
    tumbler_put_master_volume() gets called just after
    tumbler_set_master_volume() and sets mix->master_vol[*] to 0.  So, on
    resuming, the master switch is reenabled, but the volume is set to 0.

    Here's a patch that also saves and restores master_vol.

    Signed-off-by: Colin Leroy <colin@colino.net>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc64: add PT_NOTE section to vDSO

    This patch from Roland adds a PT_NOTE section to both 32 and 64 bits vDSOs
    to expose the kernel version to glibc, thus avoiding a uname syscall on
    every launch.  This is equivalent to the patches Roland posted already for
    x86 and x86-64.

    Note: the 64 bits .note is actually using the 32 bits format.  This is
    normal.  The ELF spec specifies a different format for 64 bits .note, but
    for some reason, this was never properly implemented, the core dumps for
    example are all using 32 bits format .note, and binutils cannot even read
a
    64 bits format .note.  Talking to our toolchain folks, they think we'd
    rather stick to 32 bits format .note everywhere and get the spec fixed
some
    day ...

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc32: add sound support for Mac Mini

    This patch applies on top of my previous g5 related sound patches and adds
    support for the Mac Mini to the PowerMac Alsa driver.

    However, I haven't found any kind of HW support for volume control on this
    machine.  If it exist, it's well hidden.  That means that you probably
want
    to make sure you use software with the ability to do soft volume control,
    or use Alsa 0.9 pre-release with the softvol plugin.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc64: improve g5 sound headphone mute

    This patch fixes a couple more issues with the management of the GPIOs
    dealing with headphone and line out mute on the G5.  It should fix the
    remaining problems of people not getting any sound out of the headphone
    jack.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

akpm@osdl.org <akpm@osdl.org>:
    [PATCH] ppc64: nvram cleanups

    - Fix

      arch/ppc64/kernel/nvram.c:342: warning: `part' might be used uninitialized in this
function

    - Various codingstyle tweaks.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc64: update to use the new 4L headers

    This patch converts ppc64 to use the generic pgtable-nopud.h instead of
the
    "fixup" header.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Olof Johansson <olof@austin.ibm.com>:
    [PATCH] ppc64: remove unused argument to create_slbe

    Remove vsid argument to create_slbe, since it's no longer used.

    Spotted by R Sharada.

    Signed-off-by: Olof Johansson <olof@austin.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: Fix irq parsing on powermac

    When I tried Ben's patches to the powermac sound driver on my G5, I found
    that it was taking enormous numbers of sound DMA transmit interrupts.
This
    turned out to be because it was incorrectly configured as level-sensitive
    instead of edge-sensitive, which in turn was because the code that parses
    the interrupt tree that Open Firmware gives us was incorrectly assigning
    another device the same irq number as the sound DMA transmit interrupt
    (i.e.  1).

    This patch fixes the problem, in a somewhat quick and dirty way for now,
    but one which will work for all the machines we currently run on.
    Ultimately Ben and I want to do something more general and robust, but
this
    should go in for 2.6.12.

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: tell firmware about kernel capabilities

    On pSeries systems, according to the platform architecture specs, we are
    supposed to be supplying a structure to firmware that tells firmware about
    our capabilities, such as which version of the data structures that
    describe available memory we are expecting to see.  The way we end up
    having to supply this data structure is a bit gross, since it was designed
    for AIX and doesn't suit us very well.  This patch adds the code to supply
    this data structure to the firmware.

    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Anton Blanchard <anton@samba.org>:
    [PATCH] ppc64: noexec fixes

    There were a few issues with the ppc64 noexec support:

    The 64bit ABI has a non executable stack by default.  At the moment 64bit
apps
    require a PT_GNU_STACK section in order to have a non executable stack.

    Disable the read implies exec workaround on the 64bit ABI.  The 64bit
    toolchain has never had problems with incorrect mmap permissions (the
32bit
    has, thats why we need to retain the workaround).

    With these fixes as well as a gcc fix from Alan Modra (that was recently
    committed) 64bit apps work as expected.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Olof Johansson <olof@lixom.net>:
    [PATCH] PPC64: Remove hot busy-wait loop in __hash_page

    It turns out that our current __hash_page code will do a very hot
busy-wait
    loop waiting on _PAGE_BUSY to be cleared.  It even does ldarx/stdcx in the
    loop, which will bounce reservations around like crazy if there's more
than
    one CPU spinning on the same PTE (or even another PTE in the same
    reservation granule).  The end result is that each fault takes longer when
    there's contention, which in turn increases the chance of another thread
    hitting the same fault and also piling up.  Not pretty.

    There's two options here:
    1. Do an out-of-line busy loop a'la spinlocks with just loads (no
       reserves)
    2. Just bail and refault if needed.

Anton Blanchard <anton@samba.org>:
    [PATCH] ppc64: remove unnecessary include

    We no longer use any ppcdebug stuff in a.out.h, so remove the define.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Anton Blanchard <anton@samba.org>:
    [PATCH] ppc64: firmware workaround

    Recent gcc 4.0 testing uncovered a firmware issue.  Some properties are
larger
    than 31 bytes and due to gcc 4.0s better stack allocation this overflow
ran
    over non volatile register storage.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Anton Blanchard <anton@samba.org>:
    [PATCH] ppc64: enforce medium thread priority in hypervisor calls

    Calls into the hypervisor do not raise the thread priority.  Ensure we are
    running at medium priority upon entry to the hypervisor.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Anton Blanchard <anton@samba.org>:
    [PATCH] ppc64: use smp_mb and smp_wmb

    Use smp_mb and smp_wmb. In particular smp_wmb is lighter weight than wmb.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

akpm@osdl.org <akpm@osdl.org>:
    [PATCH] use smp_mb/wmb/rmb where possible

    Replace a number of memory barriers with smp_ variants.  This means we
won't
    take the unnecessary hit on UP machines.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jake Moilanen <moilanen@austin.ibm.com>:
    [PATCH] ppc64: reverse prediction on spinlock busy loop code

    On our raw spinlocks, we currently have an attempt at the lock, and if we
do
    not get it we enter a spin loop.  This spinloop will likely continue for
    awhile, and we pridict likely.

    Shouldn't we predict that we will get out of the loop so our next
instructions
    are already prefetched.  Even when we miss because the lock is still held,
it
    won't matter since we are waiting anyways.

    I did a couple quick benchmarks, but the results are inconclusive.

    	16-way 690 running specjbb with original code
    	# ./specjbb 3000 16 1 1 19 30 120
    	    ...
    	Valid run, Score is 59282

    	16-way 690 running specjbb with unlikely code
    	# ./specjbb 3000 16 1 1 19 30 120
    	    ...

Jack F Vogel <jfv@bluesong.net>:
    [PATCH] check nmi watchdog is broken

    A bug against an xSeries system showed up recently noting that the
    check_nmi_watchdog() test was failing.

    I have been investigating it and discovered in both i386 and x86_64 the
    recent change to the routine to use the cpu_callin_map has uncovered a
    problem.  Prior to that change, on an SMP box, the test was trivally
    passing because all cpu's were found to not yet be online, but now with
the
    callin_map they are discovered, it goes on to test the counter and they
    have not yet begun to increment, so it announces a CPU is stuck and bails
    out.

    On all the systems I have access to test, the announcement of failure is
    also bougs...  by the time you can login and check /proc/interrupts, the

Denis Vlasenko <vda@port.imtp.ilyichevsk.odessa.ua>:
    [PATCH] fix i386 memcpy

    This patch shortens non-constant memcpy() by two bytes and fixes spurious
    out-of-line constant memcpy().

    # size vmlinux.org vmlinux
       text    data     bss     dec     hex filename
    3954591 1553426  236544 5744561  57a7b1 vmlinux.org
    3952615 1553426  236544 5742585  579ff9 vmlinux

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

H. J. Lu <hjl@lucon.org>:
    [PATCH] i386/x86_64 segment register access update

    The new i386/x86_64 assemblers no longer accept instructions for moving
    between a segment register and a 32bit memory location, i.e.,

            movl (%eax),%ds
            movl %ds,(%eax)

    To generate instructions for moving between a segment register and a
    16bit memory location without the 16bit operand size prefix, 0x66,

            mov (%eax),%ds
            mov %ds,(%eax)

    should be used. It will work with both new and old assemblers. The
    assembler starting from 2.16.90.0.1 will also support

            movw (%eax),%ds
            movw %ds,(%eax)

    without the 0x66 prefix. I am enclosing patches for 2.4 and 2.6 kernels

Stas Sergeev <stsp@aknet.ru>:
    [PATCH] x86: entry.S trap return fixes

    do_debug() and do_int3() return void.

    This patch fixes the CONFIG_KPROBES variant of do_int3() to return void
too
    and adjusts entry.S accordingly.

    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

H. Peter Anvin <hpa@zytor.com>:
    [PATCH] CPUID bug and inconsistency fix

    The recent support for K8 multicore was misported from x86-64 to i386, due
    to an unnecessary inconsistency between the CPUID code.  Sure, there is
are
    no x86-64 VIA chips yet, but it should happen eventually.

    This patch fixes the i386 bug as well as makes x86-64 match i386 in the
    handing of the CPUID array.

    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Andi Kleen <ak@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jaya Kumar <jayalk@intworks.biz>:
    [PATCH] x86 reboot: Add reboot fixup for gx1/cs5530a

    This patch by Jaya Kumar introduces a generic infrastructure to deal with
    x86 chipsets with nonstandard reset sequences, and adds support for the
    Geode gx1/cs5530a chipset.

    Signed-off-by: Jaya Kumar <jayalk@intworks.biz>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Lee Revell <rlrevell@joe-job.com>:
    [PATCH] Enable write combining for server works LE rev > 6

    Enable write combining for server works LE rev > 6 per
    http://www.ussg.iu.edu/hypermail/linux/kernel/0104.3/1007...

    Signed-Off-By: Lee Revell <rlrevell@joe-job.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jason Gaston <jason.d.gaston@intel.com>:
    [PATCH] hda_intel: Intel ESB2 support

    This adds the Intel ESB2 HD Audio DID to the hda_intel.c audio driver.

    Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

john stultz <johnstul@us.ibm.com>:
    [PATCH] i386: fix hpet for systems that don't support legacy replacement

    Currently the i386 HPET code assumes the entire HPET implementation from
    the spec is present.  This breaks on boxes that do not implement the
    optional legacy timer replacement functionality portion of the spec.

    This patch, which is very similar to my x86-64 patch for the same issue,
    fixes the problem allowing i386 systems that cannot use the HPET for the
    timer interrupt and RTC to still use the HPET as a time source.  I've
    tested this patch on a system systems without HPET, with HPET but without
    legacy timer replacement, as well as HPET with legacy timer replacement.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jason Gaston <jason.d.gaston@intel.com>:
    [PATCH] irq and pci_ids for Intel ICH7DH & ICH7-M DH

    This patch adds the Intel ICH7DH and ICH7-M DH DID's to the irq.c and
    pci_ids.h files.

    Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Zwane Mwaikambo <zwane@arm.linux.org.uk>:
    [PATCH] cpuid x87 bit on AMD falsely marked as PNI

    http://bugme.osdl.org/show_bug.cgi?id=4426

    vendor_id       : AuthenticAMD
    cpu family      : 6
    model           : 10
    model name      : AMD Athlon(tm) XP
    stepping        : 0
    cpu MHz         : 2204.807
    <snipped>
    cpuid level     : 1
    wp              : yes
    flags           : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov
    pat pse36 mmx fxsr sse pni syscall mmxext 3dnowext 3dnow
    bogomips        : 4358.14

    We're marking bit 0 of extended function 0x80000001 cpuid as PNI support
on
    AMD processors, when it actually denotes x87 FPU present.  Patch for i386
    and x86_64 below.

    Signed-off-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>

Andi Kleen <ak@suse.de>:
    [PATCH] x86_64: interrupt handling fix

    - Initialize workmask correctly on interrupt signal handling

    - Readd missing cli's in the interrupt return path.

    Signed-off-by: Andi Kleen <ak@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>:
    [PATCH] Increase number of e820 entries hard limit from 32 to 128

    The specifications that talk about E820 map doesn't have an upper limit on
    the number of e820 entries.  But, today's kernel has a hard limit of 32.
    With increase in memory size, we are seeing the number of E820 entries
    reaching close to 32.  Patch below bumps the number upto 128.

    The patch changes the location of EDDBUF in zero-page (as it comes after
E820).
    As, EDDBUF is not used by boot loaders, this patch should not have any
effect
    on bootloader-setup code interface.

    Patch covers both i386 and x86-64.

    Tested on:
    * grub booting bzImage
    * lilo booting bzImage with EDID info enabled
    * pxeboot of bzImage

    Side-effect:

Pavel Machek <pavel@ucw.cz>:
    [PATCH] hp100: fix card names

    Those cards really need A in their names. Otherwise it is pretty hard
    to find anything about them on the net.

    Signed-off-by: Pavel Machek <pavel@suse.cz>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alexander Nyberg <alexn@telia.com>:
    [PATCH] x86_64: saved_command_line overflow fix

    This strcpy can run off the end of saved_command_line, and we don't need it any more
anyway.

    Signed-off-by: Alexander Nyberg <alexn@telia.com>
    Cc: Andi Kleen <ak@muc.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>:
    [PATCH] x86-64: Handle empty E820 regions correctly

    Brings sanitize_e820_map() in x86-64 in sync with that of i386.

    x86_64 version was missing the changes from this patch.

http://linux.bkbits.net:8080/linux-2.6/cset@3e5e4083Y3Hev...

    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Acked-by: Andi Kleen <ak@muc.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Pavel Pisa <pisa@cmp.felk.cvut.cz>:
    [PATCH] Linux 2.6.x VM86 interrupt emulation fixes

    Patch solves VM86 interrupt emulation deadlock on SMP systems.  The VM86
    interrupt emulation has been heavily tested and works well on UP systems
    after last update, but it seems to deadlock when we have used it on SMP/HT
    boxes now.

    It seems, that disable_irq() cannot be called from interrupts, because it
    waits until disabled interrupt handler finishes
    (/kernel/irq/manage.c:synchronize_irq():while(IRQ_INPROGRESS);).  This
    blocks one CPU after another.  Solved by use disable_irq_nosync.

    There is the second problem.  If IRQ source is fast, it is possible, that
    interrupt is sometimes processed and re-enabled by the second CPU, before

Andree Leidenfrost <aleidenf@bigpond.net.au>:
    [PATCH] uml: fix handling of no fpx_regs

          Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

    Fix the error path, which is triggered when the processor misses the fpx
    regs (i.e.  the "fxsr" cpuinfo feature).  For instance by VIA C3 Samuel2.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

blaisorblade@yahoo.it <blaisorblade@yahoo.it>:
    [PATCH] uml: add nfsd syscall when nfsd is modular

    This trick is useless, because sys_ni.c will handle this problem by
itself,
    like it does even on UML for other syscalls.

    Also, it does not provide the NFSD syscall when NFSD is compiled as a
    module, which is a big problem.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: fix oops related to exception table

          Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

    Prevent the kernel from oopsing during the extable sorting, as it can do
    now, because the extable is in the readonly section of the binary.

    Jeff says: The exception table turned RO in 2.6.11-rc3-mm1 for some
reason.
    Moving it causes it to land in the writable data section of the binary.

    Paolo says: This patch fixes a oops on startup, which can be easily
    triggered by compiling with CONFIG_MODE_TT disabled, and STATIC_LINK
either
    disabled or enabled.  The resulting kernel will always Oops on startup,
    after printing this simple output:

    I've verified, by binary search on the BitKeeper repository (synced up as

Rob Landley <rob@landley.net>:
    [PATCH] uml: workaround old problematic sed behaviour

    Old versions of sed from 1998 (predating the first release of gcc 2.95,
but
    still in use by debian stable) don't understand the single-line version of
the
    sed append command.  Since newer versions of sed still understand the...
    ahem, "vintage" form of the command, change our code to use that.

    Signed-off-by: Rob Landley <rob@landley.net>
    Acked-by: Ian McDonald <imcdnzl@gmail.com>
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: inline empty proc

    Cleanup: make an inline of this empty proc.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: support AES i586 crypto driver

    We want to make possible, for the user, to enable the i586 AES
implementation.
    This requires a restructure.

    - Add a CONFIG_UML_X86 to notify that we are building a UML for i386.

    - Rename CONFIG_64_BIT to CONFIG_64BIT as is used for all other archs

    - Tell crypto/Kconfig that UML_X86 is as good as X86

    - Tell it that it must exclude not X86_64 but 64BIT, which will give the
      same results.

    - Tell kbuild to descend down into arch/i386/crypto/ to build what's
needed.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: move va_copy conditional def

    GCC 2.95 uses __va_copy instead of va_copy.  Handle it inside compiler.h
    instead of in a casual file, and avoid the risk that this breaks with a
newer
    compiler (which it could do).

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: fix syscall table by including $(SUBARCH)'s one, for i386

    Split the i386 entry.S files into entry.S and syscall_table.S which is
    included in the previous one (so actually there is no difference between
them)
    and use the syscall_table.S in the UML build, instead of tracking by hand
the
    syscall table changes (which is inherently error-prone).

    We must only insert the right #defines to inject the changes we need from
the
    i386 syscall table (for instance some different function names); also, we
    don't implement some i386 syscalls, as ioperm(), nor some TLS-related ones
    (yet to provide).

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: fix syscall table by including $(SUBARCH)'s one, for x86-64

    Reuse asm-x86-64/unistd.h to build our syscall table, like x86-64 already
    does.

    Like for i386, we must add some #defines for all the (right!) changes UML
does
    to x86-64 syscall table.

    Note: I noted a bogus:
    	[ __NR_sched_yield ] = (syscall_handler_t *) yield,

    while doing this patch (which could only be a workaround for some strange
bug,
    but I would ignore this possibility).  I'm changing this without notice.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: quick fix syscall table for x86_64

    Fix the moved syscall table for the x86_64 SUBARCH:

    - redirect __NR_chown and such to versions aware of 32-bit UIDs,

    - avoid the useless hack for sys_nfsservctl,

    - use sys_sendfile64 in the table rather than sys_sendfile.

    - __NR_uselib is sys_ni_syscall on x86_64 (which does not support A.OUT).

    - __NR_getrlimit is sys_getrlimit, not sys_old_getrlimit

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: commentary about forking flag

    Add some commentary about UML internals, for a strange trick.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: redo console locking

    Fix some console locking problems (including scheduling in atomic) and
various
    reorderings and cleanup in that code.  Not yet ready for 2.6.12 probably.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml - hostfs: avoid buffers

    Use this:
    	.set_page_dirty = __set_page_dirty_nobuffers,

    We already dropped the inclusion of <linux/buffer_head.h>, and we don't have
a
    backing block device for this FS.

    "Without having looked at it, I'm sure that hostfs does not use
buffer_heads.
    So setting your ->set_page_dirty a_op to point at
__set_page_dirty_nobuffers()
    is a reasonable thing to do - it'll provide a slight speedup."

    This speedup is one less spinlock held and one less conditional branch,
which
    isn't bad.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml ubd: handle readonly status

    Use the set_disk_ro() API when the backing file is read-only, to mark the
disk
    read-only, during the ->open().  The current hack does not work when doing
a
    mount -o remount.

    Also, mark explicitly the code paths which should no more be triggerable
(I've
    removed the WARN_ON(1) things).  They should actually become BUG()s
probably
    but I'll avoid that since I'm not so sure the change works so well.  I gave
it
    only some limited testing.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    CC: Jens Axboe <axboe@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Martin Schwidefsky <schwidefsky@de.ibm.com>:
    [PATCH] s390: idle timer setup

    Fix overflow in calculation of the new tod value in stop_hz_timer and fix
    wrong virtual timer list idle time in case the virtual timer is already
    expired in stop_cpu_timer.

    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>

Martin Schwidefsky <schwidefsky@de.ibm.com>:
    [PATCH] s390: regenerate defconfig

    Regenerate the default configuration for s390.

    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>

Heiko Carstens <heiko.carstens@de.ibm.com>:
    [PATCH] s390: fix memory holes and cleanup setup_arch

    The memory setup didn't take care of memory holes and this makes the
memory
    management think there would be more memory available than there is in
    reality.  That causes the OOM killer to kill processes even if there is
enough
    memory left that can be written to the swap space.

    The patch fixes this by using free_area_init_node with an array of memory
    holes instead of free_area_init.  Further the patch cleans up the code in
    setup.c by splitting setup_arch into smaller pieces.

    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>

Peter Oberparleiter <peter.oberparleiter@de.ibm.com>:
    [PATCH] s390: default storage key

    Provide an easy way to define a non-zero storage key at compile time.  This
is
    useful for debugging purposes.

    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>

Martin Schwidefsky <schwidefsky@de.ibm.com>:
    [PATCH] s390: cmm guest sender id

    An arbitrary guest must not be allowed to trigger cmm actions.  Only one
    specific guest namely the one that serves as the resource monitor may send
cmm
    messages.  Add a parameter that allows to specify the guest that may send
    messages.  z/VMs resource manager has the name 'VMRMSVM' which is the
default.

    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>

Michael Holzheu <holzheu@de.ibm.com>:
    [PATCH] s390: allow longer debug feature names

    The current limitation of 16 characters of the debug feature names turned
out
    to be insufficient.  Increase it to 64 characters.

    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>

Cornelia Huck <cohuck@de.ibm.com>:
    [PATCH] s390: remove ioctl32 from dasdcmb

    The ioctl32_conversion routines will be deprecated: Remove them from
dasd_cmb
    and handle the three cmb ioctls like all other dasd ioctls.

    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>

Stefan Weinhuber <wein@de.ibm.com>:
    [PATCH] s390: enable write barriers in the dasd driver

    The DASD device driver never reorders the I/O requests and relies on the
    hardware to write all data to nonvolatile storage before signaling a
    successful write.  Hence, the only thing we have to do to support write
    barriers is to set the queue ordered flag.

    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>

Horst Hummel <horst.hummel@de.ibm.com>:
    [PATCH] s390: don't pad cdl blocks for write requests

    The first blocks on a cdl formatted dasd device are smaller than the
blocksize
    of the device.  Read requests are padded with a 'e5' pattern.  Write
requests
    should not pad the (user) buffer with 'e5' because a write request is not
    allowed to modify the buffer.

    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>

Horst Hummel <horst.hummel@de.ibm.com>:
    [PATCH] s390: dasd readonly attribute

    The independent read-only flags in devmap, dasd_device and gendisk are not
    kept in sync.  Use one bit per feature in the dasd driver and keep that bit
in
    sync with the gendisk bit.

    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>

Cornelia Huck <cohuck@de.ibm.com>:
    [PATCH] s390: cio documentation

    Synchronize documentation with current interface.

    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>

Cornelia Huck <cohuck@de.ibm.com>:
    [PATCH] s390: remove ioctl32 from crypto driver

    The ioctl32_conversion routines will be deprecated: Remove them from the
    crypto driver.

    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>

Matt Mackall <mpm@selenic.com>:
    [PATCH] nice and rt-prio rlimits

    Add a pair of rlimits for allowing non-root tasks to raise nice and rt
    priorities. Defaults to traditional behavior. Originally written by
    Chris Wright.

    The patch implements a simple rlimit ceiling for the RT (and nice)
priorities
    a task can set.  The rlimit defaults to 0, meaning no change in behavior
by
    default.  A value of 50 means RT priority levels 1-50 are allowed.  A value
of
    100 means all 99 privilege levels from 1 to 99 are allowed.  CAP_SYS_NICE
is
    blanket permission.

    (akpm: see http://www.uwsg.iu.edu/hypermail/linux/kernel/0503.1/1921...
for
    tips on integrating this with PAM).

    Signed-off-by: Matt Mackall <mpm@selenic.com>
    Acked-by: Ingo Molnar <mingo@elte.hu>

Matt Mackall <mpm@selenic.com>:
    [PATCH] remove all kernel BUGs

    This patch eliminates all kernel BUGs, trims about 35k off the typical
    kernel, and makes the system slightly faster.

    Signed-off-by: Matt Mackall <mpm@selenic.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Matt Mackall <mpm@selenic.com>:
    [PATCH] Exterminate PAGE_BUG

    Remove PAGE_BUG - repalce it with BUG and BUG_ON.

    Signed-off-by: Matt Mackall <mpm@selenic.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Stas Sergeev <stsp@aknet.ru>:
    [PATCH] move SA_xxx defines to linux/signal.h

    The attached patch moves the IRQ-related SA_xxx flags (namely, SA_PROBE,
    SA_SAMPLE_RANDOM and SA_SHIRQ) from all the arch-specific headers to
    linux/signal.h.  This looks like a left-over after the irq-handling code
    was consolidated.  The code was moved to kernel/irq/*, but the flags are
    still left per-arch.

    Right now, adding a new IRQ flag to the arch-specific header, like this
    patch does:

http://cvs.sourceforge.net/viewcvs.py/*checkout*/alsa/als...
    no longer works, it breaks the compilation for all other arches, unless
you
    add that flag to all the other arch-specific headers too.  So I think such
    a clean-up makes sense.

Matt Mackall <mpm@selenic.com>:
    [PATCH] clean up kernel messages

    Arrange for all kernel printks to be no-ops.  Only available if
    CONFIG_EMBEDDED.

    This patch saves about 375k on my laptop config and nearly 100k on minimal
    configs.

    Signed-off-by: Matt Mackall <mpm@selenic.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul E. McKenney <paulmck@us.ibm.com>:
    [PATCH] Add deprecated_for_modules

    Add a deprecated_for_modules macro that allows symbols to be deprecated
only
    when used by modules, as suggested by Andrew Morton some months back.

    Signed-off-by: Paul E. McKenney <paulmck@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul E. McKenney <paulmck@us.ibm.com>:
    [PATCH] kernel/rcupdate.c: make the exports EXPORT_SYMBOL_GPL

    The gpl exports need to be put back.  Moving them to GPL -- but in a
    measured manner, as I proposed on this list some months ago -- is fine.
    Changing these particular exports precipitously is most definitely -not-
    fine.  Here is my earlier proposal:

    	http://marc.theaimsgroup.com/?l=linux-kernel&m=110520...

    See below for a patch that puts the exports back, along with an updated
    version of my earlier patch that starts the process of moving them to GPL.
    I will also be following this message with RFC patches that introduce two
    (EXPORT_SYMBOL_GPL) interfaces to replace synchronize_kernel(), which then
    becomes deprecated.

    Signed-off-by: <paulmck@us.ibm.com>

Daniel Drake <dsd@gentoo.org>:
    [PATCH] procfs: Fix hardlink counts

    The pid directories in /proc/ currently return the wrong hardlink count -
3,
    when there are actually 4 : ".", "..", "fd", and "task".

    This is easy to notice using find(1):
    	cd /proc/<pid>
    	find

    In the output, you'll see a message similar to:

    find: WARNING: Hard link count is wrong for .: this may be a bug in your
    filesystem driver.  Automatically turning on find's -noleaf option.
    Earlier results may have failed to include directories that should have
    been searched.

    http://bugs.gentoo.org/show_bug.cgi?id=86031

    I also noticed that CONFIG_SECURITY can add a 5th: attr, and performed a
    similar fix on the task directories too.

    Signed-off-by: Daniel Drake <dsd@gentoo.org>

Daniel Drake <dsd@gentoo.org>:
    [PATCH] procfs: Fix hardlink counts for /proc/<PID>/task

    The current logic assumes that a /proc/<PID>/task directory should have a
    hardlink count of 3, probably counting ".", "..", and a directory for a
    single child task.

    It's fairly obvious that this doesn't work out correctly when a PID has
    more than one child task, which is quite often the case.

    Signed-off-by: Daniel Drake <dsd@gentoo.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul E. McKenney <paulmck@us.ibm.com>:
    [PATCH] Deprecate synchronize_kernel, GPL replacement

    The synchronize_kernel() primitive is used for quite a few different
purposes:
    waiting for RCU readers, waiting for NMIs, waiting for interrupts, and so
on.
    This makes RCU code harder to read, since synchronize_kernel() might or
might
    not have matching rcu_read_lock()s.  This patch creates a new
    synchronize_rcu() that is to be used for RCU readers and a new
    synchronize_sched() that is used for the rest.  These two new primitives
    currently have the same implementation, but this is might well change with
    additional real-time support.  Both new primitives are GPL-only, the old
    primitive is deprecated.

    Signed-off-by: Paul E. McKenney <paulmck@us.ibm.com>

Paul E. McKenney <paulmck@us.ibm.com>:
    [PATCH] Change synchronize_kernel to _rcu and _sched

    This patch changes calls to synchronize_kernel(), deprecated in the
earlier
    "Deprecate synchronize_kernel, GPL replacement" patch to instead call the
new
    synchronize_rcu() and synchronize_sched() APIs.

    Signed-off-by: Paul E. McKenney <paulmck@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Peter Missel <peter.missel@onlinehome.de>:
    [PATCH] LifeView FlyTV Platinum FM: Remote Control support

    Subject says it ...  this card's IR microcontroller design and attachment
    are compatible to the company's previous designs, so the patch was as
    simple as it gets.
    DESC
    LifeView FlyTV Platinum FM: GPIO usage
    EDESC
    From: Peter Missel <peter.missel@onlinehome.de>

    This is take two of a patch that should have appeared two days ago, before
    yesterday's "remote control" patch for the same card.

    This patch sets unconnected GPIO to Output to keep them from floating
(just
    good driver writing practice, being nice to the chip), and uses GPIO16 to
    switch TV vs.  FM - this pin switches inputs onto the tuner, as well as
the

Peter Missel <peter.missel@onlinehome.de>:
    [PATCH] LifeView FlyTV Platinum FM: GPIO usage

    This is take two of a patch that should have appeared two days ago, before
    yesterday's "remote control" patch for the same card.

    This patch sets unconnected GPIO to Output to keep them from floating
(just
    good driver writing practice, being nice to the chip), and uses GPIO16 to
    switch TV vs.  FM - this pin switches inputs onto the tuner, as well as
the
    audio output from the tuner into the 7135 SIF input.  Consequently, FM
    radio support is being un-commented because it's now working (sort of, see
    below).

    These two patches get the card almost fully operational; there appears to
    be a bug in tda8290.c remaining that puts an offset onto the tuned

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] reiserfs: make resize option auto-get new device size

    It's trivial for the resize option to auto-get the underlying device size,
    while it's harder for the user.  I've copied the code from jfs.

    Since of the different reiserfs option parser (which does not use the
    superior match_token used by almost every other filesystem), I've had to
    use the "resize=auto" and not "resize" option to specify this behaviour.
    Changing the option parser to the kernel one wouldn't be bad but I've no
    time to do this cleanup in this moment.

    Btw, the mount(8) man page should be updated to include this option.  Cc
    the relevant people, please (I hope I cc'ed the right people).

    Cc: <reiserfs-dev@namesys.com>

Paul E. McKenney <paulmck@us.ibm.com>:
    [PATCH] Update RCU documentation

    Update the RCU documentation to allow for the new synchronize_rcu() and
    synchronize_sched() primitives.  Fix a few other nits as well.

    Signed-off-by: Paul E. McKenney <paulmck@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jens Axboe <axboe@suse.de>:
    [PATCH] noop-iosched: kill O(N) merge scan

    Profiling hit rates on merging shows that the last merge hint works
    extremely well for most work loads.  So lets kill the linear merge scan in
    noop-iosched, so it provides O(1) run time for any operation.

    Testing credits go to Ken Chen from Intel.

    Signed-off-by: Jens Axboe <axboe@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Yoshinori Sato <ysato@users.sourceforge.jp>:
    [PATCH] kallsyms C_SYMBOL_PREFIX support

    kallsyms does not consider SYMBOL_PREFIX of C.  Consequently it does not
    work on architectures using that prefix character (h8300, v850).

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Joe Korty <joe.korty@ccur.com>:
    [PATCH] add EOWNERDEAD and ENOTRECOVERABLE version 2

    Add EOWNERDEAD and ENOTRECOVERABLE to all architectures.  This is to
    support the upcoming patches for robust mutexes.

    We normally don't reserve parts of the name/number space for external
    patches, but robust mutexes are sufficiently popular and important to
    justify it in this case.

    Signed-off-by: Joe Korty <joe.korty@ccur.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jan Kara <jack@suse.cz>:
    [PATCH] Fix rewriting on a full reiserfs filesystem

    Allow rewriting of a file and extending a file upto the end of the
    allocated block on a full filesystem.

    From: Chris Mason <mason@suse.com>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Lars Marowsky-Bree <lmb@suse.de>:
    [PATCH] nbd: Don't create all MAX_NBD devices by default all the time

    This patches adds the "nbds_max" parameter to the nbd kernel module, which
    limits the number of nbds allocated.  Previously, always all 128 entries
    were allocated unconditionally, which used to waste resources and
    needlessly flood the hotplug system with events.  (Defaults to 16 now.)

    Signed-off-by: Lars Marowsky-Bree <lmb@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bill Nottingham <notting@redhat.com>:
    [PATCH] vgacon: set vc_hi_font_mask correctly

    When allocating a new VC with vgacon_init(), the font is shared across all
    the VGA consoles.  However, the font mask was always set to the default
    value of zero in visual_init(), even if we were using 512 character fonts
    at the time.

    Moreover, code in vgacon.c:vga_do_font_op() didn't reset the mask if the
    console driver thinks it's already in 512 character mode.  This means that
    to *fix* it, you'd actually have to take the console out of 512 character
    mode and then set it back.

    The attached sets vc_hi_font_mask in vgacon_init() for any new consoles
    opened if the vgacon driver is already in 512 character mode, solving
this.

    This bug goes back to 2.4.18 at least, probably earlier.

Joel Becker <Joel.Becker@oracle.com>:
    [PATCH] hangcheck-timer: Update to 0.9.0.

    I recently realized that the in-kernel copy of hangcheck-timer was quite
    stale.  Here's the latest.  It adds support for s390, ppc64, and ia64 too.

    Signed-off-by: Joel Becker <joel.becker@oracle.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Stephen Rothwell <sfr@canb.auug.org.au>:
    [PATCH] consolidate SIGEV_PAD_SIZE

    Discussing with Matthew Wilcox some of his outstanding patches lead me to
    this patch (among others).

    The preamble in struct sigevent can be expressed independently of the
    architecture.

    Also use __ARCH_SI_PREAMBLE_SIZE on ia64.

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jesper Juhl <juhl-lkml@dif.dk>:
    [PATCH] misc verify_area cleanups

    There were still a few comments left refering to verify_area, and two
    functions, verify_area_skas & verify_area_tt that just wrap corresponding
    access_ok_skas & access_ok_tt functions, just like verify_area does for
    access_ok - deprecate those.

    There was also a few places that still used verify_area in commented-out
    code, fix those up to use access_ok.

    After applying this one there should not be anything left but finally
    removing verify_area completely, which will happen after a kernel release
    or two.

    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nicolas Boichat <nicolas@boichat.ch>:
    [PATCH] Leadtek Winfast remote controls

    Add missing button codes for the Leadtek Winfast remote controls.

    Signed-off-by: Nicolas Boichat <nicolas@boichat.ch>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Edward Shishkin <edward@namesys.com>:
    [PATCH] reiserfs: journal_init fix

    This fixes segmentation fault when specifying bad journal device via
    a mount option.

    Don't pass a zero pointer to bdevname() if filp_open() returns error.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Vinay K Nallamothu <vinay.nallamothu@gsecone.com>:
    [PATCH] __attribute__ placement fixes

    The variable attributes "packed" and "align" when used with struct, should
    have the following order:

    struct ... {...} __attribute__((packed)) var;

    This patch fixes few instances where the variable and attributes are
placed
    the other way around and had no effect.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Corey Minyard <minyard@acm.org>:
    [PATCH] IPMI: fix for handling bad ACPI data

    If the ACPI register bit width is zero (an invalid value) assume it is the
    default spacing.  This avoids some coredumps on invalid data and makes
some
    systems work that have broken ACPI data.

    Signed-off-by: Corey Minyard <minyard@acm.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

aquynh@gmail.com <aquynh@gmail.com>:
    [PATCH] dontdiff file sorted in alphabet order

    Documentation/dontdiff is a little messy.  Here is a patch to sort the
    content of that file in alphabetical

    Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Corey Minyard <minyard@acm.org>:
    [PATCH] IPMI: fix for handling bad IPMI DMI data

    Ignore the bottom bit of the base address from the DMI data.  It is
    supposed to be set to 1 if it is I/O space.  Few systems do this, but this
    enables the ones that do set it to work properly.

    Signed-off-by: Corey Minyard <minyard@acm.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Corey Minyard <minyard@acm.org>:
    [PATCH] ipmi: enable interrupts on the BT driver

    Enable interrupts for a BT interface.  There is a specific register that
    needs to be set up to enable interrupts that also must be modified to
clear
    the irq.

    Also, don't reset the BMC on a BT interface.  That's probably not a good
    idea as the BMC may be performing other important functions and a reset
    should only be a last resort.  Also, that register is also used to
    enable/disable interrupts to the BT; modifying it may screw up the
    interrupts.

    Signed-off-by: Corey Minyard <minyard@acm.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Corey Minyard <minyard@acm.org>:
    [PATCH] ipmi: fix watchdog so the device can be reopened on an unexpected
close

    If there is an unexpected close, still allow the watchdog interface to be
    re-opened on the IPMI watchdog.

    Signed-off-by: Corey Minyard <minyard@acm.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Andreas Schwab <schwab@suse.de>:
    [PATCH] sn_console: make sal_console_uart static again

    Signed-off-by: Andreas Schwab <schwab@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Stephen Rothwell <sfr@canb.auug.org.au>:
    [PATCH] consolidate sys_shmat

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Corey Minyard <minyard@acm.org>:
    [PATCH] ipmi: fix a deadlock

    Correct an issue with the IPMI message layer taking a lock and calling
    lower layer driver.  If an error occrues at the lower layer the lock can
be
    taken again causing a deadlock.  The lock is released before calling the
    lower layer.

    Signed-off-by: David Griego <dgriego@mvista.com>
    Signed-off-by: Corey Minyard <minyard@acm.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Kylene Hall <kjhall@us.ibm.com>:
    [PATCH] Fix Tpm driver -- Maintainers entry

    This patch adds the maintainers entry.

    Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jesper Juhl <juhl-lkml@dif.dk>:
    [PATCH] new valid_signal() function

    This patch adds a new function valid_signal() that tests if its argument
is
    a valid signal number.

    The reasons for adding this new function are:

    - some code currently testing _NSIG directly has off-by-one errors.
      Using this function instead avoids such errors.

    - some code currently tests unsigned signal numbers for <0 which is
      pointless and generates warnings when building with gcc -W.  Using this
      function instead avoids such warnings.

    I considered various places to add this function but eventually settled on
    include/linux/signal.h as the most logical place for it.  If there's some
    reason this is a bad choice then please let me know (hints as to a better

Yum Rayan <yum.rayan@gmail.com>:
    [PATCH] serial_cs: Reduce stack usage in serial_event()

    This patch reduces the stack usage of the function serial_event() in
    serial_cs from 2212 to 228.  I used a patched version of gcc 3.4.3 on i386
    with -fno-unit-at-a-time disabled.

    This patch is only compile tested.

    Acked-by: Randy Dunlap <rddunlap@osdl.org>
    Signed-off-by: Yum Rayan <yum.rayan@gmail.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jesper Juhl <juhl-lkml@dif.dk>:
    [PATCH] convert that currently tests _NSIG directly to use valid_signal()

    Convert most of the current code that uses _NSIG directly to instead use
    valid_signal().  This avoids gcc -W warnings and off-by-one errors.

    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Roland Dreier <roland@topspin.com>:
    [PATCH] fix include order in mthca_memfree.c

    Fix order of #include lines in mthca_memfree.c

    Signed-off-by: Roland Dreier <roland@topspin.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ken Chen <kenneth.w.chen@intel.com>:
    [PATCH] aio: remove superfluous kiocb member initialization

    This patch removes superfluous kiocb member initialization in the AIO
    allocation and deallocation path.  For example, in really_put_req(),
    right before kiocb is returned to slab, 5 variables are reset to NULL.
    The same variables will be initialized at the kiocb allocation time,
    so why bother reset them knowing that they will be set to valid data
    at alloc time?  Another example: ki_retry is initialized in __aio_get_req,
    but is initialized again in io_submit_one.

    Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
    Cc: Benjamin LaHaise <bcrl@kvack.org>
    Cc: Suparna Bhattacharya <suparna@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>

Ken Chen <kenneth.w.chen@intel.com>:
    [PATCH] aio: ring wrapping simplification

    Since the tail pointer in aio_ring structure never wrap ring size more
than
    once, so a simple compare is sufficient to wrap the index around.  This
avoid
    a more expensive mod operation.

    Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
    Cc: Benjamin LaHaise <bcrl@kvack.org>
    Cc: Suparna Bhattacharya <suparna@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ken Chen <kenneth.w.chen@intel.com>:
    [PATCH] aio: clean up debug code

    Clean up code that was previously used for debug purpose.  Remove aio_run,
    aio_wakeups, iocb->ki_queued and iocb->ki_kicked.  Also clean up unused
    variable count in __aio_run_iocbs() and debug code in read_events().

    Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
    Cc: Benjamin LaHaise <bcrl@kvack.org>
    Cc: Suparna Bhattacharya <suparna@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Emanuele Giaquinta <emanuele.giaquinta@gmail.com>:
    [PATCH] Makefile: fix for compatibility with *emacs ctags

    I've noticed that, starting from linux-2.6.12-rc1, in the top Makefile the
    "cmd_tags" variable has been changed in a way incompatible with *emacs
    ctags.  Since the "--extra" option exists only in "exuberant ctags", it
    should be included in the CTAGSF shell variable.

    Cc: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ian Kent <raven@themaw.net>:
    [PATCH] autofs4: wait order fix

    It's possible for an event wait request to arive before the event
    requestor.  If this happens the daemon never gets notified and autofs
    hangs.

    Signed-off-by: Ian Kent <raven@themaw.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Colin Leroy <colin@colino.net>:
    [PATCH] hfs, hfsplus: don't leak s_fs_info and fix an oops

    This patch fixes the leak of sb->s_fs_info in both the HFS and HFS+
    modules.  In addition to this, it fixes an oops happening when trying to
    mount a non-hfsplus filesystem using hfsplus.  This patch is from Roman
    Zippel, based off patches sent by myself.

    Signed-off-by: Colin Leroy <colin@colino.net>
    Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ken Chen <kenneth.w.chen@intel.com>:
    [PATCH] aio: optimize io_submit_one()

    This patch optimizes io_submit_one to call aio_run_iocb() directly if
    ctx->run_list is empty.  When the list is empty, the operation of adding
to
    the list, then call to __aio_run_iocbs() is unnecessary because these
    operations are done in one atomic step.  ctx->run_list always has only one
    element in this case.  This optimization speeds up industry standard db
    transaction processing benchmark by 0.2%.

    Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
    Cc: Benjamin LaHaise <bcrl@kvack.org>
    Cc: Suparna Bhattacharya <suparna@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ian Kent <raven@themaw.net>:
    [PATCH] autofs4: tree race fix

    For tree mount maps, a call to chdir or chroot, to a directory above the
    moint point directories at a certain time during the expire results in the
    expire incorrectly thinking the tree is not busy.  This patch adds a check
    to see if the filesystem above the tree mount points is busy and also
locks
    the filesystem during the tree mount expire to prevent the race.

    Signed-off-by: Ian Kent <raven@themaw.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] reiserfs endianness: clone struct reiserfs_key

    struct reiserfs_key cloned; (currently) identical struct in_core_key
added.
    Places that expect host-endian data in reiserfs_key switched to
in_core_key.
    Basically, we get annotation of reiserfs_key users and keep the resulting
tree
    obviously equivalent to original.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Cc: <reiserfs-dev@namesys.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ian Kent <raven@themaw.net>:
    [PATCH] autofs4: bump version number

    Bump autofs4 version so we know what's going on.

    Signed-off-by: Ian Kent <raven@themaw.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] reiserfs endianness: annotate little-endian objects

    little-endian objects annotated as such; again, obviously no changes of
    resulting code, we only replace __u16 with __le16, etc.  in relevant
places.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Cc: <reiserfs-dev@namesys.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] reiserfs endianness: fix endianness bugs

    fixes for a couple of bugs exposed by the above: le32_to_cpu() used on
16bit
    value and missing conversion in comparison of host- and little-endian
values.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Cc: <reiserfs-dev@namesys.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Gerd Knorr <kraxel@bytesex.org>:
    [PATCH] cx88-dvb oops fix

    Fixup error path, without that one the driver kills the machine by oopsing
    in the IRQ handler in case the frontend initialization fails.

    Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] reiserfs endianness: comp_short_keys() cleanup

    comp_short_keys() massaged into sane form, which kills the last place
where
    pointer to in_core_key (or any object containing such) would be cast to or
    from something else.  At that point we are free to change layout of
    in_core_key - nothing depends on it anymore.

    So we drop the mess with union in there and simply use (unconditional)
__u64
    k_offset and __u8 k_type instead; places using in_core_key switched to
those.
    That gives _far_ better code than current mess - on all platforms.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Cc: <reiserfs-dev@namesys.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] reiserfs endianness: sanitize reiserfs_key union

    Since we only access reiserfs_key ->u.k_offset_v2 guts in four helper
    functions, we are free to sanitize those, as long as

    - layout of the structure is unchanged (it's on-disk object)

    - behaviour of these helpers is same as before.

    Patch kills the mess with endianness-dependent bitfields and replaces them
    with a single __le64.  Helpers are switched to straightforward
shift/and/or.

    Benefits:

    - exact same definitions for little- and big-endian architectures; no
ifdefs
      in sight.

    - generate the same code on little-endian and improved on big-endian.

    - doesn't rely on lousy bitfields handling in gcc codegenerator.

Gerd Knorr <kraxel@bytesex.org>:
    [PATCH] dvb: cx22702 frontend driver update

    update cx22702 fe driver, add support for using the dvb pll lib, enable
    cx22702 support in cx88-dvb.

    Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Gerd Knorr <kraxel@bytesex.org>:
    [PATCH] v4l: msp3400 update

    msp3400 update: Fix and enable "simpler" mode, some other minor fixes.

    Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mingming Cao <cmm@us.ibm.com>:
    [PATCH] ext3: remove unnecessary race then retry in ext3_get_block

    The extra race-with-truncate-then-retry logic around
    ext3_get_block_handle(), which was inherited from ext2, becomes unecessary
    for ext3, since we have already obtained the ei->truncate_sem in
    ext3_get_block_handle() before calling ext3_alloc_branch().  The
    ei->truncate_sem is already there to block concurrent truncate and block
    allocation on the same inode.  So the inode's indirect addressing tree
    won't be changed after we grab that semaphore.

    We could, after get the semaphore, re-verify the branch is up-to-date or
    not.  If it has been changed, then get the updated branch.  If we still
    need block allocation, we will have a safe version of the branch to work

Peter Missel <peter.missel@onlinehome.de>:
    [PATCH] saa7134: Add OEM version of already supported card

    Add device table support for the LR214WF card.

    The driver will say it's a FlyTV, simply because the name strings are
    stored with the card design data, not the device ID data.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patrick Gefre <pfg@sgi.com>:
    [PATCH] Altix ioc4 serial - set hfc from ioctl

    Allow hardware flow control to be set from an ioctl.

    Signed-off-by: Patrick Gefre <pfg@sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patrick Gefre <pfg@sgi.com>:
    [PATCH] Altix ioc4 serial - small uart setup mods

    Small mods for setting up the uart - parity, flow control

    Signed-off-by: Patrick Gefre <pfg@sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patrick Gefre <pfg@sgi.com>:
    [PATCH] Altix ioc4 serial - set a better timeout/threshold

    Set the timeout and threshold to better values.

    Signed-off-by: Patrick Gefre <pfg@sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patrick Gefre <pfg@sgi.com>:
    [PATCH] Altix ioc4 serial - Arm the read timeout timer before the first
read

    Arm the read timeout timer before the first read.

    Signed-off-by: Patrick Gefre <pfg@sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] fbdev: Batch cmap changes at driver level

    This patch adds to the fbdev interface a set_cmap callback that allow the
    driver to "batch" palette changes.  This is useful for drivers like
    radeonfb which might require lenghtly workarounds on palette accesses,
thus
    allowing to factor out those workarounds efficiently.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Antonino A. Daplas <adaplas@hotpop.com>:
    [PATCH] nvidiafb: ioremap and i2c fixes

    - Add 'vram' option to specify amount of video RAM to remap
    - Limit remap size to 64 MIB
    - Use info->screen_size for remapped RAM
    - Fix misplaced label in failure path

    Signed-off-by: Antonino Daplas <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] intelfb: Remove intelfbdrv.h

    Ingo Oeser noticed that all that intelfbdrv.h contains are prototypes for
    static functions - and such prototypes don't belong into header files.

    This patch therefore removes drivers/video/intelfb/intelfbdrv.h and moves
the
    prototypes to intelfbdrv.c .

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Antonino Daplas <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@fs.tum.de>:
    [PATCH] fbcon: Fix check after use

    This patch fixes a check after use found by the Coverity checker.

    Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
    Signed-off-by: Antonino Daplas <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] fbdev: edid.h cleanups

    This patch removes some completely unused code.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Antonino Daplas <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Richard Drummond <evilrich@rcdrummond.net>:
    [PATCH] Better PLL frequency matching for tdfxfb driver

    Improve the PLL frequency matching in the tdfxfb driver.  Instead of
    requiring 64260 iterations to obtain the closest supported PLL frequency,
    this code does it with the same degree of accuracy in at most 768
    iterations.

    Signed-off-by: Richard Drummond <evilrich@rcdrummond.net>
    Cc: <linux-fbdev-devel@lists.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Sascha Hauer <s.hauer@pengutronix.de>:
    [PATCH] imxfb: Add Freescale i.MX framebuffer driver

    This patch adds support for the framebuffer on the freescale i.MX SOC
    architecture.  The driver has been tested on the mx1ads board, the pimx1
board
    and another custom board with different displays.

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Antonino Daplas <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Denis Vlasenko <vda@ilport.com.ua>:
    [PATCH] i810fb: Fix default monitor sync timings

    - Increase error message verbosity with respect to monitor timings.

    - Fix default sync timings

    Signed-off-by: Antonino Daplas <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Richard Drummond <evilrich@rcdrummond.net>:
    [PATCH] Clean-up and bug fix for tdfxfb framebuffer size detection

    Attached is a patch against 2.6.11.7 which tidies up the tdfxfb
framebuffer
    size detection code a little and fixes the broken support for Voodoo4/5
    cards.  (I haven't tested this on a Voodoo5, however, because I don't have
    the hardware).

    Signed-off-by: Richard Drummond <evilrich@rcdrummond.net>
    Cc: <linux-fbdev-devel@lists.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Pavel Pisa <pisa@cmp.felk.cvut.cz>:
    [PATCH] DocBook: changes and extensions to the kernel documentation

    I have recompiled Linux kernel 2.6.11.5 documentation for me and our
    university students again.  The documentation could be extended for more
    sources which are equipped by structured comments for recent 2.6 kernels.
I
    have tried to proceed with that task.  I have done that more times from
2.6.0
    time and it gets boring to do same changes again and again.  Linux kernel
    compiles after changes for i386 and ARM targets.  I have added references
to
    some more files into kernel-api book, I have added some section names as
well.
     So please, check that changes do not break something and that categories
are
    not too much skewed.

Martin Waitz <tali@admingilde.org>:
    [PATCH] DocBook: fix <void/> xml tag

    This fix is needed to create valid XML.

    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Martin Waitz <tali@admingilde.org>:
    [PATCH] DocBook: fix some descriptions

    Some KernelDoc descriptions are updated to match the current code.
    No code changes.

    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Rich Walker <rw@shadow.org.uk>:
    [PATCH] DocBook: use <informalexample> for examples

    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Martin Waitz <tali@admingilde.org>:
    [PATCH] Docbook: use custom stylesheet

    With the custom stylesheet, functions are rendered using ANSI-C syntax and
    xmlto is a bit quieter.

    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Martin Waitz <tali@admingilde.org>:
    [PATCH] DocBook: Use xmlto to process the DocBook files.

    xmlto uses standared XSLT templates to generate manpages, (x)html pages,
and
    XML FO files which can be processed with passivetex.  This is much faster
than
    using jadetex for everything.  This patch also reduces the number of
    kernel-specific scripts that are needed to generate documentation.

    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Garzik <jgarzik@pobox.com>:
    [PATCH] DocBook: remove obsolete templates

    As the author of tulip-user and via-audio docbooks, I can say that they
are
    out of date and should be deleted.

    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Martin Waitz <tali@admingilde.org>:
    [PATCH] DocBook: fix html link

    The start page for each book has changed from book1.html to index.html.
    Update our generated links acocrdingly.

    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Cosmin Nicolaescu <can29@bandersnatch.cs.drexel.edu>:
    [PATCH] Documentation: remove super-{nr, max} to reflect fs/super.c

    The patch updates the documentation for /proc.  super-nr and super-max
have
    been dropped from the kernel since 2.4.9 due to minor numbering issues.
    This change was not documented in the documentation.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Sam Ravnborg <sam@ravnborg.org>:
    [PATCH] docbook: Tell users to install xmlto, not stylesheets

    We have at least two users which were confused by these messages, myself
    included.

    Signed-off-by: Alexey Dobriyan <adobriyan@mail.ru>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] make lots of things static

    Another large rollup of various patches from Adrian which make things
static
    where they were needlessly exported.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] drivers/pnp/pnpbios/rsparser.c: fix an array overflow

    This patch fixes an array overflow found by the Coverity checker.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] drivers/pnp/pnpacpi/rsparser.c: fix an array overflow

    This patch fixes an array overflow found by the Coverity checker.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] drivers/video/radeonfb.c: fix an array overflow

    This patch fixes an array overflow found by the Coverity checker.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] drivers/input/joystick/spaceorb.c: fix an array overflow

    This patch fixes an array overflow found by the Coverity checker.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] sound/oss/sonicvibes.c: fix an array overflow

    This patch fixes an array overflow found by the Coverity checker.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jens Axboe <axboe@suse.de>:
    [PATCH] Avoid unnecessary ide-cd cache flushes

    Only issue a cdrom cache flush if we've done write to the drive.  The
    ->media_written() flag keeps track of that.

    Signed-off-by: Jens Axboe <axboe@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mike Christie <michaelc@cs.wisc.edu>:
    [SCSI] call correct scsi_done function in scsi_dispatch_cmd

    scsi_dispatch_cmd currently calls scsi_done when the device is in the
    SDEV_DEL state, but at this point the command has not had a timer added
    to it (this is done a couple lines down) so scsi_done just returns and
    the command is lost. The attached patch made against 2.6.12-rc3 calls
    __scsi_done in this case so the comamnd will be returned upwards.

    Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc32: Workaround a cache flush issue on sleep

    We are experiencing a problem when flushing the CPU caches before sleep
    on some laptop models using the 750FX CPU rev 1.X. While I haven't been
    able to figure out a proper explanation for what's going on, I do have a
    workaround that seem to work reliably and allows those machine to sleep
    and wakeup properly again.

    I'll re-update that code if/when I ever find exactly what is happening
    with those CPU revisions.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc32: Small build fix for alsa powermac

    My newer iMac mini driver doesn't build with verbose debug enabled.

    This fixes it, and removes an erroneous error printk (since it's normal
    on some machine to not find some gpios on the "first try").

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc32: Fix sleep on old 101 PowerBook

    A typo in the machine table incorrectly mark the 101 PowerBook as
    needing explicit callback from the video driver to enable sleep mode. I
    did not implement that mecanism for chipsest older than r128, so we need
    to mark this machine as always beeing able to sleep for now.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc32: More fixlet for pmac sound

    As Al Viro noticed, my previous fix missed one instance of "device" in
    the driver local debug code. Harmless unless you tweak the #define's in
    there but still work fixing.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] cpufreq annoying warning fix

    The cpufreq core patch I sent earlier got only half-applied.  I added a
    flag to let the low level driver disable an annoying warning on
    suspend/resume that is normal on ppc, but the "resume" part of it wasn't
    applied.

    This just adds back that missing bit.  The original patch also reworked
    the resume() function to avoid nesting too many if () statements along
    the way I did the suspend() one, but I didn't include that in the patch
    below.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc32: Fix might_sleep() warning with clock spreading

    The clock spreading disable/enable code was called to late/early during
    the suspend/resume code on some laptops and would trigger a
    might_sleep() warning due to the down() call in the low level i2c code.

    This fixes it by calling those functions earlier/later when interrupts
    are still enabled.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dave Kleikamp <shaggy@austin.ibm.com>:
    [PATCH] JFS: reduce number of synchronous transactions

    Use an inline pxd list rather than an xad list in the xadlock.
    When the number of extents being modified can fit with the xadlock,
    a transaction can be committed asynchronously.  Using a list of
    pxd's instead of xad's allows us to fit 4 extents, rather than 2.

    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dave Kleikamp <shaggy@austin.ibm.com>:
    [PATCH] JFS: Write journal sync points more often

    This patch adds jfs_syncpt, which calls lmLogSync to write sync points
    to the journal both in jfs_sync_fs and when sync barrier processing
    completes.

    lmLogSync accomplishes two things:  1) it pushes logged-but-dirty
    metadata pages to disk, and 2) it writes a sync record to the journal
    so that jfs_fsck doesn't need to replay more transactions than is
    necessary.

    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dave Kleikamp <shaggy@austin.ibm.com>:
    [PATCH] JFS: Support page sizes greater than 4K

    jfs has never worked on architecutures where the page size was not 4K.

    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dave Kleikamp <shaggy@austin.ibm.com>:
    [PATCH] JFS: Simplify creation of new iag

    JFS was creating a new IAG (inode aggregate group) in one address
    space, and afterwards, accessing it from another.  This could lead to
    complications when cache pages contain more than one page of jfs
    metadata.  This patch causes the IAG to be initialized in the same
    address space that it is subsequently accessed with.

    This also elimitates an I/O, but IAG's aren't created too often.

    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dave Kleikamp <shaggy@austin.ibm.com>:
    [PATCH] JFS: Changes for larger page size

    JFS code has always assumed a page size of 4K.  This patch fixes the
    non-pagecache uses of pages to deal with larger pages.

    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dave Kleikamp <shaggy@austin.ibm.com>:
    [PATCH] JFS: Don't allocate extents that overlap existing extents

    Modify xtSearch so that it returns the next allocated block when the
    requested block is unmapped.  This can be used to make sure we don't
    create a new extent that overlaps the next one.

    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [AUDIT] Update UML audit-syscall-{entry,exit} calls to new prototypes

    This patch is for -mm only.  It should probably be included in git-audit,
    and should be forwarded to Linus iff git-audit is.

    It updates the audit-syscall-{entry,exit} calls to current -mm.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: decompressor: use platform debug macros

    Rather than duplicate the assembly for debug macros in the
    decompressor head.S, use asm/arch/debug-macros.S instead.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: cleanup vmalloc start/offset macros

    VMALLOC_START and VMALLOC_OFFSET are common between all ARM
    machine classes.  Move them into include/asm-arm/pgtable.h,
    but allow a machine class to override them if required.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Clean up commenting/spacing for Integrator

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Cleanup kmalloc in cyber2000fb

    We use one kmalloc to allocate two structures needlessly.
    Combine these two structures into one.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Chris Wright <chrisw@osdl.org>:
    [PATCH] add new audit data to last skb

    When adding more formatted audit data to an skb for delivery to userspace,
    the kernel will attempt to reuse an skb that has spare room.  However, if
    the audit message has already been fragmented to multiple skb's, the
search
    for spare room in the skb uses the head of the list.  This will corrupt
the
    audit message with trailing bytes being placed midway through the stream.
    Fix is to look at the end of the list.

    Signed-off-by: Chris Wright <chrisw@osdl.org>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

David Woodhouse <dwmw2@shinybook.infradead.org>:
    [AUDIT] Log correct syscall args for i386 processes on x86_64

    The i386 syscall ABI uses different registers. Log those instead of the
    x86_64 ones.

    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Benjamin Herrenschmidt <benh@kernel.crashing.org>:
    [PATCH] ppc64: fix gcc 4.0 vs CONFIG_ALTIVEC

    gcc-4.0 generates altivec code implicitly when -mcpu indicates an
    altivec capable CPU which is not suitable for the kernel.  However, we
    used to set -mcpu=970 when CONFIG_ALTIVEC was set because a gcc-3.x bug
    prevented from using -maltivec along with -mcpu=power4, thus prevented
    building the RAID6 altivec code.

    This patch fixes all of this by testing for the gcc version.  If 4.0 or
    later, just normally use -mcpu=power4 and let the RAID6 code add
    -maltivec to the few files it needs to be compiled with altivec support.
    For 3.x, we still use -mcpu=970 to work around the above problem, which
    is fine as 3.x will never implicitly generate altivec code.

Suresh Siddha <suresh.b.siddha@intel.com>:
    [IA64] Add config SCHED_SMT

    Now that we have MC/MT detection patches in, appended patch allows us to
    configure MT scheduler optimizations. For now, we will this option off
    by default.

    There is some discussion going on lkml about setting up sched-domains
    which are absolutely needed (like for example, we shouldn't setup SMT
domain
    for non MT processors). Once that patch goes in, we can enable this option
by
    default.

    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Andreas Schwab <schwab@suse.de>:
    [IA64] Fix memcpy_mck.S for current binutils

    The current ia64 assembler complains about mismatching .proc/.endp pairs.
    (Same patch also sent by H.J. Lu)

    Signed-off-by: Andreas Schwab <schwab@suse.de>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

David Mosberger-Tang <davidm@hpl.hp.com>:
    [IA64] fix typos caught by new assembler

    Patch below fixes 3 trivial typos which are caught by the new
    assembler (v2.169.90).  Please apply.

    [Note: fix to memcpy that was also part of this patch was separately
     applied from patches by H.J. and Andreas ... so the delta here only
     has the other two fixes. -Tony]

    Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Jesse Barnes <jbarnes@sgi.com>:
    [IA64-SGI] remove unused sn header files

    This patch makes Jes' patch (which also contains the removal of fetchop.h)
a
    bit smaller, and removes two other unused files at the same time, sndrv.h
and
    sn_fru.h.

    Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Jes Sorensen <jes@wildopensource.com>:
    [IA64-SGI] cleanup shubio.h

    This patch cleans up include/asm/sn/shubio.h by removing a ton of
    whitespaces and running it through Lindent, reducing it's size by almost
    30KB. No actual content has been changed.

    Signed-off-by: Jes Sorensen <jes@wildopensource.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

David Mosberger-Tang <davidm@hpl.hp.com>:
    [IA64] use fc.i for fluch_icache_range()

    This is a small patch to switch fluch_icache_range() to use fc.i
    instead of fc.  This would save time on processors which can establish
    i-cache coherency without flushing the cache-line out to memory (not
    that any current processors do).  On existing processors, fc.i behaves
    like fc.  The only caveat is that very old assemblers may not know
    about fc.i yet.

    Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Bruce Losure <blosure@sgi.com>:
    [IA64-SGI] Altix only: Remove hubdev SAL call

    Hi Tony,

    This patch against ia64-test-2.6.12 fixes a bug where the tiocx code
    was inadvertently un-doing some address modifications done in earlier
    fixup code.    This patch just removes the offending code.

    Signed-off-by: Bruce Losure <blosure@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Bruce Losure <blosure@sgi.com>:
    [IA64-SGI] Altix patch to fix missing Kconfig dependency.

    This is a one-liner to make the mbcs driver depend on SGI_TIOCX in the
    drivers/char/Kconfig file.

    Signed-off-by: Bruce Losure <blosure@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Bruce Losure <blosure@sgi.com>:
    [IA64-SGI] Altix patch to add bricktype knowledge to tiocx

    Here is a patch to enable the SGI tiocx bus driver to distingush between
    FPGA-attached h/w and non-FPGA-attached h/w.

    Signed-off-by: Bruce Losure <blosure@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Dean Nelson <dcn@sgi.com>:
    [PATCH] move cnodeid_to_nasid_table out of pda
    Another step in the effort to eliminate the SN pda structure.
    This patch moves the cnodeid_to_nasid_table field out of the pda,
    making it a standalone per-cpu data item, and exports it so it can
    be accessed by kernel modules.

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Dean Nelson <dcn@sgi.com>:
    [IA64] Export node_online_map and node_possible_map

    Export node_online_map and node_possible_map so that kernel modules can
use
    the nodemask macros, like, for_each_node() and for_each_online_node().

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Dean Nelson <dcn@sgi.com>:
    [IA64-SGI] Define some additional SHub1 and Shub2 register symbols

    Define some additional SHub1 and SHub2 register symbols.

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Dean Nelson <dcn@sgi.com>:
    [IA64-SGI] Add some needed externs currently not defined

    Add some needed externs currently not defined.

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Dean Nelson <dcn@sgi.com>:
    [IA64-SGI] SGI Altix cross partition functionality (2nd
    This patch contains the shim module (XP) which interfaces between the
    communication module (XPC) and the functional support modules (like
XPNET).

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Tony Luck <aegl@agluck-lia64.sc.intel.com>:
    [IA64] manually apply changes to arch/ia64/sn/kernel/Makefile

    cg-patch couldn't apply the patch to Makefile, and my dumb script
    rushed on and ran cg-commit without this change.

    Signed-off-by: Tony Luck <tony.luck@intel.com>

Dean Nelson <dcn@sgi.com>:
    [IA64-SGI] SGI Altix cross partition functionality [2/3]

    This patch contains the communication module (XPC) for cross partition
    communication on a partitioned SGI Altix.

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Dean Nelson <dcn@sgi.com>:
    [IA64-SGI] SGI Altix cross partition functionality [3/3]

    This patch contains the cross partition pseudo-ethernet driver (XPNET)
    functional support module.

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Dean Nelson <dcn@sgi.com>:
    [IA64-SGI] convert AMO address found in XPC's reserved page

    This patch detects the existence of an uncached physical AMO address setup
    by EFI's XPBOOT (SGI) and converts it to an uncached virtual AMO address.
    Depends on a patch submitted on 23 March 2005 with the subject of:
        [PATCH 2/3] SGI Altix cross partition functionality (2nd revision)

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Colin Ngam <cngam@sgi.com>:
    [IA64-SGI] Altix only: Register Error Interrupt

    The following patch ensures that the correct error interrupt handling
    routine is initialized.  This patch is based on the 2.6.12 ia64 release
tree.

    Signed-off-by: Colin Ngam <cngam@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Alex Williamson <alex.williamson@hp.com>:
    [IA64] use common pxm function

    This patch simplifies a couple places where we search for _PXM
    values in ACPI namespace.  Thanks,

    Signed-off-by: Alex Williamson <alex.williamson@hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Mike Habeck <habeck@sgi.com>:
    [IA64-SGI] Altix only: Fix for sn_dma_flush

    The following patch fixes a bug in the SGI Altix sn_dma_flush code.
    sn_dma_flush is broken in 2.6.  The code isn't waiting for the DMA
    data to be flushed out of the PIC ASIC. This patch is based off the
    linux-ia64-test-2.6.12 tree

    Signed-off-by: Mike Habeck <habeck@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Zwane Mwaikambo <zwane@arm.linux.org.uk>:
    [IA64] reduce cacheline bouncing in cpu_idle_wait

    Andi noted that during normal runtime cpu_idle_map is bounced around a
lot,
    and occassionally at a higher frequency than the timer interrupt wakeup
    which we normally exit pm_idle from.  So switch to a percpu variable.

    I didn't move things to the slow path because it would involve adding
    scheduler code to wakeup the idle thread on the cpus we're waiting for.

    Signed-off-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

David Woodhouse <dwmw2@infradead.org>:
    [IA64] fix ia64 syscall auditing

    Attached is a patch against David's audit.17 kernel that adds checks
    for the TIF_SYSCALL_AUDIT thread flag to the ia64 system call and
    signal handling code paths.  The patch enables auditing of system
    calls set up via fsys_bubble_down, as well as ensuring that
    audit_syscall_exit() is called on return from sigreturn.

    Neglecting to check for TIF_SYSCALL_AUDIT at these points results in
    incorrect information in audit_context, causing frequent system panics
    when system call auditing is enabled on an ia64 system.

    I have tested this patch and have seen no problems with it.

    [Original patch from Amy Griffis ported to current kernel by David
Woodhouse]

    From: Amy Griffis <amy.griffis@hp.com>

Russ Anderson <rja@sgi.com>:
    [IA64] MCA recovery improvements

    Jack Steiner uncovered some opportunities for improvement in
    the MCA recovery code.

      1) Set bsp to save registers on the kernel stack.
      2) Disable interrupts while in the MCA recovery code.
      3) Change the way the user process is killed, to avoid
         a panic in schedule.

    Testing shows that these changes make the recovery code much
    more reliable with the 2.6.12 kernel.

    Signed-off-by: Russ Anderson <rja@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Keith Owens <kaos@sgi.com>:
    [IA64] SAL to OS callbacks cannot call sleeping

    When SAL calls back into the OS, the OS code is running with preempt
    disabled so it cannot call sleeping functions.

    Signed-off-by: Keith Owens <kaos@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Mark Maule <maule@sgi.com>:
    [IA64] altix: fix TIOCA dmamap list_add

    Correct a bug where tioca_dma_mapped() is putting tioca dma map structs
    on the wrong list.

    Signed-off-by: Mark Maule <maule@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Russ Anderson <(rja@sgi.com)>:
    [patch] MCA recovery module undefined symbol fix

    The patch "MCA recovery improvements" added do_exit to mca_drv.c.
    That's fine when the mca recovery code is built in the kernel
    (CONFIG_IA64_MCA_RECOVERY=y) but breaks building the mca recovery
    code as a module (CONFIG_IA64_MCA_RECOVERY=m).

    Most users are currently building this as a module, as loading
    and unloading the module provides a very convenient way to turn
    on/off error recovery.

    This patch exports do_exit, so mca_drv.c can build as a module.

    Signed-off-by: Russ Anderson (rja@sgi.com)
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Patrick McHardy <kaber@trash.net>:
    [NETFILTER]: Missing owner-field initialization in iptable_raw

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Patrick McHardy <kaber@trash.net>:
    [NETFILTER]: Don't checksum CHECKSUM_UNNECESSARY skbs in TCP connection
tracking

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Herbert Xu <herbert@gondor.apana.org.au>:
    [IPV6]: Fix raw socket checksums with IPsec

    I made a mistake in my last patch to the raw socket checksum code.
    I used the value of inet->cork.length as the length of the payload.
    While this works with normal packets, it breaks down when IPsec is
    present since the cork length includes the extension header length.

    So here is a patch to fix the length calculations.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Herbert Xu <herbert@gondor.apana.org.au>:
    [IPV6]: Include ipv6.h for ipv6_addr_set

    This patch includes net/ipv6.h from addrconf.h since it needs
    ipv6_addr_set.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Thomas Graf <tgraf@suug.ch>:
    [XFRM]: Prevent off-by-one access to xfrm_dispatch

    Makes the type > XFRM_MSG_MAX check behave correctly to
    protect access to xfrm_dispatch.

    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Thomas Graf <tgraf@suug.ch>:
    [XFRM]: Cleanup xfrm_msg_min and xfrm_dispatch

    Converts xfrm_msg_min and xfrm_dispatch to use c99 designated
    initializers to make greping a little bit easier. Also replaces
    two hardcoded message type with meaningful names.

    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Thomas Graf <tgraf@suug.ch>:
    [RTNETLINK] Fix RTM_MAX to represent the maximum valid message type

    RTM_MAX is currently set to the maximum reserverd message type plus one
    thus being the cause of two bugs for new types being assigned a) given the
    new family registers only the NEW command in its reserved block the array
    size for per family entries is calculated one entry short and b) given the
    new family registers all commands RTM_MAX would point to the first entry
    of the block following this one and the rtnetlink receive path would
accept
    a message type for a nonexisting family.

    This patch changes RTM_MAX to point to the maximum valid message type
    by aligning it to the start of the next block and subtracting one.

    Signed-off-by: Thomas Graf <tgraf@suug.ch>

Thomas Graf <tgraf@suug.ch>:
    [RTNETLINK] Fix & cleanup rtm_min/rtm_max

    Converts rtm_min and rtm_max arrays to use c99 designated
    initializers for easier insertion of new message families.
    RTM_GETMULTICAST and RTM_GETANYCAST did not have the minimal
    message size specified which means that the netlink message
    was parsed for routing attributes starting from the header.
    Adds the proper minimal message sizes for these messages
    (netlink header + common rtnetlink header) to fix this issue.

    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Thomas Graf <tgraf@suug.ch>:
    [RTNETLINK] Cleanup rtnetlink_link tables

    Converts remaining rtnetlink_link tables to use c99 designated
    initializers to make greping a little bit easier.

    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Jesper Juhl <juhl-lkml@dif.dk>:
    [WAN]: kfree of NULL pointer is valid

    kfree(0) is perfectly valid, checking pointers for NULL before calling
    kfree() on them is redundant. The patch below cleans away a few such
    redundant checks (and while I was around some of those bits I couldn't
    stop myself from making a few tiny whitespace changes as well).

    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Lucas Correia Villa Real <lucasvr@gobolinux.org>:
    [PKT_SCHED]: fix typo on Kconfig

    This is a trivial fix for a typo on Kconfig, where the Generic Random
Early
    Detection algorithm is abbreviated as RED instead of GRED.

    Signed-off-by: Lucas Correia Villa Real <lucasvr@gobolinux.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Folkert van Heusden <folkert@vanheusden.com>:
    [TCP]: Optimize check in port-allocation code.

    Signed-off-by: Folkert van Heusden <folkert@vanheusden.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Folkert van Heusden <folkert@vanheusden.com>:
    [TCP]: Optimize check in port-allocation code, v6 version.

    Signed-off-by: Folkert van Heusden <folkert@vanheusden.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Jesper Juhl <juhl-lkml@dif.dk>:
    [PPP]: remove redundant NULL pointer checks before kfree & vfree

    kfree() and vfree() can both deal with NULL pointers. This patch removes
    redundant NULL pointer checks from the ppp code in drivers/net/

    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Asim Shankar <asimshankar@gmail.com>:
    [PKT_SCHED]: HTB: Drop packet when direct queue is full

    htb_enqueue(): Free skb and return NET_XMIT_DROP if a packet is
    destined for the direct_queue but the direct_queue is full. (Before
    this: erroneously returned NET_XMIT_SUCCESS even though the packet was
    not enqueued)

    Signed-off-by: Asim Shankar <asimshankar@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Patrick McHardy <kaber@trash.net>:
    [PKT_SCHED]: Fix range in PSCHED_TDIFF_SAFE to 0..bound

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Herbert Xu <herbert@gondor.apana.org.au>:
    [NETLINK]: cb_lock does not needs ref count on sk

    Here is a little optimisation for the cb_lock used by netlink_dump.
    While fixing that race earlier, I noticed that the reference count
    held by cb_lock is completely useless.  The reason is that in order
    to obtain the protection of the reference count, you have to take
    the cb_lock.  But the only way to take the cb_lock is through
    dereferencing the socket.

    That is, you must already possess a reference count on the socket
    before you can take advantage of the reference count held by cb_lock.
    As a corollary, we can remve the reference count held by the cb_lock.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Herbert Xu <herbert@gondor.apana.org.au>:
    [NETLINK]: Synchronous message processing.

    Let's recap the problem.  The current asynchronous netlink kernel
    message processing is vulnerable to these attacks:

    1) Hit and run: Attacker sends one or more messages and then exits
    before they're processed.  This may confuse/disable the next netlink
    user that gets the netlink address of the attacker since it may
    receive the responses to the attacker's messages.

    Proposed solutions:

    a) Synchronous processing.
    b) Stream mode socket.
    c) Restrict/prohibit binding.

    2) Starvation: Because various netlink rcv functions were written
    to not return until all messages have been processed on a socket,
    it is possible for these functions to execute for an arbitrarily

Nicolas Pitre <nico@org.rmk.(none)>:
    [PATCH] ARM: 2662/1: missing "default y" for CONFIG_HAS_TLS_REG

    Patch from Nicolas Pitre

    Signed-off-by: Nicolas Pitre
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Sascha Hauer <sascha@de.rmk.(none)>:
    [PATCH] ARM: 2661/1: imxfb include

    Patch from Sascha Hauer

    This patch adds the missing include files for the i.MX framebuffer
    driver.

    Signed-off-by: Sascha Hauer
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

David S. Miller <davem@sunset.davemloft.net>:
    [NETLINK]: Fix infinite loops in synchronous netlink changes.

    The qlen should continue to decrement, even if we
    pop partially processed SKBs back onto the receive queue.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Stephane Eranian <eranian@hpl.hp.com>:
    [IA64] perfmon & PAL_HALT again

    The pmu_active test is based on the values of PSR.up. THIS IS THE PROBLEM
as
    it does not take into account the lazy restore logic which is as follow
(simplified):

    context switch out:
    	save PMDs
    	clear psr.up
    	release ownership

    context switch in:
    	if (ctx->last_cpu == smp_processor_id() && ctx->cpu_activation == cpu_activation)
{
    		set psr.up
    		return
    	}
    	restore PMD
    	restore PMC
    	ctx->last_cpu   = smp_processor_id();
    	ctx->activation = ++cpu_activation;
    	set psr.up

    The key here is that on context switch out, we clear psr.up and on context switch
in
    we check if nobody else used the PMU on that processor since last time we came.
In

stephane eranian <eranian@hpl.hp.com>:
    [IA64] another perfmon fix (take2)

    - pfm_context_load(): change return value from EINVAL to EBUSY
      when context is already loaded.

    - pfm_check_task_state(): pass test if context state is MASKED.
      It is safe to give access on PFM_CTX_MASKED because the PMU
      state (PMD) is stable and saved in software state.
      This helps multiplexing programs such as the example given
      in libpfm-3.1.

    Signed-off-by: stephane eranian <eranian@hpl.hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

David S. Miller <davem@sunset.davemloft.net>:
    [XFRM/RTNETLINK]: Decrement qlen properly in {xfrm_,rt}netlink_rcv().

    If we free up a partially processed packet because it's
    skb->len dropped to zero, we need to decrement qlen because
    we are dropping out of the top-level loop so it will do
    the decrement for us.

    Spotted by Herbert Xu.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Tommy S. Christensen <tommy.christensen@tpack.net>:
    [NET]: Disable queueing when carrier is lost.

    Some network drivers call netif_stop_queue() when detecting loss of
    carrier. This leads to packets being queued up at the qdisc level for
    an unbound period of time. In order to prevent this effect, the core
    networking stack will now cease to queue packets for any device, that
    is operationally down (i.e. the queue is flushed and disabled).

    Signed-off-by: Tommy S. Christensen <tommy.christensen@tpack.net>
    Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Patrick McHardy <kaber@trash.net>:
    [NETFILTER]: Fix nf_debug_ip_local_deliver()

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Patrick McHardy <kaber@trash.net>:
    [NETFILTER]: Drop conntrack reference in ip_dev_loopback_xmit()

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Tony Luck <tony.luck@intel.com>:
    [IA64] Fix two warnings introduced by perfmon patches.

    Signed-off-by: Tony Luck <tony.luck@intel.com>

Stephen Hemminger <shemminger@osdl.org>:
    [PKT_SCHED]: netetm: trap infinite loop hange on qlen underflow

    Due to bugs in netem (fixed by later patches), it is possible to get qdisc
    qlen to go negative. If this happens the CPU ends up spinning forever
    in qdisc_run(). So add a BUG_ON() to trap it.

    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Stephen Hemminger <shemminger@osdl.org>:
    [PKT_SCHED]: netetm: make qdisc friendly to outer disciplines

    Netem currently dumps packets into the queue when timer expires. This
    patch makes work by self-clocking (more like TBF).  It fixes a bug
    when 0 delay is requested (only doing loss or duplication).

    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Stephen Hemminger <shemminger@osdl.org>:
    [PKT_SCHED]: netetm: adjust parent qlen when duplicating

    Fix qlen underrun when doing duplication with netem. If netem is used
    as leaf discipline, then the parent needs to be tweaked when packets
    are duplicated.

    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Herbert Xu <herbert@gondor.apana.org.au>:
    [IPSEC]: Store idev entries

    I found a bug that stopped IPsec/IPv6 from working.  About
    a month ago IPv6 started using rt6i_idev->dev on the cached socket dst
    entries.  If the cached socket dst entry is IPsec, then rt6i_idev will
    be NULL.

    Since we want to look at the rt6i_idev of the original route in this
    case, the easiest fix is to store rt6i_idev in the IPsec dst entry just
    as we do for a number of other IPv6 route attributes.  Unfortunately
    this means that we need some new code to handle the references to
    rt6i_idev.  That's why this patch is bigger than it would otherwise be.

    I've also done the same thing for IPv4 since it is conceivable that
    once these idev attributes start getting used for accounting, we

Tony Luck <tony.luck@intel.com>:
    [IA64] Update arch/ia64/configs/tiger_defconfig

    Kristen did most of the checking, bring this up to -rc2.

    Signed-off-by: Tony Luck <tony.luck@intel.com>

J Hadi Salim <hadi@cyberus.ca>:
    [PKT_SCHED]: Action repeat

    Long standing bug.
    Policy to repeat an action never worked.

    Signed-off-by: J Hadi Salim <hadi@cyberus.ca>
    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@davemloft.net>:
    [SPARC64]: Fix goal_cpu tracking in retarget_one_irq().

    We would never advance the goal_cpu counter like we
    should, so all IRQs would go to a single processor.

    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@davemloft.net>:
    [SPARC64]: Disable IRQ forwarding.

    There is some race whereby IRQs get stuck, the IRQ status
    is pending but no processor actually handles the IRQ vector
    and thus the interrupt.

    This is a temporary workaround.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Patrick McHardy <kaber@trash.net>:
    [IPV6]: net/addrconf.h needs to include linux/in6.h earlier

    Else the in6_addr layout is not known for struct
    prefix_info.

    Signed-off-by: Patrick McHardy <kaber@trash.net>

Greg KH <gregkh@suse.de>:
    [PATCH] USB: add a driver for the AirPrime CDMA Wireless PC card.

    Easier than trying to use the generic usb-serial driver.

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

David Brownell <david-b@pacbell.net>:
    [PATCH] USB: ehci power fixes

    Miscellaneous updates for EHCI.

     - Mostly updates the power switching on EHCI controllers.  One routine
       centralizes the "power on/off all ports" logic, and the capability to
       do that is reported more correctly.

     - Courtesy Colin Leroy, a patch to always power up ports after resumes
       which didn't keep a USB device suspended.  The reset-everything logic
       powers down those ports (on some hardware) so something needs to turn
       them back on.

     - Minor tweaks/bugfixes for the debug port support.

    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Matthew Dharm <mdharm-usb@one-eyed-alien.net>:
    [PATCH] USB Storage: fix compile error

    This patch fixes a compiler error caused by a missing prototype.  It
should
    apply directly to Greg KH's usb-2.6.git tree.

    Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Ian Abbott <abbotti@mev.co.uk>:
    [PATCH] USB: ftdi_sio redundant macro removal

    [ftdi_sio] Replaced redundant INTERFACE_A and INTERFACE_B macros with
    the equivalent PIT_SIOA and PIT_SIOB macros.

    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Ian Abbott <abbotti@mev.co.uk>:
    [PATCH] USB: VID/PID updates for ftdi_sio driver

    Some VID/PID updates for the ftdi_sio driver:

    * The "Gude Analog- und Digitalsysteme GmbH" entries were missing from
      the "combined" table.
    * Replaced FTDI_8U232AM_ALT_ALT_PID with 3 PIDs for devices from
      4n-galaxy.de.
    * Removed redundant FTDI_RM_VID and renamed FTDI_RMCANVIEW_PID to
      FTDI_RM_CANVIEW_PID.
    * Added VID/PID for serial converter in Mobility Electronics EasiDock
      USB 200 (mentioned by Gregory Schmitt).
    * Added PID for Active Robots USB comms board (mentioned by John Koch).

    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    diff -ur a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c

Andrea Arcangeli <andrea@suse.de>:
    [PATCH] USB: new usbnet device id

    On Thu, Apr 14, 2005 at 11:06:21PM +0400, Sergey Vlasov wrote:
    > http://thread.gmane.org/gmane.linux.usb.devel/32977
    >
    > (see "[PATCH] N/3 cdc acm errors").
    >
    > You also need this driver core fix:
    >
    > http://thread.gmane.org/gmane.linux.usb.devel/33132

    I reproduced the same oops while trying to execute at+mode=99, it would
    be nice to get these fix merged since I believe it's still needed to
    connect the laptop over gprs (something I didn't test yet).

    This further patch will allow you to connect via usbnet, Greg could you
    apply? Thanks!

    Signed-off-by: Andrea Arcangeli <andrea@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Phil Dibowitz <phil@ipom.com>:
    [PATCH] USB: unusual_devs entry for Minolta Dimage Z10

    This patch adds an unusual_devs entry for the Minolta Dimage Z10.
    Originally reported by Vilisas <vilisas@xxx.lt>

    Signed-off-by: Phil Dibowitz <phil@ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Vivian Bregier <Vivian.Bregier@imag.fr>:
    [PATCH] USB: unusual_devs.h: atmel snd1 storage

    Signed-off-by: Phil Dibowitz <phil@ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Steven Cole <elenstev@mesatop.com>:
    [PATCH] USB: Spelling fixes for drivers/usb.

    Here are some spelling corrections for drivers/usb.

    cancelation -> cancellation
    succesful -> successful
    cancelation -> cancellation
    decriptor -> descriptor
    Initalize -> Initialize
    wierd -> weird
    Protocoll -> Protocol
    occured -> occurred
    successfull -> successful
    Procesing -> Processing
    devide -> divide
    Isochronuous -> Isochronous
    noticable -> noticeable
    Basicly -> Basically
    transfering -> transferring
    intialize -> initialize
    Incomming -> Incoming
    additionnal -> additional
    asume -> assume
    Unfortunatly -> Unfortunately
    retreive -> retrieve
    tranceiver -> transceiver
    Compatiblity -> Compatibility
    Incorprated -> Incorporated

Lonnie Mendez <lmendez19@austin.rr.com>:
    [PATCH] USB cypress_m8: update kernel driver with current source

    Fixed problem where setting or retreiving the serial config would fail
    with EPIPE.  Removed CRTS toggling so the driver behaves more like other
    usbserial adapters.  Issued new interval of 1ms instead of the default
    bInterval.  As a result, transfer speed has been substantially
    increased.  From avg. 850bps to avg. 3300bps.  Also added new module
    parameter 'interval' to tweak the interval in case this change causes
    problems for someone.  Cleaned up code and formatting issues so source
    is more readable.  Replaced the C++ style comments.  Various other code
    cleanups.

    Signed-off-by: Lonnie Mendez <lmendez19@austin.rr.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Ed L Cashin <ecashin@coraid.com>:
    [PATCH] aoe: improve allowed interfaces configuration

    improve allowed interfaces configuration

    Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    diff -uprN a/Documentation/aoe/aoe.txt b/Documentation/aoe/aoe.txt

Ed L Cashin <ecashin@coraid.com>:
    [PATCH] aoe: aoe-stat should work for built-in as well as module

    aoe-stat should work for built-in as well as module

    Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    diff -uprN a/Documentation/aoe/status.sh b/Documentation/aoe/status.sh

Ed L Cashin <ecashin@coraid.com>:
    [PATCH] aoe: update the documentation to mention aoetools

    update the documentation to mention aoetools

    Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Ed L Cashin <ecashin@coraid.com>:
    [PATCH] aoe: allow multiple aoe devices to have the same mac

    allow multiple aoe devices to have the same mac

    Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    diff -u b/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c

Ed L Cashin <ecashin@coraid.com>:
    [PATCH] aoe: update version number to 10

    update version number to 10

    Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Ed L Cashin <ecashin@coraid.com>:
    [PATCH] aoe: add firmware version to info in sysfs

    add firmware version to info in sysfs

    Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Kenji Kaneshige <kaneshige.kenji@soft.fujitsu.com>:
    [PATCH] PCI: 'is_enabled' flag should be set/cleared when the device is actually
enabled/disabled

    I think 'is_enabled' flag in pci_dev structure should be set/cleared
    when the device actually enabled/disabled. Especially about
    pci_enable_device(), it can be failed. By this change, we will also
    get the possibility of refering 'is_enabled' flag from the functions
    called through pci_enable_device()/pci_disable_device().

    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Pavel Machek <pavel@ucw.cz>:
    [PATCH] PCI: fix stale PCI pm docs

    This fixes u32 vs. pm_message_t confusion in documentation, and
    removes references to no-longer-existing (*save_state), too. With
    exception of USB (I hope David will fix/apply my patch), this should
    fix last piece of this confusion... famous last words.

    Signed-off-by: Pavel Machek <pavel@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Matthew Wilcox <matthew@wil.cx>:
    [PATCH] PCI: update PCI documentation for pci_get_slot() depreciation

    pci_find_slot() doesn't work on multiple-domain boxes so pci_get_slot()
    should be used instead.

    Signed-off-by: Matthew Wilcox <matthew@wil.cx>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Greg KH <gregkh@suse.de>:
    [PATCH] PCI: Clean up a lot of sparse "Should it be static?" warnings.

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Rolf Eike Beer <eike-hotplug@sf-tec.de>:
    [PATCH] PCI Hotplug ibmphp_pci.c: Fix masking out needed information too
early

    here is the patch that fixes the bug introduced by my previous patch which
    already went into 2.6.12-rc2 and is likely to cause trouble is someone
hits
    one the else case here by accident.

    Using the &= operation before the if statement destroys the information
the
    if asks for so we always go into the else branch.

    Signed-off-by: Rolf Eike Beer <eike-hotplug@sf-tec.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

ssant@in.ibm.com <ssant@in.ibm.com>:
    [PATCH] PCI: fix up word-aligned 16-bit PCI config access through sysfs

    This patch adds the possibility to do word-aligned 16-bit atomic PCI
    configuration space accesses via the sysfs PCI interface. As a result,
problems
    with Emulex LFPC on IBM PowerPC64 are fixed.

    Patch is present in SLES 9 SP1.

    Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Greg KH <gregkh@suse.de>:
    [PATCH] PCI: Add pci shutdown ability

    Now pci drivers can know when the system is going down without having to
    add a reboot notifier event.

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

R.Marek@sh.cvut.cz <R.Marek@sh.cvut.cz>:
    [PATCH] PCI: Rapid Hance quirk

    This patch just adds Intel's Hance Rapid south bridge IDs to ICH4 region
quirk.
    Patch was successfuly tested by Chunhao Huang from Winbond.

    Signed-Off-By: Rudolf Marek <r.marek@sh.cvut.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Dely Sy <dlsy@snoqualmie.dp.intel.com>:
    [PATCH] PCI Hotplug: fix pciehp regression

    I fogot to remove the code that freed the memory in cleanup_slots().
    Here is the new patch, which I have also taken care of the comment
    by Eike to remove the cast in hotplug_slot->private.

    Signed-off-by: Dely Sy <dely.l.sy@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Steven Cole <elenstev@mesatop.com>:
    [PATCH] PCI: Spelling fixes for drivers/pci.

    Here are some spelling corrections for drivers/pci.

    CONTROLER -> CONTROLLER
    Regisetr -> Register
    harware -> hardware
    inital -> initial
    Initilize -> Initialize
    funtion -> function
    funciton -> function
    occured -> occurred

    Signed-off-by: Steven Cole <elenstev@mesatop.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] PCI: drivers/pci/pci.c: remove pci_dac_set_dma_mask

    pci_dac_set_dma_mask is currently completely unused.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Dave Kleikamp <shaggy@austin.ibm.com>:
    JFS: Endian errors

    Thanks sparse!

    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] sparc NULL noise removal

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ISA DMA Kconfig fixes - part 1

    A bunch of drivers use ISA DMA helpers or their equivalents for
    platforms that have ISA with different DMA controller (a lot of ARM
    boxen).  Currently there is no way to put such dependency in Kconfig -
    CONFIG_ISA is not it (e.g.  it is not set on platforms that have no ISA
    slots, but have on-board devices that pretend to be ISA ones).

    New symbol added - ISA_DMA_API.  Set when we have functional
    enable_dma()/set_dma_mode()/etc.  set of helpers.  Next patches in the
    series will add missing dependencies for drivers that need them.

    I'm very carefully staying the hell out of the recurring flamefest on
    what exactly CONFIG_ISA would mean in ideal world - added symbol has a

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ISA_DMA Kconfig fixes - part 2 (parport_pc)

    Part of parport_pc that uses ISA DMA helpers made conditional on
    CONFIG_ISA_DMA_API.  As the result, driver got usable for boxen that do
    not have ISA DMA stuff and have normal PCI parport card stuck into
    them - these never use DMA anyway.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] mbcs trivial user annotations

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] sonypi trivial user annotations

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ISA DMA Kconfig fixes - part 4 (irda)

     * net/irda/irda_device.c::irda_setup_dma() made conditional on
       ISA_DMA_API (it uses helpers in question and irda is usable on
       platforms that don't have them at all - think of USB IRDA, for
       example).
     * irda drivers that depend on ISA DMA marked as dependent on
       ISA_DMA_API

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ISA DMA Kconfig fixes - part 3

    Drivers that expect ISA DMA API are marked as such in Kconfig.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] ipmi iomem annotations and fixes

    annotated, a bunch of direct dereferencing replaced with readb().

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@www.linux.org.uk>:
    [PATCH] asm/signal.h unification

    New file - asm-generic/signal.h.  Contains declarations of
    __sighandler_t, __sigrestore_t, SIG_DFL, SIG_IGN, SIG_ERR and default
    definitions of SIG_BLOCK, SIG_UNBLOCK and SIG_SETMASK.

    asm-*/signal.h switched to including it.  The only exception is
    asm-parisc/signal.h that wants its own declaration of __sighandler_t;
    that one is left as-is.

    asm-ppc64/signal.h required one more thing - unlike everybody else it
    used __sigrestorer_t instead of usual __sigrestore_t.  PPC64 switched to
    common spelling.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Denis Vlasenko <vda@ilport.com.ua>:
    [PATCH] i810fb: fix __initdata access

    [hv]sync[12] are __initdata, causing mplayer to oops with the previous i810fb
fix.

    My fault, this fixes it. Sorry.

    Signed-off-by: Linux Torvalds <torvalds@osdl.org>

Dean Nelson <dcn@sgi.com>:
    [IA64-SGI] move nodepda pointer out of pda

    Remove the p_nodepda and p_subnodepda pointers from the pda_s structure.
    And then define a new per-cpu pointer to the nodepda and export it so
    that it can be accessed by kernel modules.

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Dean Nelson <dcn@sgi.com>:
    [IA64-SGI] convert some sn SAL_CALLs to ia64_sal_oemcall calls

    Convert some sn SAL_CALLs to ia64_sal_oemcall calls so that they can be
    called by kernel modules.

    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

Alexander Nyberg <alexn@dsv.su.se>:
    [PATCH] Hotplug: Make dev->bus checking consistent

    Earlier in the same function dev->bus is checked before dereferenced,
    make consistent although I honestly don't know if dev->bus could
    ever be NULL

    Found by the Coverity tool

    Signed-off-by: Alexander Nyberg <alexn@dsv.su.se>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Roman Kagan <rkagan@mail.ru>:
    [PATCH] drivers/base/bus.c: fix iteration in driver_detach()

    With 2.6.11 and 2.6.12-rc2 (and perhaps a few versions before) usb
    drivers for multi-interface devices, which do
    usb_driver_release_interface() in their disconnect(), make rmmod hang.

    It turns out to be due to a bug in drivers/base/bus.c:driver_detach(),
    that iterates over the list of attached devices with
    list_for_each_safe() under an assumption that device_release_driver()
    only releases the current device, while it may also call
    device_release_driver() for other devices on the same list.

    The following patch fixes it.  Please consider applying.

    Signed-off-by: Roman Kagan <rkagan@mail.ru>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: Fix kernel stack offset calculations

    Various places in the ARM kernel implicitly assumed that kernel
    stacks are always 8K due to hard coded constants.  Replace these
    constants with definitions.

    Correct the allowable range of kernel stack pointer values within
    the allocation.  Arrange for the entire kernel stack to be zeroed,
    not just the upper 4K if CONFIG_DEBUG_STACK_USAGE is set.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    ARM: Add missed imxfb include file

    This file got missed in the commit of patch 2661/1 thanks to a buggy
    script.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] ARM: select PCI, ISA and ISA_DMA

    Rather than using a long "depends on..." and "default y" lines for
    these options, use select instead.

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Rafael J. Wysocki <rjw@sisk.pl>:
    [DECNET]: Fix build after C99 netlink initializer change.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Nathan Scott <nathans@sgi.com>:
    [XFS] Move the XFS inode to the front of its hash list on a cache hit

    SGI Modid: xfs-linux:xfs-kern:21915a

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

Nathan Scott <nathans@sgi.com>:
    [XFS] Block mount attempts for filesystems with version 1 directories.

    SGI Modid: xfs-linux:xfs-kern:21937a

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

Nathan Scott <nathans@sgi.com>:
    [XFS] Fix up uses of nlink_t incorrectly restricting us to 2^16 links for some
platforms

    SGI Modid: xfs-linux:xfs-kern:22032a

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

Eric Sandeen <sandeen@sgi.com>:
    [XFS] Enable XFS_VNODE_TRACE

    SGI Modid: xfs-linux:xfs-kern:190725a

    Signed-off-by: Eric Sandeen <sandeen@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@sgi.com>
    .

Dean Roehrich <roehrich@sgi.com>:
    [XFS] Add ATTR_NOLOCK for xfs_setattr to indicate that XFS_IOLOCK is held

    SGI Modid: xfs-linux:xfs-kern:190711a

    Signed-off-by: Dean Roehrich <roehrich@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@sgi.com>
    .

Nathan Scott <nathans@sgi.com>:
    [XFS] Allow initial XFS delayed allocation size to be increased beyond
64KB.

    SGI Modid: xfs-linux:xfs-kern:22261a

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

Eric Sandeen <sandeen@sgi.com>:
    [XFS] Fix up warnings

    SGI Modid: xfs-linux:xfs-kern:191411a

    Signed-off-by: Eric Sandeen <sandeen@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@sgi.com>

Nathan Scott <nathans@sgi.com>:
    [XFS] Resolve an issue with xfsbufd not getting along with swsusp.

    SGI Modid: xfs-linux:xfs-kern:22342a

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

Nathan Scott <nathans@sgi.com>:
    [XFS] Disable the combination of XFS direct IO and AIO until the IO
completion
    handling for unwritten extents can be moved out of interrupt context.

    SGI Modid: xfs-linux:xfs-kern:22343a

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

Daniel Moore <dxm@sgi.com>:
    [XFS] stop background sync from waiting for in-use inodes

    SGI Modid: xfs-linux:xfs-kern:191586a

    Signed-off-by: Daniel Moore <dxm@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@sgi.com>

Eric Sandeen <sandeen@sgi.com>:
    [XFS] remove noisy printk at vnode trace allocation

    SGI Modid: xfs-linux:xfs-kern:191625a

    Signed-off-by: Eric Sandeen <sandeen@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@sgi.com>

Nathan Scott <nathans@sgi.com>:
    [XFS] Do not do delalloc conversion on pages beyond EOF ever, not just
sometimes

    SGI Modid: xfs-linux:xfs-kern:22376a

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

Nathan Scott <nathans@sgi.com>:
    [XFS] Use the right offset when ensuring a delayed allocate
    conversion has covered the offset originally requested.  Can cause
    data corruption when multiple processes are performing writeout on
    different areas of the same file.  Quite difficult to hit though. 

    SGI Modid: xfs-linux:xfs-kern:22377a

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

Nathan Scott <nathans@sgi.com>:
    [XFS] Cleanup use of loff_t vs xfs_off_t in the core code.

    SGI Modid: xfs-linux:xfs-kern:22378a

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

Arnaldo Carvalho de Melo <acme@ghostprotocols.net>:
    [IPV6]: Fix OOPS when using IPV6_ADDRFORM

    This causes sk->sk_prot to change, which makes the socket
    release free the sock into the wrong SLAB cache.  Fix this
    by introducing sk_prot_creator so that we always remember
    where the sock came from.

    Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

James Bottomley <James.Bottomley@steeleye.com>:
    [SCSI] fix command retries in spi_transport class

    The premise is that domain validation is likely to trigger errors which
    it wants to know about, so the only time it should be retrying them is
    when it gets a unit attention (likely as the result of a previous bus or
    device reset).  Ironically, the previous coding retried three times in
    all cases except those of unit attention.  The attached fixes this to do
    the right thing.

    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Christoph Hellwig <hch@lst.de>:
    [ATALK]: Add alloc_ltalkdev().

    this matches the API used by other link layer like ethernet or token
    ring.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Christoph Hellwig <hch@lst.de>:
    [SPARC64]: Kill useless __pte_alloc_one_kernel indirection

    warning: untested, but it there's not too much chance for screwups

    Signed-off-by: David S. Miller <davem@davemloft.net>

Patrick McHardy <kaber@trash.net>:
    [IPV4]: multipath_wrandom.c GPF fixes

    multipath_wrandom needs to use GFP_ATOMIC.

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@davemloft.net>:
    [TG3]: Elide tg3_stop_block messages when such events are normal.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan <mchan@broadcom.com>:
    [TG3]: Ignore tg3_stop_block() errors.

    tg3_stop_block() errors can be safely ignored since tg3_chip_reset()
    always follows tg3_stop_block() calls.

    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller <davem@davemloft.net>:
    [TG3]: Update driver version and reldate.

    Signed-off-by: David S. Miller <davem@davemloft.net>

Coywolf Qi Hunt <coywolf@lovecn.org>:
    [SPARC]: Remove legacy stuff from cpu_idle().

    Currently sparc and sparc64's UP cpu_idle() checks current pid. This
    is old time legacy. Now it's paranoia.

    Signed-off-by: Coywolf Qi Hunt <coywolf@lovecn.org>
    Acked-by: William Irwin <wli@holomorphy.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Arnaldo Carvalho de Melo <acme@ghostprotocols.net>:
    [PATCH] Kconfig i18n support

    This patch adds i18n support for make *config, allowing users to have the
    config process in their own language.

    No printk was harmed in the process, don't worry, so all the bug reports,
    kernel messages, etc, remain in english, just the user tools to configure
    the kernel are internationalized.

    Users not interested in translations can just unset the related LANG,
    LC_ALL, etc env variables and have the config process in plain english,
    something like:

    LANG= make menuconfig

    is enough for having the whole config process in english. Or just don't
    install any translation file.

    Translations for brazilian portuguese are being done by a team of
    volunteers at:

Nicolas Pitre <nico@org.rmk.(none)>:
    [PATCH] ARM: 2665/1: kill warnings in entry-armv.S

    Patch from Nicolas Pitre

    Signed-off-by: Nicolas Pitre
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Nicolas Pitre <nico@org.rmk.(none)>:
    [PATCH] ARM: 2663/1: straightify TLS register emulation a bit more

    Patch from Nicolas Pitre

    This better express things, and should cover RMK's weird SMP toys.

    Signed-off-by: Nicolas Pitre
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Jason Gaston <jason.d.gaston@intel.com>:
    [PATCH] intel8x0: fix for Intel AC'97 audio driver

    This patch fixes a typo in the Intel AC'97 audio driver intel8x0.c for
    Intel ESB2.

    Signed-off-by: Jason Gaston <Jason.d.gaston@intel.com>
    Cc: <tiwai@suse.de>
    Cc: <perex@suse.cz>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Andrea Arcangeli <andrea@suse.de>:
    [PATCH] avoid -ENOMEM due reclaimable slab caches

    This makes sure that reclaimable buffer headers and reclaimable inodes
    are accounted properly during the overcommit checks.

    Signed-off-by: Andrea Arcangeli <andrea@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alexander Nyberg <alexn@telia.com>:
    [PATCH] x86 stack initialisation fix

    The recent change fix-crash-in-entrys-restore_all.patch

     	childregs->esp = esp;

     	p->thread.esp = (unsigned long) childregs;
    -	p->thread.esp0 = (unsigned long) (childregs+1);
    +	p->thread.esp0 = (unsigned long) (childregs+1) - 8;

     	p->thread.eip = (unsigned long) ret_from_fork;

    introduces an inconsistency between esp and esp0 before the task is run
the
    first time.  esp0 is no longer the actual start of the stack, but 8 bytes
    off.

    This shows itself clearly in a scenario when a ptracer that is set to also
    ptrace eventual children traces program1 which then clones thread1.  Now
    the ptracer wants to modify the registers of thread1.  The x86 ptrace

David Woodhouse <dwmw2@infradead.org>:
    [PATCH] ppc32: platform-specific functions missing from kallsyms.

    The PPC32 kernel puts platform-specific functions into separate sections
so
    that unneeded parts of it can be freed when we've booted and actually
    worked out what we're running on today.

    This makes kallsyms ignore those functions, because they're not between
    _[se]text or _[se]inittext.  Rather than teaching kallsyms about the
    various pmac/chrp/etc sections, this patch adds '_[se]extratext' markers
    for kallsyms.

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

Andrew Morton <akpm@osdl.org>:
    [PATCH] interwave needs isa pnp

    Fix bug #4509

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Stuart Brady <sdbrady@ntlworld.com>:
    [PATCH] include/linux/soundcard.h: endianness fix

    Fixes for big-endian systems in soundcard.h and awe_voice.h

    This patch fixes the AFMT_S16_NE (include/linux/soundcard.h) and AWE_PATCH
    (awe_voice.h) macros on big-endian systems.

    It also moves _PATCHKEY into a new file, patchkey.h, in order to remove a
    duplicate definition of it from awe_voice.h.

    Signed-off-by: Stuart Brady <sdbrady@ntlworld.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Herbert Xu <herbert@gondor.apana.org.au>:
    [PATCH] Add CXT48 to modem black list in ac97

    The following patch works around the misdetection of the CXT48 codec as a
    modem by the OSS ac97 driver.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

David Gibson <david@gibson.dropbear.id.au>:
    [PATCH] ppc64: pgtable.h and other header cleanups

    This patch started as simply removing a few never-used macros from
    asm-ppc64/pgtable.h, then kind of grew.  It now makes a bunch of
    cleanups to the ppc64 low-level header files (with corresponding
    changes to .c files where necessary) such as:
    	- Abolishing never-used macros
    	- Eliminating multiple #defines with the same purpose
    	- Removing pointless macros (cases where just expanding the
    macro everywhere turns out clearer and more sensible)
    	- Removing some cases where macros which could be defined in
    terms of each other weren't
    	- Moving imalloc() related definitions from pgtable.h to their
    own header file (imalloc.h)
    	- Re-arranging headers to group things more logically

Kumar Gala <galak@freescale.com>:
    [PATCH] ppc32: Simplified PPC core revision report

    We can identify new Freescale PPC cores by the fact that the MSB of the
PVR
    is set.  If we are a new Freescale core the decode of major/minor revision
    numbers is simplified so we dont have to add new case checks for a every
    new Freescale core.

    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Anton Blanchard <anton@samba.org>:
    [PATCH] ppc64: remove hidden -fno-omit-frame-pointer for schedule.c

    While looking at code generated by gcc4.0 I noticed some functions still
    had frame pointers, even after we stopped ppc64 from defining
    CONFIG_FRAME_POINTER.  It turns out kernel/Makefile hardwires
    -fno-omit-frame-pointer on when compiling schedule.c.

    Create CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER and define it on
architectures
    that dont require frame pointers in sched.c code.

    (akpm: blame me for the name)

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jesper Juhl <juhl-lkml@dif.dk>:
    [PATCH] ppc64: add missing Kconfig help text

    There's no help text for CONFIG_DEBUG_STACKOVERFLOW - add one.

    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: obvious compile fixes for x86-64 Subarch and x86 regression
fixes

    This patch does some totally trivial compilation fixes.  It also restores
the
    debugregs manipulation, which was commented out simply because it doesn't
    compile on x86_64 (we haven't yet implemented there debugregs handling).

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: include the linker script rather than symlink it

    Make vmlinux.lds.S include appopriate script instead of playing games with
    symlinks.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] x86_64: make string func definition work as intended

    In include/asm-x86_64/string.h there are such comments:

    /* Use C out of line version for memcmp */
    #define memcmp __builtin_memcmp
    int memcmp(const void * cs,const void * ct,size_t count);

    This would mean that if the compiler does not decide to use
__builtin_memcmp,
    it emits a call to memcmp to be satisfied by the C out-of-line version in
    lib/string.c.  What happens is that after preprocessing, in lib/string.i
you
    may find the definition of "__builtin_strcmp".

    Actually, by accident, in the object you will find the definition of
strcmp
    and such (maybe a trick intended to redirect calls to __builtin_memcmp to
the

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml: kludgy compilation fixes for x86-64 subarch modules support

    These are some trivial fixes for the x86-64 subarch module support.  The
only
    potential problem is that I have to modify arch/x86_64/kernel/module.c, to
    avoid copying the whole of it.

    I can't use it verbatim because it depends on a special vmalloc-like area
for
    modules, which for now (maybe that's to fix, I guess not) UML/x86-64 has
not.
    I went the easy way and reused the i386 vmalloc()-based allocator.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Acked-by: Andi Kleen <ak@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] uml kbuild: avoid useless rebuilds

    - Fix some problems with usage of $(targets) (sometimes missing, sometimes
      used badly) that trigger partial rebuilds when doing a rebuild.

    - At that purpose, also factor out some common code for symlinks creation.

    - Fix a x86-64 build warning, caused by -L/usr/lib, which is anyway
useless,
      and invalid in the x86-64 case.

    Tested on x86_64 and x86.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: cross-build support : mk_ptregs

    mk_ptregs converted.  Nothing new here, it's the same situation as with
    mk_user_constants.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: cross-build support: mk_sc

    Ditto for mk_sc

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: start cross-build support : mk_user_constants

    Beginning of cross-build fixes.  Instead of expecting that
mk_user_constants
    (compiled and executed on the build box) will see the sizeof, etc.  for
target
    box, we do what every architecture already does for asm-offsets.  Namely,
have
    user-offsets.c compiled *for* *target* into user-offsets.s and sed it into
the
    header with relevant constants.  We don't need to reinvent any wheels -
all
    tools are already there.

    This patch deals with mk_user_constants.  It doesn't assume any
relationship
    between target and build environment anymore - we pick all defines we need
    from user-offsets.h.  Later patches will deal with the rest of mk_...
helpers
    in the same way.

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: use variables rather than symlinks in dependencies

    Use explicit os-...  in make dependencies instead of playing with symlinks
    (symlink in question is still created - it's needed for other things;
however,
    there's no reason to complicate ordering here).

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: fix missing subdir in x86_64

    make distclean et.al.  are missing arch/um/sys-x86_64/utils; fixed the
same
    way we have it done for sys-i386 counterpart.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: cross-build support : mk_thread

    mk_thread converted

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: cross-build support : kernel_offsets

    The next group of helpers is a bit trickier - they want the constants
similar
    to those in user-offsets.h, but we need target sc.h for it.  So we can't
put
    that into user-offsets (sc.h depends on it) and need the second generated
    header for that stuff (kernel-offsets.h.  BFD...

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: cross-build support : mk_task and mk_constants

    helpers in arch/um/util (mk_task and mk_constants) converted.  That's it -
    none of the helpers depends on build and target being the same
architecture
    anymore.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: tidy Makefile.rules

    Just some breaking of some overly-long lines.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: S390 preparation, abstract host page fault data

    This patch removes the arch-specific fault/trap-infos from thread and
    skas-regs.

    It adds a new struct faultinfo, that is arch-specific defined in
    sysdep/faultinfo.h.

    The structure is inserted in thread.arch and thread.regs.skas and
    thread.regs.tt

    Now, segv and other trap-handlers can copy the contents from
regs.X.faultinfo
    to thread.arch.faultinfo with one simple assignment.

    Also, the number of macros necessary is reduced to

    FAULT_ADDRESS(struct faultinfo)
        extracts the faulting address from faultinfo

    FAULT_WRITE(struct faultinfo)
        extracts the "is_write" flag

    SEGV_IS_FIXABLE(struct faultinfo)

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: Fix SIGWINCH relaying

    This makes SIGWINCH work again, and fixes a couple of SIGWINCH-associated
    crashes.  First, the sigio thread disables SIGWINCH because all hell
breaks
    loose if it ever gets one and tries to call the signal handling code.
Second,
    there was a problem with deferencing tty structs after they were freed.
The
    SIGWINCH support for a tty wasn't being turned off or freed after the tty
went
    away.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: fix a ptrace call

    This fixes write_ldt_entry to treat userspace_pid as an array.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro <viro@parcelfarce.linux.theplanet.co.uk>:
    [PATCH] uml: finish cross-build support

    O=... builds support.  Very easy, actually.

    Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: hostfs failed mount handling

    This cleans up the error handling and fixes a crash if a hostfs mount
fails.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: inclusion cleanup

    The completion cleanup got rid of some semaphores, but didn't remove the
    inclusion of asm/semaphore.h from xterm_kern.c.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: s390 preparation, elf.h

    This patch make elh.h a symlink to the new arch-specific include files of
the
    form elf-<subarch>.h, as in the same way already is done for some other
    includes.  Also moves Elf-stuff from archparam-<subarch>.h and elf.h to
the
    new elf-<subarch>.h files.

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: s390 preparation, sighandler interface abstraction

    s390 passes parameters in registers.  So the only safe way to find out the
    address of signal context, error-address and error-type (trap_no), which
are
    passed to signal handlers as parameters, is to declare these parameters.

    So I inserted an subarch-specific macro which holds the declaration of
    parameters for signal handlers.

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: s390 preparation, delay moved to arch

    s390 has fast read access to realtime clock (nanosecond resolution).  So
it
    makes sense to have an arch-specific implementation not only of __delay,
but
    __udelay also.

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: remove a dangling symlink

    UML: remove no longer needed arch-signal.h

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: s390 preparation, checksumming done in arch code

    Checksum handling largely depends on the subarch.

    Thus, I renamed i386 arch_csum_partial in arch/um/sys-i386/checksum.S back
to
    csum_partial, removed csum_partial from arch/um/kernel/checksum.c and
shifted
    EXPORT_SYMBOL(csum_partial) to arch/um/sys-i386/ksyms.c.

    Then, csum_partial_copy_to and csum_partial_copy_from were shifted from
    arch/um/kernel/checksum.c to arch/um/include/sysdep-i386/checksum.h and
    inserted in the calling functions csum_partial_copy_from_user() and
    csum_and_copy_to_user().

    Now, arch/um/kernel/checksum.c is empty and removed.

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: s390 preparation, linkage.h inherited from host

    This patch replaces the contents of include/asm-um/linkage.h
    by
        #include "asm/arch/linkage.h"

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Prasanna S Panchamukhi <prasanna@in.ibm.com>:
    [PATCH] Kprobes: Oops! in unregister_kprobe()

    kernel oops!  when unregister_kprobe() is called on a non-registered
    kprobe.  This patch fixes the above problem by checking if the probe
exists
    before unregistering.

    Signed-off-by: Prasanna S Panchamukhi <prasanna@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Prasanna S Panchamukhi <prasanna@in.ibm.com>:
    [PATCH] Kprobes: Incorrect handling of probes on ret/lret instruction

    Kprobes could not handle the insertion of a probe on the ret/lret
    instruction and used to oops after single stepping since kprobes was
    modifying eip/rip incorrectly.  Adjustment of eip/rip is not required
after
    single stepping in case of ret/lret instruction, because eip/rip points to
    the correct location after execution of the ret/lret instruction.  This
    patch fixes the above problem.

    Signed-off-by: Prasanna S Panchamukhi <prasanna@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: header and code cleanup

    Remove some definitions and declarations from
arch/um/include/skas_ptrace.h,
    as they have moved to arch/um/include/sysdep/skas_ptrace.h

    Also, remove PTRACE_SIGPENDING support in UML at all.

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ananth N Mavinakayanahalli <amavin@redhat.com>:
    [PATCH] kprobes: Allow multiple kprobes at the same address

    Allow registration of multiple kprobes at an address in an architecture
    agnostic way.  Corresponding handlers will be invoked in a sequence.  But,
    a kprobe and a jprobe can't (yet) co-exist at the same address.

    Signed-off-by: Ananth N Mavinakayanahalli <amavin@redhat.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Randy.Dunlap <rddunlap@osdl.org>:
    [PATCH] patch-kernel: support non-incremental 2.6.x.y 'stable' patches

    Add better support for (non-incremental) 2.6.x.y patches; If an ending
    version number if not specified, the script automatically increments the
    SUBLEVEL (x in 2.6.x.y) until no more patch files are found; however,
    EXTRAVERSION (y in 2.6.x.y) is never automatically incremented but must be
    specified fully.

    patch-kernel does not normally support reverse patching, but does so when
    applying EXTRAVERSION (x.y) patches, so that moving from 2.6.11.y to
    2.6.11.z is easy and handled by the script (reverse 2.6.11.y and apply
    2.6.11.z).

    Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>

Daniel Ritz <daniel.ritz@gmx.ch>:
    [PATCH] 3c59x: only put the device into D3 when we're actually using WOL

    During a warm boot the device is in D3 and has troubles coming out of it.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nick Piggin <nickpiggin@yahoo.com.au>:
    [PATCH] __block_write_full_page race fix

    When running
    	fsstress -v -d $DIR/tmp -n 1000 -p 1000 -l 2
    on an ext2 filesystem with 1024 byte block size, on SMP i386 with 4096
byte
    page size over loopback to an image file on a tmpfs filesystem, I would
    very quickly hit
    	BUG_ON(!buffer_async_write(bh));
    in fs/buffer.c:end_buffer_async_write

    It seems that more than one request would be submitted for a given bh
    at a time.

    What would happen is the following:
    2 threads doing __mpage_writepages on the same page.
    Thread 1 - lock the page first, and enter __block_write_full_page.
    Thread 1 - (eg.) mark_buffer_async_write on the first 2 buffers.
    Thread 1 - set page writeback, unlock page.

Nick Piggin <nickpiggin@yahoo.com.au>:
    [PATCH] fix race in __block_prepare_write

    Fix a race where __block_prepare_write can leak out an in-flight read
    against a bh if get_block returns an error.  This can lead to the page
    becoming unlocked while the buffer is locked and the read still in flight.
    __mpage_writepage BUGs on this condition.

    BUG sighted on a 2-way Itanium2 system with 16K PAGE_SIZE running

    	fsstress -v -d $DIR/tmp -n 1000 -p 1000 -l 2

    where $DIR is a new ext2 filesystem with 4K blocks that is quite
    small (causing get_block to fail often with -ENOSPC).

    Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Andrew Morton <akpm@osdl.org>:
    [PATCH] __block_write_full_page speedup

    Remove all those get_bh()'s and put_bh()'s by extending lock_page() to
cover
    the troublesome regions.

    (get_bh() and put_bh() happen every time whereas contention on a page's
lock
    in there happens basically never).

    Cc: Nick Piggin <nickpiggin@yahoo.com.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] drivers/ide/pci/sis5513.c: section fixes

    These three functions are referenced from the __devinitdata
    sis5513_chipset.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paulo Marques <pmarques@grupopie.com>:
    [PATCH] setitimer timer expires too early

    It seems that the code responsible for this is in kernel/itimer.c:126:

    	p->signal->real_timer.expires = jiffies + interval;
    	add_timer(&p->signal->real_timer);

    If you request an interval of, lets say 900 usecs, the interval given by
    timeval_to_jiffies will be 1.

    If you request this when we are half-way between two timer ticks, the
    interval will only give 400 usecs.

    If we want to guarantee that we never ever give intervals less than
    requested, the simple solution would be to change that to:

    	p->signal->real_timer.expires = jiffies + interval + 1;

    This however will produce pathological cases, like having a idle system

Andrew Morton <akpm@osdl.org>:
    [PATCH] __block_write_full_page() simplification

    The `last_bh' logic probably isn't worth much.  In those situations where
only
    the front part of the page is being written out we will save some looping
but
    in the vastly more common case of an all-page writeout if just adds more
code.

    Nick Piggin <nickpiggin@yahoo.com.au>

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Frederic CAND <frederic.cand@anevia.com>:
    [PATCH] saa6752hs: resolutions handling

    This patch handles the VIDIOC_S_FMT and VIDIOC_G_FMT ioctls for the
    saa6752hs.

    As only 4 preset video formats are supported (SIF, 1/2D1, 2/3D1, D1), we
    compute to which the asked resolution is the nearest and apply it.

    Signed-off-by: Frederic Cand <frederic.cand@anevia.com>
    Acked-by: Gerd Knorr <kraxel@bytesex.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Matt Porter <mporter@kernel.crashing.org>:
    [PATCH] Update dontdiff

    Additions to the dontdiff list.

    Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Andrew Morton <akpm@osdl.org>:
    [PATCH] uninline tty_paranoia_check()

    Has lots of callsites.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] remove BK documentation

    There's no longer a reason to document the obsolete BK usage.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Christoph Hellwig <hch@lst.de>:
    [PATCH] DAC960: add support for Mylex AcceleRAID 4/5/600

    This patch adds support for a new class of DAC960 controllers.  It's based
    on the GPLed idac320 driver from IBM for Linux 2.4.18.  That driver is a
    fork of the 2.4.18 version of DAC960 that adds support for this new type
of
    controllers (internally called "GEM Series"), that differ from other
DAC960
    V2 firmware controllers only in the register offsets and removes support
    for all others.

    This patch instead integrates support for these controllers into the
DAC960
    driver.

    Thanks to Anders Norrbring for pointing me to the idac320 driver and
    testing this patch.

    No Signed-Off: line because all code is either copy & pasted from IBM's

Christoph Hellwig <hch@lst.de>:
    [PATCH] remove outdated comments from filemap.c

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Dominik Brodowski <linux@dominikbrodowski.net>:
    [PATCH] pcmcia: enable 32-bit memory windows on pd6729

    Enable 32-bit memory windows on pd6729 PCI-PCMCIA bridges.

    Signed-off-by: Jarkko Raja <jar@pcuf.fi>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Daniel Ritz <daniel.ritz@gmx.ch>:
    [PATCH] pcmcia: yenta TI: align irq of func1 to func0 if INTRTIE is set

    Make sure that if the INTRTIE bit is set both functions of the cardbus
    bridge use the same IRQ before doing any probing...

    [ yes i hate the TI bridges for the fact that they are very flexible
      so that so many BIOS vendors get it wrong. ]

    Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Christoph Hellwig <hch@lst.de>:
    [PATCH] remove do_sync parameter from __invalidate_device

    The only caller that ever sets it can call fsync_bdev itself easily.  Also
    update some comments.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Cc: <viro@parcelfarce.linux.theplanet.co.uk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Andrew Morton <akpm@osdl.org>:
    [PATCH] revert ext3-writepages-support-for-writeback-mode

    This had a fatal lock ranking bug: we do journal_start outside
    mpage_writepages()'s lock_page().

    Revert the whole thing, think again.

    Credit-to: Jan Kara <jack@suse.cz>

    For identifying the bug.

    Cc: Badari Pulavarty <pbadari@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Pavel Roskin <proski@gnu.org>:
    [PATCH] orinoco MAINTAINERS update

    Add mailing list addresses for Orinoco and update its homepage.

    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Cc: David Gibson <hermes@gibson.dropbear.id.au>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Manu Abraham <manu@kromtek.com>:
    [PATCH] bttv: fix dst i2c read/write timeout failure.

    Attached is a patch to bttv which fixes the following problems.

    Affected cards and problems:
    ~~~~~~~~~~~~~~~~~~~~~~~~
    o VP-1020 (200103A) Tuning problems, device detection.
    o VP-1020 (DST-MOT) Errors during tuning, device detection fails in a
while.
    o VP-1030 (DST-CI) Tuning sometimes fails after CI commands.
    o VP-2031 (DCT-CI) Tuning problems

    The timeout happens before the actual timeout occured in the MCU
    on the board, and hence the problems.

    Changes: (bttv-i2c.diff)
    ~~~~~~~~~~~~~~~~~~~~~~~~
    o Changed the custom wait queue to wait_event_interruptible_timeout()
          - Suggestion by Johannes Stezenbach.

    o Fixed the wait queue timeout problem

Alasdair G Kergon <agk@redhat.com>:
    [PATCH] device-mapper: handle __lock_fs error

    Handle error from __lock_fs()

    Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
    From: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alasdair G Kergon <agk@redhat.com>:
    [PATCH] device-mapper: __unlock_fs void

    Make __unlock_fs() void.

    From: Christoph Hellwig <hch@lst.de>

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alasdair G Kergon <agk@redhat.com>:
    [PATCH] device-mapper: store bdev while frozen

    Store the struct block_device while device is frozen, saving us one call
to
    bdget_disk().

    Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
    From: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alasdair G Kergon <agk@redhat.com>:
    [PATCH] device-mapper: let freeze_bdev return error

    Allow freeze_bdev() to return an error.

    Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
    From: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alasdair G Kergon <agk@redhat.com>:
    [PATCH] device-mapper: Some missing statics

    This patch makes some needlessly global code static.

    Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alasdair G Kergon <agk@redhat.com>:
    [PATCH] device-mapper: tidy dm_suspend

    Tidy dm_suspend.

    Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
    From: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alasdair G Kergon <agk@redhat.com>:
    [PATCH] device-mapper multipath: Use private workqueue

    dm-mpath.c needs to use a private workqueue (like other dm targets already
do)
    to avoid interfering with users of the default workqueue.

    Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
    Acked-by: Jens Axboe <axboe@suse.de>
    Signed-off-by: Lars Marowsky-Bree <lmb@suse.de>
    Signed-off-by: <mikenc@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alasdair G Kergon <agk@redhat.com>:
    [PATCH] device-mapper dm-emc: Fix a memset

    The dm emc hardware handler code memset the hardware handler structure to
zero
    AFTER it had initialized the structure's spinlock field.

    Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
    From: Dave Olien <dmo@osdl.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] make some things static

    This patch makes some needlessly global identifiers static.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Acked-by: Arjan van de Ven <arjanv@infradead.org>
    Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

maximilian attems <janitor@sternwelten.at>:
    [PATCH] cyrix: eliminate bad section references

    Fix cyrix section references:
     convert __initdata to __devinitdata.

    Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 00000379
    R_386_32          .init.data
    Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 00000399
    R_386_32          .init.data
    Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 000003b3
    R_386_32          .init.data
    Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 000003b9
    R_386_32          .init.data
    Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 000003bf
    R_386_32          .init.data

    Signed-of-by: maximilian attems <janitor@sternwelten.at>

    Signed-off-by: Andrew Morton <akpm@osdl.org>

Randy.Dunlap <rddunlap@osdl.org>:
    [PATCH] reiserfs: use NULL instead of 0

    Use NULL instead of 0 for pointer (sparse warning):
    fs/reiserfs/namei.c:611:50: warning: Using plain integer as NULL pointer

    Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>:
    [PATCH] comments on locking of task->comm

    Add some comments about task->comm, to explain what it is near its
definition
    and provide some important pointers to its uses.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jesper Juhl <juhl-lkml@dif.dk>:
    [PATCH] fix up a comment still refering to verify_area

    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Domen Puncer <domen@coderock.org>:
    [PATCH] ixj* - compile warning cleanup

    compile warning cleanup - suggested by Adrian Bunk; remove unmaintained
rcs
    char strings from source and handle the occurrences of their use, make
sure
    kernel-userspace issues taken care of; break out into separate patch

    Signed-off-by: Stephen Biggs <yrgrknmxpzlk@gawab.com>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jesper Juhl <juhl-lkml@dif.dk>:
    [PATCH] update Ross Biro bouncing email address

    Ross moved.  Remove the bad email address so people will find the correct
    one in ./CREDITS.

    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Domen Puncer <domen@coderock.org>:
    [PATCH] CodingStyle: trivial whitespace fixups

    When I do a "diff -Nur arch/i386 arch/x86_64" to see what is different between these
two
    architectures, I see some differences due to whitespace issues only. The attached patch
removes
    some of the noise by fixing up the following files:
    - arch/i386/boot/bootsect.S
    - arch/i386/boot/video.S
    - arch/x86_64/boot/bootsect.S

    Signed-off-by: Daniel Dickman <didickman@yahoo.com>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Kianusch Sayah Karadji <kianusch@sk-tech.net>:
    [PATCH] x86: geode support fixes

    - Changed Name/defines from "Geode GX" to "Geode GX1" for clarification

    - Dropped "-march=i586" in favor of "-march=i486"

    - Dopped X86_OOSTORE support for Geode GX1

    Signed-off-by: Kianusch Sayah Karadji <kianusch@sk-tech.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Domen Puncer <domen@coderock.org>:
    [PATCH] Spelling cleanups in shrinker code

    Just a few small cleanups to make this coherent english.

    Signed-Off-By:  Martin Hicks <mort@wildopensource.com>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

walter harms <wharms@bfs.de>:
    [PATCH] documentation for strncpy()

    this clarifies the documentation on the behavier of strncpy().

    Signed-off-by: Domen Puncer <domen@coderock.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] fix NCR53C9x.c compile warning

    drivers/scsi/NCR53C9x.c: In function `esp_do_data':
    drivers/scsi/NCR53C9x.c:1838: warning: unused variable `flags'

    Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Domen Puncer <domen@coderock.org>:
    [PATCH] fix lib/sort regression test

    The regression test in lib/sort.c is currently worthless because the array
    that is generated for sorting will be all zeros.  This patch fixes things
    so that the array that is generated will contain unsorted integers (that
    are not all identical) as was probably intended.

    Signed-off-by Daniel Dickman <didickman@yahoo.com>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Domen Puncer <domen@coderock.org>:
    [PATCH] correctly name the Shell sort

    As per http://www.nist.gov/dads/HTML/shellsort.html, this should be
    referred to as a Shell sort.  Shell-Metzner is a misnomer.

    Signed-off-by: Daniel Dickman <didickman@yahoo.com>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] drivers/scsi/sym53c416.c: fix a wrong check

    The Coverity checker found that this for loop was wrong.

    This patch changes it to what seems to be intended.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Cc: James Bottomley <James.Bottomley@steeleye.com>
    Cc: Matthew Wilcox <willy@debian.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] fs/udf/udftime.c: fix off by one error

    This patch fixes an off by one error found by the Coverity checker.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Tobias Klauser <tklauser@nuerscht.ch>:
    [PATCH] arch/ppc64: Replace custom MIN macro

    Replace a custom MIN() macro with the min() macro from kernel.h
    This patch removes 4 lines of redundant code.

    Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: remove explicit contig_page_data reference

    Trivial patch to remove our last direct reference to contig_page_data.
    This will make it just that much less hard to seperate NUMA and
    DISCONTIG.  Please forward on.  Against 2.6.12-rc1

    Signed-off-by: Joel Schopp <jschopp@austin.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: fix prom.c compile warning

    The code in unflatten_device_tree knows that get_property is written to
    only return with lenp equal to 1 when also returning a valid pointer.
    The gcc 3.3.3 compiler is not able to prove this to itself, so it warns
    about a possible uninitialized pointer dereference:

     .../arch/ppc64/kernel/prom.c: In function `unflatten_device_tree':
     .../arch/ppc64/kernel/prom.c:828:
     warning: `p' might be used uninitialized in this function

    Unless it is desired to rework the interaction between the two
    functions, this will keep the existing behavior but quiet the compiler.

    Signed-off-by: Amos Waterland <apw@us.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: fix reloc_offset comment

    The code in reloc_offset is actually subtracting the address in the link
    register from the address calculated by the linker.  Perhaps the
    extended mnemonic `sub' replaced an original `subf' and the comment just
    did not get updated.

            bl      1f
    1:      mflr    r3
            LOADADDR(r4,1b)
            sub     r3,r4,r3

    Signed-off-by: Amos Waterland <apw@us.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: remove unused arch/ppc64/boot/start.c

    start.c is not referenced in the arch/ppc64/boot/Makefile

    compile tested with the defconfig.

    Signed-off-by: Olaf Hering <olh@suse.de>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: remove asm/bootinfo.h include

    The defines in bootinfo.h are not used, so the include can be removed.
    According to Ben, birecs are not used on ppc64:

      on ppc64, we made the decision of enforcing the presence of an
      OF device-tree and either an OF-like client interface or a kexec
      like flattened tree.
      so if your bootloader want to say things to the kernel,
      it can do so by adding properties to the device-tree

    compile-tested with defconfig

    Signed-off-by: Olaf Hering <olh@suse.de>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Russell King <rmk@dyn-67.arm.linux.org.uk>:
    [PATCH] 8250_pci.c: add comment about enum sorting order

    Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: global interrupt queue cleanup

    Move the code to set global interrupt queue membership to xics.c,
    and remove no longer needed extern declarations.  Also call it on
    all cpus (even the boot cpu) to prepare for kexec.

    Signed-off-by: Milton Miller <miltonm@bga.com>
    Signed-off-by: R Sharada <sharada@in.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jens Axboe <axboe@suse.de>:
    [PATCH] fix alsa via82xx resume

    Trying software suspend on my workstation makes it crash on resume.  The
    problem is that via82xx marks the chip_init function as _devinit, but
calls
    it on resume as well.

    Cc: <tiwai@suse.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Jens Axboe <axboe@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

James Bottomley <James.Bottomley@steeleye.com>:
    [SCSI] correct the sym2 period setting routines

    There's a slight bug in the routines in that if the period requires dt,
    then the routine will unconditionally set it.  DT may only be set if
    Wide is also set, so this turns back on the wide bit.

    For domain validation to work correctly, we need to observe the wide bit
    absolutely.

    Acked by: Matthew Wilcox <willy@debian.org>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Linus Torvalds <torvalds@ppc970.osdl.org>:
    Fix acpi_find_rsdp() - acpi_scan_rsdp takes length, not end

    Noticed by Jakub Jermar <jermar@itbs.cz>

Adrian Bunk <bunk@stusta.de>:
    [PATCH] drivers/block/rd.c: rd_size shouldn't be static

    I somehow missed that there is external usage of rd_size on some
    architectures.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Andrew Morton <akpm@osdl.org>:
    [PATCH] revert msdos partitioning fix

    This change from March 3rd causes the partition parsing code to ignore
    partitions which have a signature byte of zero.  Turns out that more
people
    have such partitions than we expected, and their device numbering is coming
up
    wrong in post-2.6.11 kernels.

    So revert the change while we think about the problem a bit more.

    Cc: Andries Brouwer <Andries.Brouwer@cwi.nl>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Mackerras <paulus@samba.org>:
    [PATCH] ppc64: enable CONFIG_RTAS_PROC by default

    This patch enables CONFIG_RTAS_PROC by default on pSeries.  This will
    preserve /proc/ppc64/rtas/rmo_buffer, which is needed by librtas.

    Signed-off-by: John Rose <johnrose@austin.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: Remove include/asm-um/elf.h

    I accidentally included include/asm-um/elf.h as a real file in a previous
    patch.  This patch eliminates it.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Kumar Gala <galak@freescale.com>:
    [PATCH] ppc32: Fix POWER3/POWER4 compiler error

    In separating out support for hardware floating point we missed the fact
    that both POWER3 and POWER4 have HW FP.  Enable CONFIG_PPC_FPU for POWER3
    and POWER4 fixes the issue.

    Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
    Acked-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jiri Benc <jbenc@suse.cz>:
    [PATCH] video/tuner: add VIDEO_G_FREQUENCY and freq range to
VIDIOC_G_TUNER

    This patch adds a VIDIOC_G_FREQUENCY command to tuner-core.c and sets
    lowest and highest tunable frequencies in v4l2_tuner structure returned by
    VIDIOC_G_TUNER command.

    Signed-off-by: Jiri Benc <jbenc@suse.cz>
    Cc: Gerd Knorr <kraxel@bytesex.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jiri Benc <jbenc@suse.cz>:
    [PATCH] video/tuner: fix tuner->freq updating

    In VIDIOC_S_FREQUENCY command in tuner-core.c, t->freq is set to a new
    value before calling set_freq().  This is not necessary, as set_freq()
sets
    t->freq itself.  Moreover, it causes problems with Philips tuners, as they
    need to take into consideration difference between previous and new
    frequency.

    Signed-off-by: Jiri Benc <jbenc@suse.cz>
    Cc: Gerd Knorr <kraxel@bytesex.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: __deprecated makes build unnecessarily noisy

    Remove the __deprecated from verify_area_skas and verify_area_tt.  Since
    verify_area is itself marked __deprecated, and it is the only caller of
    these, then they don't need to be marked.  Marking them only makes the
    build noisier.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: command line handling cleanup

    Command line handling cleanups - a couple of things made static and an
    unused declaration removed from header.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: S390 preparation, save an extra register

    s390 tt-mode needs to save not only syscall number, but an further
register
    also.

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch

    s390 needs to change some parts of arch/um/kernel/ptrace.c.  Thus, the
code
    regarding PEEKUSER and POKEUSER are shifted to
arch/um/sys-<subarch>/ptrace.c.

    Also s390 debug registers need to be updated, when singlestepping is
switched
    on / off.  Thus, setting/resetting of singlestepping is centralized in the
new
    function set_singlestep(), which also inserts the macro
    SUBARCH_SET_SINGLESTEP(mode), if defined.

    Finally, s390 has the "ieee_instruction_pointer" in its
    registers, which also is allowed to be read via

      ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);

    To implement this feature, sys_ptrace inserts the macro

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: Eliminate unusable function

    Eliminate the non-inline version of switch_mm, which can't be used,
    considering the inline version in asm/mmu_context.h

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: Fix process exit race

    tt-mode closes switch_pipes in exit_thread_tt and kills processes in
    switch_to_tt, if the exit_state is EXIT_DEAD or EXIT_ZOMBIE.

    In very rare cases the exiting process can be scheduled out after having
set
    exit_state and closed switch_pipes (from release_task it calls
proc_pid_flush,
    which might sleep).  If this process is to be restarted, UML failes in
    switch_to_tt with:

       write of switch_pipe failed, err = 9

    We fix this by closing switch_pipes not in exit_thread_tt, but later in
    release_thread_tt.  Additionally, we set switch_pipe[0] = 0 after closing.
    switch_to_tt must not kill "from" process depending on its exit_state, but

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: Use CONFIG variable for address space size

    tt/mem.c still uses hardcoded TOP for i386 instead of CONFIG_TOP_ADDR
provided
    by subarch's Kconfig_XXXX, which would be right.

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: Makefile cleanup

    This eliminates some stuff from arch/um/kernel/Makefile which refers to a
    file which has long since been deleted.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: Turn literal numbers into symbolic constants

    So, there I was, looking at my own code, wondering what the magic setjmp
    return values did.  This patch turns the constants that are used to make
    requests of the initial thread into meaningful symbols.

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Bodo Stroesser <bstroesser@fujitsu-siemens.com>:
    [PATCH] uml: S390 preparation, arch_align_stack

    Only x86 and x86_64 use arch_align_stack(), all other subarches have:

     #define arch_align_stack(x) (x)

    So, if this definition is found, UML's own arch_align_stack() should be
    skipped.

    Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jeff Dike <jdike@addtoit.com>:
    [PATCH] uml: x86_64 fixes

    This fixes some x86_64 bugs -

    - maybe_map returns -1 on error instead of 0, which is interpreted as
      physical address 0

    - removed an include of ipc.h, which isn't needed

    - fixed the calculation of signal frame location

    - the signal delivery code is now immune to the stack expansion check

    - added a missing include

    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Linus Torvalds <torvalds@ppc970.osdl.org>:
    Linux v2.6.12-rc4



to post comments


Copyright © 2005, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds