commit c110a2bd82676a8f124cf4dfc39339fd366f0e59
Merge: 81b2dbc... 551f4cb...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 10:12:48 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: prevent userspace from accessing shut down devices
      ieee1394: sbp2: use correct size of command descriptor block

commit 81b2dbcad86732ffc02bad87aa25c4651199fc77
Author: Arjan van de Ven <arjan@linux.intel.com>
Date:   Tue May 20 09:53:52 2008 -0700

    Fix a deadlock in the bttv driver
    
    vidiocgmbuf() does this:
            mutex_lock(&fh->cap.vb_lock);
            retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
                                         V4L2_MEMORY_MMAP);
    
    and videobuf_mmap_setup() then just does
            mutex_lock(&q->vb_lock);
            ret = __videobuf_mmap_setup(q, bcount, bsize, memory);
            mutex_unlock(&q->vb_lock);
    
    which is an obvious double-take deadlock.
    
    This patch fixes this by having vidiocgmbuf() just call the
    __videobuf_mmap_setup function instead.
    
    Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Reported-by: Koos Vriezen <koos.vriezen@gmail.com>
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 551f4cb9de716ffcdaf968c99a450c22ff12e8c3
Author: Jay Fenlason <fenlason@redhat.com>
Date:   Fri May 16 11:15:23 2008 -0400

    firewire: prevent userspace from accessing shut down devices
    
    If userspace ignores the POLLERR bit from poll(), and only attempts to
    read() the device when POLLIN is set, it can still make ioctl() calls on
    a device that has been removed from the system.  The node_id and
    generation returned by GET_INFO will be outdated, but INITIATE_BUS_RESET
    would still cause a bus reset, and GET_CYCLE_TIMER will return data.
    And if you guess the correct generation to use, you can send requests to
    a different device on the bus, and get responses back.
    
    This patch prevents open, ioctl, compat_ioctl, and mmap against shutdown
    devices.
    
    Signed-off-by: Jay Fenlason <fenlason@redhat.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 93c596f7d611b379302bbdd26f31acdf72f4859a
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sun May 4 16:54:14 2008 +0200

    ieee1394: sbp2: use correct size of command descriptor block
    
    Boaz Harrosh wrote:
    > cmd->cmd_len is now guarantied to be set properly at all cases.
    > And some commands you want to support will not be set correctly
    > by COMMAND_SIZE().
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit babd90b274e6b43a7dc7bb08562bf566cbabdbf8
Merge: 424de91... 186c311...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 08:49:08 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      [ALSA] hda - Fix ASUS P5GD1 model
      [ALSA] hda - Fix ALC262 fujitsu model
      snd-pcsp: use HRTIMER_CB_SOFTIRQ

commit 424de91dd6163808729d7082de55c319e1096bee
Merge: bca39da... f8dea7a...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 08:16:25 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: remove CVS keywords
      HID: Add iMON LCDs to blacklist
      HID: add Microchip PICKit 1 and PICkit 2 to blacklist
      HID: split Numlock emulation quirk from HID_QUIRK_APPLE_HAS_FN.

commit bca39da5645c72048e8854340575c338b8100bca
Merge: 551395a... 09c2012...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 08:15:34 2008 -0700

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] Update defconfigs for desktop/server systems
      [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec
      [POWERPC] Update arch/powerpc/boot/.gitignore
      [POWERPC] Remove generated files on make clean
      [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword
      [POWERPC] Update Cell MAINTAINERS entry, add spufs entry
      lmb: Fix compile warning

commit 551395ae667d699189014f762355e9131fc03e79
Merge: a8375bd... 00377d8...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 08:15:18 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      [GFS2] Prefer strlcpy() over snprintf()
      [GFS2] Fix cast from unsigned int to s64
      [GFS2] filesystem consistency error from do_strip

commit a8375bd81cf99cb81be37127eaf08316ecb87619
Author: Hugh Dickins <hugh@veritas.com>
Date:   Tue May 20 13:59:47 2008 +0100

    x86: strengthen 64-bit p?d_bad()
    
    The x86_64 pgd_bad(), pud_bad(), pmd_bad() inlines have differed from
    their x86_32 counterparts in a couple of ways: they've been unnecessarily
    weak (e.g. letting 0 or 1 count as good), and were typed as unsigned long.
    Strengthen them and return int.
    
    The PAE pmd_bad was too weak before, allowing any junk in the upper half;
    but got strengthened by the patch correcting its ~PAGE_MASK to ~PTE_MASK.
    The PAE pud_bad already said ~PTE_MASK; and since it folds into pgd_bad,
    and we don't set the protection bits at that level, it'll do as is.
    
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cbb3077cbe718795d7ae5d78ed11659ca73c97b9
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:24 2008 +0100

    xen: use PTE_MASK in pte_mfn()
    
    Use PTE_MASK to extract mfn from pte.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ba23cef5c23cf1e9298032037d919157553d1211
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:23 2008 +0100

    x86: use PTE_MASK rather than ad-hoc mask
    
    Use ~PTE_MASK to extract the non-pfn parts of the pte (ie, the pte
    flags), rather than constructing an ad-hoc mask.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 86aaf4fd4ea25ddde05772d03b93dbce23c0ead1
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:22 2008 +0100

    x86: clarify use of _PAGE_CHG_MASK
    
    _PAGE_CHG_MASK is defined as the set of bits not updated by
    pte_modify(); specifically, the pfn itself, and the Accessed and Dirty
    bits (which are updated by hardware).
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7f84133af6aaa86e9ef0e9e1970655439a8cf3a1
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:21 2008 +0100

    x86: use PTE_MASK in pgtable_32.h
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a4d6886270a5c892d71cd6e09186196a150a50dc
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:20 2008 +0100

    x86: use PTE_MASK in 32-bit PAE
    
    Use PTE_MASK in 3-level pagetables (ie, 32-bit PAE).
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c57c05d0032cd5a500c5eba18ede4867a6d2cd5f
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:19 2008 +0100

    x86: rearrange __(VIRTUAL|PHYSICAL)_MASK
    
    Put the definitions of __(VIRTUAL|PHYSICAL)_MASK before their uses.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 1bb271db63c356212564aad050b2cf026f800858
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:18 2008 +0100

    x86: fix warning on 32-bit non-PAE
    
    Fix the warning:
    
    include2/asm/pgtable.h: In function `pte_modify':
    include2/asm/pgtable.h:290: warning: left shift count >= width of type
    
    On 32-bit PAE the virtual and physical addresses are both 32-bits,
    so it ends up evaluating 1<<32.  Do the shift as a 64-bit shift then
    cast to the appropriate size.  This should all be done at compile time,
    and so have no effect on generated code.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2bd3a99c9d1851182f73d0a024dc5bdb0a470e8c
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:17 2008 +0100

    x86: define PTE_MASK in a universally useful way
    
    Define PTE_MASK so that it contains a meaningful value for all x86
    pagetable configurations.  Previously it was defined as a "long" which
    means that it was too short to cover a 32-bit PAE pte entry.
    
    It is now defined as a pteval_t, which is an integer type long enough
    to contain a full pte (or pmd, pud, pgd).
    
    This fixes an Xorg crash on 32-bit x86 with PAE due to corruption of the
    NX bit in mprotect due to the incorrect type/value of PTE_MASK reported
    by Hugh Dickins:
    
      "Yes, thanks Jeremy: I've checked that each stage builds and runs X on
       my boxes here, x86_32 and x86_32+PAE and x86_64.  (So even 1/8 is
       enough to fix the PAT pte_modify issue, though 2/8 then fixes
       compiler warnings.)"
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f8dea7a3d47ee7c857965b22e33229e7de410a88
Author: Adrian Bunk <bunk@kernel.org>
Date:   Tue May 20 01:31:25 2008 +0200

    HID: remove CVS keywords
    
    This patch removes CVS keywords that weren't updated for a long time
    from comments.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 0952c9e8eda6dea621176b2263323e74d05f50c1
Author: Dylan R Semler <dylan.semler@gmail.com>
Date:   Wed May 14 11:38:14 2008 +0200

    HID: Add iMON LCDs to blacklist
    
    The new iMON LCDs from SoundGraph need to be blacklisted from HID in order to
    be used by lirc.
    
    Signed-off-by: Dylan R Semler <dylan.semler@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit f4971031f4acd98423a2903c6517fb3ef1aea8dc
Author: Xiaofan Chen <xiaofanc@gmail.com>
Date:   Tue May 13 17:11:59 2008 +0200

    HID: add Microchip PICKit 1 and PICkit 2 to blacklist
    
    Microchip PICkit 1 and PICKit 2 USB Programmers are USB HID class of device but
    they are not real HID device. They are now supported by libusb based programs
    like the following programs.
    
    pk2 and pk2cmd Linux port:
    	http://home.pacbell.net/theposts/picmicro/
    usb_pickit:
    	http://tfc.duke.free.fr/pickit.html
    usb_pickit original version:
    	http://charm.cs.uiuc.edu/users/olawlor/projects/2003/microchip/
    
    Therefore it ispreferred to blacklist them.
    
    Signed-off-by: Xiaofan Chen <xiaofanc@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 6e7045990f35ef9250804b3fd85e855b8c2aaeb6
Author: Diego 'Flameeyes' Petteno <flameeyes@gmail.com>
Date:   Mon May 5 16:20:50 2008 +0200

    HID: split Numlock emulation quirk from HID_QUIRK_APPLE_HAS_FN.
    
    Since 2.6.25 the HID_QUIRK_APPLE_HAS_FN quirk is enabled even for
    non-laptop Apple keyboards of the Aluminium series. The USB version of
    these don't need Numlock emulation, like the laptop (and Aluminium
    Wireless) do, as they have a proper keypad.
    
    This patch splits the Numlock emulation for Apple keyboards in a
    different quirk flag, so that it can be enabled for all the keyboards
    but the Aluminium USB ones.
    
    If the Numlock emulation is enabled for Aluminium USB keyboards, the
    JKL and UIO keys become the numeric pad, and the rest of the keyboard
    is disabled, included the key used to disable Numlock.
    
    Additionally, these keyboard should not have a Numlock at all, as the
    Numlock key is instead replaced by the 'Clear' key as usual for Apple
    USB keyboards.
    
    Signed-off-by: Diego 'Flameeyes' Petteno <flameeyes@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 09c201219b000c5d79a7a7ebeb2f9768e97224fc
Author: Paul Mackerras <paulus@samba.org>
Date:   Tue May 20 20:04:12 2008 +1000

    [POWERPC] Update defconfigs for desktop/server systems
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 186c3117f8aac0b2ac5290aaed254fcfdcc937de
Author: Travis Place <wishie@wishie.net>
Date:   Tue May 20 11:54:41 2008 +0200

    [ALSA] hda - Fix ASUS P5GD1 model
    
    Corrected the model assignment for the ASUS P5GD1 w/SPDIF after reports of
    surround sound not being possible.
    
    Signed-off-by: Travis Place <wishie@wishie.net>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit ebc7a406633acefc6d12c1ccc9441bfef69e0f33
Author: Takashi Iwai <tiwai@suse.de>
Date:   Tue May 20 09:23:05 2008 +0200

    [ALSA] hda - Fix ALC262 fujitsu model
    
    Fixed the speaker auto-mute with two laptop and docking headphones.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Acked-by: Tony Vroon <tony@linx.net>

commit 4b7afb0d0d23b298a7e6d30eaba0679449542d2e
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Tue May 20 11:47:29 2008 +0200

    snd-pcsp: use HRTIMER_CB_SOFTIRQ
    
    Change HRTIMER_CB_IRQSAFE to HRTIMER_CB_SOFTIRQ,
    as suggested by Thomas Gleixner.
    That solves the lock dependancy reported in
    Bug #10701.
    That also allows to call hrtimer_start()
    directly, tasklet "stupid hack" removed.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 927c258ac6c68868c6d36ce6cc17cda831ab8738
Merge: d3d3d3c... 8939700...
Author: Paul Mackerras <paulus@samba.org>
Date:   Tue May 20 19:46:37 2008 +1000

    Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

commit 8939700edcd2bdb7a1af0defceb2532ee2565bc3
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sun May 18 13:30:03 2008 -0500

    [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 4978757987e5535614a1307bf8ccc938e28765a9
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sun May 18 13:25:28 2008 -0500

    [POWERPC] Update arch/powerpc/boot/.gitignore
    
    * Add dtbImage.*
    * Added zImage.holly
    * Folded zImage.coff.lds into zImage.*lds
    * Removed some unused zImage.<foo> ignores
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit b58a45752886bdd282b1e707e01d41454ab7e271
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sun May 18 13:23:03 2008 -0500

    [POWERPC] Remove generated files on make clean
    
    dtbImage.* and several zImage. targets get created but never cleaned up.
    
    Also, moved zImage to the clean-files line associated with all other image
    results (was previously duplicated).
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 8033c6e9736c29cce5f0d0abbca9a44dffb20c39
Merge: 2d3cf58... e5c0ef9...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:40:30 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
      at91_mci: minor cleanup
      mmc: mmc host test driver
      mmc: Fix omap compile by replacing dev_name with dma_dev_name

commit 2d3cf588e9bf6df0a22581baece7edeacfbbc9f5
Author: Brice Goglin <brice@myri.com>
Date:   Sat May 17 12:45:36 2008 +0200

    Add maintainers for myri10ge driver
    
    Add a MAINTAINERS entry for the myri10ge driver.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 16ae527bfa03c6c82328098eafae972807ed32d4
Merge: e23a5f6... 6793a05...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:38:10 2008 -0700

    Merge branch 'audit.b51' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
    
    * 'audit.b51' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
      [PATCH] list_for_each_rcu must die: audit
      [patch 1/1] audit_send_reply(): fix error-path memory leak
      [PATCH] open sessionid permissions

commit e23a5f66877d32f21a2ac15a200ad4a2b4c8b0ee
Merge: c9091f9... e9baf6e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:37:45 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      [PATCH] return to old errno choice in mkdir() et.al.
      [Patch] fs/binfmt_elf.c: fix wrong return values
      [PATCH] get rid of leak in compat_execve()
      [Patch] fs/binfmt_elf.c: fix a wrong free
      [PATCH] avoid multiplication overflows and signedness issues for max_fds
      [PATCH] dup_fd() part 4 - race fix
      [PATCH] dup_fd() - part 3
      [PATCH] dup_fd() part 2
      [PATCH] dup_fd() fixes, part 1
      [PATCH] take init_files to fs/file.c

commit c9091f9e571386992c8c5badcec84d49753b9df1
Merge: cc2020e... 13c501e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:36:28 2008 -0700

    Merge branch 'for-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
    
    * 'for-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx:
      [POWERPC] 4xx: Workaround for CHIP_11 Errata

commit cc2020e62dd607ef907bb44325ac95cbb5b76eb2
Author: Alan Cox <alan@redhat.com>
Date:   Mon May 19 14:21:51 2008 +0100

    MAINTAINERS needs further order fixing
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d3d3d3cdb12dcc72e7bbff3d01073b7600349d3c
Author: Adrian Bunk <bunk@kernel.org>
Date:   Tue May 20 01:07:25 2008 +0300

    [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword
    
    This removes a CVS keyword that wasn't updated for a long time from a
    comment.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 754cdd4aba225b74dcc35cc384aeb0c42b505e8b
Merge: db07b02... 460ed2e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:33:29 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
      Blackfin SPORTS UART Driver: converting BFIN->BLACKFIN
      Blackfin serial driver: add extra IRQ flag for 8250 serial driver
      8250 Serial Driver: Added support for 8250-class UARTs in HV Sistemas H8606 board
      Blackfin arch: Fix bug - USB fails to build for BF524/BF526
      Blackfin arch: update boards defconfig files
      Blackfin arch: IO Port functions to read/write unalligned memory
      Blackfin arch: enable a choice to provide 4M DMA memory
      Blackfin arch: cleanup the icplb/dcplb multiple hit checks
      Blackfin arch: Add workaround to read edge triggered GPIOs
      Blackfin arch: Sync channel defines with struct dma_register dma_io_base_addr.
      Blackfin arch: Check for Anomaly 05000182
      [Blackfin] arch: rename bf5xx-flash to bfin-async-flash
      [Blackfin] arch: Blackfin checksum annotations

commit db07b02304d0d70bf8273abc93d94e4c8d2f9cec
Merge: 88e6c94... 336f1d3...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:33:08 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: Fix up restorer in debug_trap exception return path.
      sh: Make is_valid_bugaddr() more intelligent on nommu.
      sh: use the common ascii hex helpers
      sh: fix sh7785 master clock value
      sh: Fix up thread info pointer in syscall_badsys resume path.
      sh: Fix up optimized SH-4 memcpy on big endian.
      sh: disable initrd defaults in .empty_zero_page.
      sh: display boot params by default on entry.

commit 88e6c9499f959cdac9ef120a1a1e857da5944052
Merge: 8c4bab3... c85665f...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:29:29 2008 -0700

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (28 commits)
      drivers/ata: trim trailing whitespace
      Fixups to ATA ACPI hotplug
      libata: ignore SIMG4726 config pseudo device
      sata_sil24: don't use NCQ if marvell 4140 PMP is attached
      libata: don't schedule LPM action seperately during probing
      libata: make sure PMP notification is turned off during recovery
      libata: increase PMP register access timeout to 3s
      libata: ignore recovered PHY errors
      libata: kill hotplug related race condition
      libata: move reset freeze/thaw handling into ata_eh_reset()
      libata: reorganize ata_eh_reset() no reset method path
      libata: fix sata_link_hardreset() @online out parameter handling
      sata_promise: other cleanups
      sata_promise: mmio access cleanups
      sata_promise: fix irq clearing buglets
      ata: remove FIT() macro
      sata_mv: ensure empty request queue for FBS-NCQ EH
      sata_mv: cache main_irq_mask register in hpriv
      sata_mv: disregard masked irqs
      sata_mv: fix pmp drives not found
      ...

commit b815454221665b9253f68606bc27f8189ac9dce4
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Fri May 16 11:10:59 2008 +0200

    [POWERPC] Update Cell MAINTAINERS entry, add spufs entry
    
    The MAINTAINERS file entry for the cell platform is outdated,
    even the name of the platform changed since the early days
    when it was initially submitted.
    The SPU file system is now maintained by Jeremy Kerr.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit c85665ffa8e351a5b38f8e4ceaec527d8783c970
Author: Jeff Garzik <jeff@garzik.org>
Date:   Mon May 19 17:56:10 2008 -0400

    drivers/ata: trim trailing whitespace
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ae6c23c4e1ec9720b99e1e6850fe47c6c7fddbb3
Author: Matthew Garrett <mjg59@srcf.ucam.org>
Date:   Mon May 19 17:29:34 2008 +0100

    Fixups to ATA ACPI hotplug
    
    The libata-acpi.c code currently accepts hotplug messages from both the
    port and the device. This does not match the behaviour of the bay
    driver, and may result in confusion when two hotplug requests are
    received for the same device. This patch limits the hotplug notification
    to removable ACPI devices, which in turn allows it to use the _STA
    method to determine whether the device has been removed or inserted.
    On removal, devices are marked as detached. On insertion, a hotplug scan
    is started. This should avoid lockups caused by the ata layer attempting
    to scan devices which have been removed. The uevent sending is moved
    outside the spinlock in order to avoid a warning generated by it firing
    when interrupts are disabled.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 50af2fa1e18d0ab411d06bf727ecadb7e01721e9
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:14 2008 +0900

    libata: ignore SIMG4726 config pseudo device
    
    I was hoping ATA_HORKAGE_NODMA | ATA_HORKAGE_SKIP_PM could keep it
    happy but no even this doesn't work under certain configurations and
    it's not like we can do anything useful with the cofig device anyway.
    Replace ATA_HORKAGE_SKIP_PM with ATA_HORKAGE_DISABLE and use it for
    the config device.  This makes the device completely ignored by
    libata.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 906c1ff44a81aaad96a9feb40ea13d73bbf3662a
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:13 2008 +0900

    sata_sil24: don't use NCQ if marvell 4140 PMP is attached
    
    When 4140 PMP is attached to sil24, NCQ commands to fan out port 1 and
    2 (0 based) often stall if commands are in progress to other ports.
    I've tried a number of things but can't tell what's going on.  It
    never happens w/ ahci and reportedly sata_mv which can issue NCQ
    commands to multiple devices simultaneously like sil24 does.
    
    Disable NCQ for devices behind 4140 PMP for the time being.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Mark Lord <liml@rtr.ca>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 391191c116c088edc6794a6e5ace10a13928c2f6
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:12 2008 +0900

    libata: don't schedule LPM action seperately during probing
    
    There's no reason to schedule LPM action after probing is complete
    causing another EH iteration.  Just schedule it together with probing
    itself.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit f1bbfb90e81dd84d59de6370689ee6fe6a71fee0
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:11 2008 +0900

    libata: make sure PMP notification is turned off during recovery
    
    PMP notification during reset can make some controllers fail reset
    processing and needs to be turned off during resets.  PMP attach and
    full-revalidation path did this via sata_pmp_configure() but the quick
    revalidation wasn't.  Move the notification disable code right above
    fan-out port recovery so that it's always turned off.
    
    This fixes obscure reset failures.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit bf1bff6fa9fdd4e92e57d80a5434fd5201c051fc
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:10 2008 +0900

    libata: increase PMP register access timeout to 3s
    
    This timeout was set low because previously PMP register access was
    done via polling and register access timeouts could stack up.  This is
    no longer the case.  One timeout will make all following accesses fail
    immediately.
    
    In rare cases both marvell and SIMG PMPs need almost a second.  Bump
    it to 3s.
    
    While at it, rename it to SATA_PMP_RW_TIMEOUT.  It's not specific to
    SCR access.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e0614db2a398d4d0dc5fb47fe2c2783141262a3e
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:09 2008 +0900

    libata: ignore recovered PHY errors
    
    No reason to get overzealous about recovered comm and data errors.
    Some PHYs habitually sets them w/o no good reason and being draconian
    about these soft error conditions doesn't seem to help anybody.
    
    If need ever rises, we might need to add soft PHY error condition, say
    AC_ERR_MAYBE_ATA_BUS and use it only to determine whether speed down
    is necessary but I don't think that's very likely to happen.  It's far
    more likely we'll get timeouts or fatal transmission errors if
    recovered errors are so prominent that they hamper operation.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit f046519fc85a8fdf6a058b4ac9d897cdee6f3e52
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:08 2008 +0900

    libata: kill hotplug related race condition
    
    Originally, whole reset processing was done while the port is frozen
    and SError was cleared during @postreset().  This had two race
    conditions.  1: hotplug could occur after reset but before SError is
    cleared and libata won't know about it.  2: hotplug could occur after
    all the reset is complete but before the port is thawed.  As all
    events are cleared on thaw, the hotplug event would be lost.
    
    Commit ac371987a81c61c2efbd6931245cdcaf43baad89 kills the first race
    by clearing SError during link resume but before link onlineness test.
    However, this doesn't fix race #2 and in some cases clearing SError
    after SRST is a good idea.
    
    This patch solves this problem by cross checking link onlineness with
    classification result after SError is cleared and port is thawed.
    Reset is retried if link is online but all devices attached to the
    link are unknown.  As all devices will be revalidated, this one-way
    check is enough to ensure that all devices are detected and
    revalidated reliably.
    
    This, luckily, also fixes the cases where host controller returns
    bogus status while harddrive is spinning up after hotplug making
    classification run before the device sends the first FIS and thus
    causes misdetection.
    
    Low level drivers can bypass the logic by setting class explicitly to
    ATA_DEV_NONE if ever necessary (currently none requires this).
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit dc98c32cbe80750ae2d9d9fbdae305d38f005de7
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:07 2008 +0900

    libata: move reset freeze/thaw handling into ata_eh_reset()
    
    Previously reset freeze/thaw handling lived outside of ata_eh_reset()
    mainly because the original PMP reset code needed the port frozen
    while resetting all the fan-out ports, which is no longer the case.
    
    This patch moves freeze/thaw handling into ata_eh_reset().
    @prereset() and @postreset() are now called w/o freezing the port
    although @prereset() an be called frozen if the port is frozen prior
    to entering ata_eh_reset().
    
    This makes code simpler and will help removing hotplug event related
    races.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 932648b007de76badc61c1b13d7282288dbe887e
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:06 2008 +0900

    libata: reorganize ata_eh_reset() no reset method path
    
    Reorganize ata_eh_reset() such that @prereset() is called even when no
    reset method is available and if block is used instead of goto to skip
    actual reset.  This makes no reset case behave better (readiness wait)
    and future changes easier.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 0cbf0711a1ebcc4d3aea8e11def684afc2c07ef8
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:05 2008 +0900

    libata: fix sata_link_hardreset() @online out parameter handling
    
    The @online out parameter is supposed to set to true iff link is
    online and reset succeeded as advertised in the function description
    and callers are coded expecting that.  However, sata_link_reset()
    didn't behave this way on device readiness test failure.  Fix it.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 7715a6f9cdb9c1422d2b1f4fea21b1fe86b5b0fe
Author: Mikael Pettersson <mikpe@it.uu.se>
Date:   Sat May 17 18:49:09 2008 +0200

    sata_promise: other cleanups
    
    Minor coding-style fixes for sata_promise:
    - remove stray blank lines
    - fix checkpatch.pl errors; warnings about long lines
      remain, but I don't intend to address those at this time
    - remove two inline directives: neither is essential and
      both functions are trivially inlinable anyway by virtue
      of being static and having a single unique call site
    - fix comment in pdc_interrupt(): the bits in PDC_INT_SEQMASK
      denote SEQIDs not tags, the distinction becomes important
      when NCQ gets implemented
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 821d22cdcd3c2944b93ac5f217ec0b6593ae6f48
Author: Mikael Pettersson <mikpe@it.uu.se>
Date:   Sat May 17 18:48:15 2008 +0200

    sata_promise: mmio access cleanups
    
    This patch cleans up sata_promise's mmio accesses.
    
    In sata_promise there are three distinct mmio address spaces:
    1. global registers, offsets from host->iomap[PDC_MMIO_BAR]
    2. per-port ATA registers, offsets from ap->ioaddr.cmd_addr
    3. per-port SATA registers, offsets from ap->ioaddr.scr_addr
    
    The driver currently often fails to indicate which address space
    a given mmio base pointer refers to, which is a source of bugs
    and confusion (see recent pdc_thaw() irq clearing bug; it's also
    been an obstacle for the pending NCQ extensions).
    
    To reduce these problems, adopt a coding style where the name of
    a base pointer always indicates which address space it refers to:
    1. global registers: host_mmio
    2. per-port ATA registers: ata_mmio
    3. per-port SATA registers: sata_mmio
    
    Also rearrange register offset definitions to clearly indicate
    which address space they belong to, and add a symbolic definition
    for the previously hard-coded PHYMODE4 register.
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit a13db78e2209ebfe1898207f53c353ed836d4a53
Author: Mikael Pettersson <mikpe@it.uu.se>
Date:   Sat May 17 18:47:35 2008 +0200

    sata_promise: fix irq clearing buglets
    
    This patch fixes two bugs in sata_promise's irq status clearing paths:
    1. When clearing the irq status for a specific port, the driver
       read the global SEQMASK register. This is wrong because that
       clears the irq status for _all_ ports.
    2. pdc_thaw() incorrectly added the PDC_INT_SEQMASK host register
       offset to a per-port ata engine base address. This resulted in
       it reading the unrelated PDC_PKT_SUBMIT register, which did not
       have the desired irq status clearing effect.
    
    In both cases the fix is to read from the port's Command/Status
    register. This also matches what Promise's own driver does.
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 07633b5d0723ce2ec31262e1096dcf61311bf078
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed May 14 16:17:00 2008 -0700

    ata: remove FIT() macro
    
    Use the kernel-provided clamp_val() macro.
    
    FIT was always applied to a member of struct ata_timing (unsigned short)
    and two constants.  clamp_val will not cast to short anymore.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Cc: Jeff Garzik <jeff@garzik.org>
    Cc: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 06aaca3f6301d04463b1ee0eb75c0352147159f2
Author: Mark Lord <liml@rtr.ca>
Date:   Mon May 19 09:01:24 2008 -0400

    sata_mv: ensure empty request queue for FBS-NCQ EH
    
    Check for an empty request queue before stopping EDMA after a FBS-NCQ error,
    as per recommendation from the Marvell datasheet.
    
    This ensures that the EDMA won't suddenly become active again
    just after our subsequent check of the empty/idle bits.
    
    Also bump DRV_VERSION.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 96e2c487933e5f69e98fffdcae2c35c78a671c07
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:38:00 2008 -0400

    sata_mv: cache main_irq_mask register in hpriv
    
    Part five of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Keep a cached copy of the main_irq_mask so that we don't have
    to stall the CPU to read it on every pass through mv_interrupt.
    
    This significantly speeds up interrupt handling, both for sata_mv,
    and for any other driver/device sharing the same PCI IRQ line.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit a44253d24a97ec3efe601267274a5fb64d8696c1
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:37:07 2008 -0400

    sata_mv: disregard masked irqs
    
    Part four of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Ignore masked IRQs in mv_interrupt().
    This prevents "unexpected device interrupt while idle" messages.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 88e675e193159b9891c1c576de4348eaf490f5d0
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:36:30 2008 -0400

    sata_mv: fix pmp drives not found
    
    Part three of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Partially fix a reported bug whereby we sometimes miss seeing drives on
    a port-multiplier, as reported by Gwendal Grignou <gwendal@google.com>.
    
    The problem was that we were receiving unexpected interrupts
    during EH from POLLed commands while accessing port-multiplier registers.
    These unexpected interrupts can be prevented by masking the DONE_IRQ bit
    for the port whenever not operating in EDMA mode.
    
    Also fix port_stop() to mask all port interrupts.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit c4de573b14d78ac83861d81d12977457d1e9cb6d
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:35:21 2008 -0400

    sata_mv: consolidate main_irq_mask updates
    
    Part two of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Consolidate all updates of the host main_irq_mask register
    into a single function.  This simplifies maintenance,
    and also prepares the way for caching it (later).
    
    No functionality changes in this update.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 51de32d200b21333950abc52ea1e589bc4eecef7
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:34:42 2008 -0400

    sata_mv: don't blindly enable IRQs
    
    Part one of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Don't blindly enable port IRQs at host init time.
    Instead, enable only the bits that we want,
    which in this case is simply the PCI_ERR bit.
    
    The per-port bits can wait until the ports are reset/probed for devices.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit c443c5002b24ff5d2f4efcc25a861f0cb835130a
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 14 09:24:39 2008 -0400

    sata_mv: async notify for genIIe only
    
    Now that we handle the FIS_IRQ_CAUSE register correctly,
    we can also now handle SATA asynchronous notification events.
    
    So enable them, but only for the more modern GenIIe chips.
    (older chips have unaddressed errata issues related to this).
    
    This fixes hot plug/unplug for port-muliplier ports.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ad3aef51e17b9c6a90a9014805f1645e8e441c17
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 14 09:21:43 2008 -0400

    sata_mv: group genIIe flags
    
    Group all of the flags for GenIIe devices into a common definition,
    to ensure that any updates to them are shared by all GenIIe devices.
    
    This will help make future maintenance somewhat simpler.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e40060772d85f3534d3d517197696e24bb01f45b
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 14 09:19:30 2008 -0400

    sata_mv: fis irq register fixes
    
    Fix handling of the FIS_IRQ_CAUSE register in sata_mv.
    
    This register exists *only* on GenIIe devices, so don't bother
    writing to it on older chips.  Also, it has to be read/cleared
    in mv_err_intr() before clearing the main ERR_IRQ_CAUSE register.
    
    This keeps sata_mv from getting stuck forever on certain error types.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 9dcffd99d0b1c0c1b8b2c0f85d240e791eca1055
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 14 09:18:12 2008 -0400

    sata_mv: always do softreset
    
    Always request a softreset after hardreset succeeds.
    
    This fixes a regression reported by Martin Michlmayr <tbm@cyrius.com>.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 68b90ee7c8046864301823d8d4449eb1ce1d2f74
Author: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Date:   Tue May 13 21:17:30 2008 +0200

    avr32/pata: avoid unnecessary memset (updated after comments)
    
    Remove an explicit memset(.., 0, ...) to a variable allocated with
    kzalloc (i.e. 'info').
    
    Signed-off-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
    Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit b6e7b447975b0364c3430284c7b16e2e89ccf9e9
Author: Sonic Zhang <sonic.zhang@analog.com>
Date:   Mon May 12 12:12:16 2008 +0800

    pata-bf54x: Set ATAPI HSM to control IDE device terminate sequence.
    
    Set ATAPI host state machine to control IDE device terminate sequence.
    Some IDE harddisk may assert terminate sequence in the middle of a
    formal DMA transaction and resume later. Bit DETECT_TERM in ATAPI_CTRL
    register determines whether the ATAPI host state machine or the kernel
    driver should take care of this case.
    
    Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 8c4bab3a1aadaf4e38b2bfaf557eab74322a9fd4
Merge: 88d5376... c3cc3bd...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 14:04:47 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
      dlm: <linux/dlm_plock.h> should be "unifdef"ed.
      dlm: fix plock dev_write return value
      dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL
      dlm: section mismatch warning fix
      dlm: convert connections_lock in a mutex

commit 88d53766bd0f3bc6e46a0dff25be147a2b98c511
Merge: 860da5e... 54aaace...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 13:53:21 2008 -0700

    Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
    
    * 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
      KVM: LAPIC: ignore pending timers if LVTT is disabled
      KVM: Update MAINTAINERS for new mailing lists
      KVM: Fix kvm_vcpu_block() task state race
      KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48
      KVM: ia64: fix GVMM module including position-dependent objects
      KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg
      KVM: PIT: take inject_pending into account when emulating hlt
      s390: KVM guest: fix compile error
      KVM: x86 emulator: fix writes to registers with modrm encodings

commit c3cc3bd0d36d1b16d4cb17e8fc64fff613f0b902
Author: Robert P. J. Day <rpjday@crashcourse.ca>
Date:   Sat May 17 16:58:28 2008 -0400

    dlm: <linux/dlm_plock.h> should be "unifdef"ed.
    
    Given that <linux/dlm_plock.h> contains a conditional __KERNEL__ test,
    it should be moved from header-y to unifdef-y.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 817d10bad56f2fdfa321b4a864a21295226b123a
Author: David Teigland <teigland@redhat.com>
Date:   Tue May 13 14:28:26 2008 -0500

    dlm: fix plock dev_write return value
    
    The return value on writes to the plock device should be
    the number of bytes written.  It was returning 0 instead
    when an nfs lock callback was involved.
    
    Reported-by: Nathan Straz <nstraz@redhat.com>
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 0035a4b14931eb62a5f8a7762284c18e7ab14289
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Sun May 11 22:01:29 2008 +0200

    dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Cc: Christine Caulfield <ccaulfie@redhat.com>
    Cc: David Teigland <teigland@redhat.com>
    Cc: cluster-devel@redhat.com
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 88ad23195e4609cef73b6fcf2b4c08aaaef33204
Author: Leonardo Potenza <lpotenza@inwind.it>
Date:   Sun May 11 19:15:34 2008 +0200

    dlm: section mismatch warning fix
    
    Removed the section mismatch message:
    WARNING: fs/dlm/dlm.o(.init.text+0x132): Section mismatch in reference from the function init_module() to the function .exit.text:dlm_netlink_exit()
    
    Since dlm_netlink_exit() is called in the init_dlm() error handling,
    the __exit annotation has been removed.
    
    Signed-off-by: Leonardo Potenza <lpotenza@inwind.it>
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 7a936ce71eed7b887b8a0d6c54dd8a9072f71c9f
Author: Matthias Kaehlcke <matthias@kaehlcke.net>
Date:   Mon May 12 10:04:51 2008 -0500

    dlm: convert connections_lock in a mutex
    
    The semaphore connections_lock is used as a mutex.  Convert it to the mutex
    API.
    
    Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
    Cc: Christine Caulfield <ccaulfie@redhat.com>
    Cc: David Teigland <teigland@redhat.com>
    Cc: Steven Whitehouse <swhiteho@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 860da5e578c25d1ab4528c0d1ad13f9969e3490f
Merge: 1bf9947... e948e99...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 13:30:40 2008 -0700

    Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/i915: save and restore dsparb and d_state registers.
      drm/i915: fix off by one in VGA save/restore of AR & CR regs.
      drm: disable tasklets not IRQs when taking the drm lock spinlock
      Revert "drm/vbl rework: rework how the drm deals with vblank."

commit 1bf99477226963d84b182b3995e355d3091199be
Merge: 83e0c24... 7d3cc8b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 11:32:21 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
      Don't clean bounds.h and asm-offsets.h
      kconfig: incorrect 'len' field initialisation ?
      kernel-doc: allow unnamed bit-fields
      kbuild: filter away debug symbols from kernel symbols
      Remove *.rej pattern from .gitignore
      MAINTAINERS: document names of new kbuild trees
      kbuild: disable modpost warnings for linkonce sections
      kbuild: escape meta characters in regular expression in make TAGS

commit 7d3cc8b6d899e53222c22a78d98bb53a695f7962
Author: Jan Blunck <jblunck@suse.de>
Date:   Fri May 16 13:54:59 2008 +0200

    Don't clean bounds.h and asm-offsets.h
    
    Since 97965478a66fbdf0f4ad5e4ecc4828f0cb548a45 ("mm: Get rid of __ZONE_COUNT")
    mmzone.h includes bounds.h.
    Calling make clean after make prepare removes bounds.h
    again so when building external modules this fails.
    
    Signed-off-by: Jan Blunck <jblunck@suse.de>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    --

commit 107f43a0f7282511ec570214a0b8f639224ff525
Author: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Date:   Sun May 18 23:10:24 2008 +0200

    kconfig: incorrect 'len' field initialisation ?
    
    1) The field 'len' of the 'gstr' structure seems to track the size of the memory
    already allocated for the "growable string". So the value of this field should be
    the same as the 'malloc()' just above, shouldn't it ?
    
    Signed-off-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit 7b97887eab6c35d23f2e4680bd5e285415068f35
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Fri May 16 15:45:52 2008 -0700

    kernel-doc: allow unnamed bit-fields
    
    Allow for unnamed bit-fields and skip them instead of printing an
    erroneous warning message for them, such as:
    
    Warning(include/asm-s390/cio.h:103): No description found for parameter 'u32'
    
    which contains:
    
    struct tm_scsw {
    	u32 :1;
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit aab34ac8582303ef57b792710fc5dd5991477475
Author: Sam Ravnborg <sam@ravnborg.org>
Date:   Mon May 19 20:07:58 2008 +0200

    kbuild: filter away debug symbols from kernel symbols
    
    Andi Kleen <andi@firstfloor.org>
    reported that he saw a lot of symbols like this:
    
    0000000000000b24 N DW.aio.h.903a6d92.2
    0000000000000bce N DW.task_io_accounting.h.8d8de327.0
    0000000000000bec N DW.hrtimer.h.c23659c6.0
    
    in his System.map / kallsyms output.
    
    Simple solution is to skip all debugging
    symbols (they are marked 'N').
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Paulo Marques <pmarques@grupopie.com>

commit 83e0c24a38aa91f7d932bbcab257093b82435074
Merge: 161fb0c... 42ece6c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 09:24:49 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      snd-pcsp: silent misleading warning
      snd-pcsp: depend on CONFIG_EXPERIMENTAL
      snd-pcsp: put back the compatibility code for the older alsa-libs
      snd-pcsp: adjust help texts to frighten users

commit 13c501e69c3fba3ca0651abcc4aa7c9091fda70a
Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date:   Fri May 16 00:43:46 2008 +1000

    [POWERPC] 4xx: Workaround for CHIP_11 Errata
    
    The PowerPC 440EP, 440GR, 440EPx, and 440GRx chips have an issue that
    causes the PLB3-to-PLB4 bridge to wait indefinitely for transaction
    requests that cross the end-of-memory-range boundary.  Since the DDR
    controller only returns the valid portion of a read request, the bridge
    will prevent other PLB masters from completing their transactions.
    
    This implements the recommended workaround for this errata for chips that
    use older versions of firmware that do not already handle it.  The last
    4KiB of memory are hidden from the kernel to prevent the problem
    transactions from occurring.
    
    Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
    Acked-by: Stefan Roese <sr@denx.de>
    Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

commit 336f1d326831873ffab6de5fcec4b3be05103ae0
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon May 19 19:39:33 2008 +0900

    sh: Fix up restorer in debug_trap exception return path.
    
    There are a few different types of debug trap exceptions, though now
    that they are all going through a special jump table, the restorer needs
    to be unified as well.
    
    Presently this is falling through the ret_from_fork path, which more or
    less does the right thing on SH-3/4 whilst being completely unsuitable on
    MMU-less targets.
    
    Ultimately what we want here is a branch through the platform's
    restore_all directly, without worrying about the retval being clobbered.
    We can accomplish that through a branch to __restore_all directly, so
    switch it so we come back from the jump table and branch to the restorer.
    
    This fixes up a recursion in the nommu WARN_ON() path, as well as some
    other userspace nastiness where said recursion caused serious stack
    corruption.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 9a33fc217d2248838d52f8ef214b1909073f3eb4
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon May 19 19:32:07 2008 +0900

    sh: Make is_valid_bugaddr() more intelligent on nommu.
    
    Currently is_valid_bugaddr() is true for anything >= PAGE_OFFSET, which
    happens to be 0 on nommu configurations. Make this a bit smarter by just
    reading in the opcode and comparing it against the trap type that we
    already know. Follows the logic from avr32.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 42ece6c1f8162cd782b44dc4863679e888531df5
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Sun May 18 18:30:03 2008 +0200

    snd-pcsp: silent misleading warning
    
    It appears that alsa allows a sound buffer with size not
    evenly devided by the period size. This triggers a warning in
    snd-pcsp and floods the log. As a quick fix, the warning should
    be disabled.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 2bc536a235382f2a14fbbefd4fa9cd6089c9d0d0
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Sat May 17 08:46:55 2008 +0200

    snd-pcsp: depend on CONFIG_EXPERIMENTAL
    
    Considering all the feedbacks I got, depending snd-pcsp on
    CONFIG_EXPERIMENTAL looks like the only safe way to get out
    of all the troubles at one go. :)
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 4dfd79546dfed83bf756f5c912f686ebac187c16
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Sat May 17 08:44:41 2008 +0200

    snd-pcsp: put back the compatibility code for the older alsa-libs
    
    The attached patch adds back the compatibility code, allowing the
    driver to work with older alsa-libs.
    The removal was premature, it breaks the real-life configs.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 3ccee69019d3b23f02204f4c2cb3085f436da252
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Fri May 16 12:10:03 2008 +0200

    snd-pcsp: adjust help texts to frighten users
    
    Added the warning text to the help of snd-pcsp about the possible problem
    with this driver so that user can know of the problem in advance.
    
    Also, removed the obsoleted text about ancient pc-speaker patch in
    CONFIG_SOUND help.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit f9ebcd9d410ba7209a8f321c41edf8615fc3ce67
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sun May 18 13:18:01 2008 -0500

    lmb: Fix compile warning
    
    lib/lmb.c: In function 'lmb_dump_all':
    lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64'
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 161fb0cf5c7e94cd0490e4bd04edcf1e24d1d288
Merge: b8291ad... b452876...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun May 18 15:32:44 2008 -0700

    Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
    
    * 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gid
      nfs: make nfs4_drop_state_owner() static
      nfs: path_{get,put}() cleanups
      nfs: replace remaining __FUNCTION__ occurrences
      nfs/lsm: make NFSv4 set LSM mount options
      NFSv4: Check the return value of decode_compound_hdr_arg()
      nfs: fix race in nfs_dirty_request
      NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching

commit b4528762ca92261c6ed3f03e76adeb1dc587aacb
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Sun May 11 12:18:51 2008 -0700

    SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gid
    
    Apparently this causes Solaris 10 servers to refuse our NFSv4 SETCLIENTID
    calls. Fall back to root creds for now, since most servers that care are
    very likely to have root squashing enabled.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 54aaacee35afd594bba3244c20b02cc98d80a961
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Wed May 14 02:29:06 2008 -0300

    KVM: LAPIC: ignore pending timers if LVTT is disabled
    
    Only use the APIC pending timers count to break out of HLT emulation if
    the timer vector is enabled.
    
    Certain configurations of Windows simply mask out the vector without
    disabling the timer.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 1fc9d2bf75bbe5482cc503681dae0935df29b6b0
Author: Avi Kivity <avi@qumranet.com>
Date:   Sun May 18 13:50:23 2008 +0300

    KVM: Update MAINTAINERS for new mailing lists
    
    The KVM mailing lists are now hosted on vger.kernel.org.  Also update
    the website URL.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit e5c239cfd5b0ec22751c099dbf4d91f3c504a64f
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Thu May 8 19:47:01 2008 -0300

    KVM: Fix kvm_vcpu_block() task state race
    
    There's still a race in kvm_vcpu_block(), if a wake_up_interruptible()
    call happens before the task state is set to TASK_INTERRUPTIBLE:
    
    CPU0                            CPU1
    
    kvm_vcpu_block
    
    add_wait_queue
    
    kvm_cpu_has_interrupt = 0
                                    set interrupt
                                    if (waitqueue_active())
                                            wake_up_interruptible()
    
    kvm_cpu_has_pending_timer
    kvm_arch_vcpu_runnable
    signal_pending
    
    set_current_state(TASK_INTERRUPTIBLE)
    schedule()
    
    Can be fixed by using prepare_to_wait() which sets the task state before
    testing for the wait condition.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit bd25ed033af52c8c054d43a9cce9c5976266ae74
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Wed May 14 19:44:57 2008 +0800

    KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48
    
    Guest's firmware needs an iosapic with 48 pins for ia64 guests.  Needed to
    get networking going.
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 25c437b01f3a04af5362c7fd80ba91a0ec74f007
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Wed May 7 17:34:52 2008 +0800

    KVM: ia64: fix GVMM module including position-dependent objects
    
    The GVMM module is position independent since it is relocated to the guest
    address space.
    
    Commit ea696f9cf ("ia64 kvm fixes for O=... builds") broke this by linking
    GVMM with non-PIC objects.
    
    Fix by creating two files: memset.S and memcpy.S which just include the files
    under arch/ia64/lib/{memset.S, memcpy.S} respectively.
    
    [akpm: don't delete files which we need]
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 021f4b6cc966d02b2bcd68841bc2f0c4897edcbb
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Wed May 7 17:37:32 2008 +0800

    KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg
    
    The kernel's ia64_fpreg structure conflicts with userspace headers, so
    define a new structure to replace it.
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit eedaa4e2af681a266c084c410238855bdfbc2787
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Tue May 6 13:32:54 2008 -0300

    KVM: PIT: take inject_pending into account when emulating hlt
    
    Otherwise hlt emulation fails if PIT is not injecting IRQ's.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 5ca9fd54e3d75489ff9c70d7af6e0b9a390dd656
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Tue May 6 17:38:30 2008 +0300

    s390: KVM guest: fix compile error
    
    Fix kvm compile error:
    
    Commit c45a6816c19dee67b8f725e6646d428901a6dc24
    (virtio: explicit advertisement of driver features)
    and commit e976a2b997fc4ad70ccc53acfe62811c4aaec851
    (s390: KVM guest: virtio device support, and kvm hypercalls)
    don't like each other:
    
      CC      drivers/s390/kvm/kvm_virtio.o
    drivers/s390/kvm/kvm_virtio.c:224: error: unknown field 'feature' specified in initializer
    drivers/s390/kvm/kvm_virtio.c:224: warning: initialization from incompatible pointer type
    make[3]: *** [drivers/s390/kvm/kvm_virtio.o] Error 1
    
    Cc: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Acked-by: Carsten Otte <cotte@de.ibm.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 107d6d2efa9eb8c48d050936d8019230ac6b24cd
Author: Avi Kivity <avi@qumranet.com>
Date:   Mon May 5 14:58:26 2008 +0300

    KVM: x86 emulator: fix writes to registers with modrm encodings
    
    A register destination encoded with a mod=3 encoding left dst.ptr NULL.
    Normally we don't trap writes to registers, but in the case of smsw, we do.
    
    Fix by pointing dst.ptr at the destination register.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit e5c0ef90e6cfd40c819bd70748d675067ff862e7
Author: Marc Pignat <marc.pignat@hevs.ch>
Date:   Fri May 9 11:07:07 2008 +0200

    at91_mci: minor cleanup
    
    MMC_POWER_ON is a noop, no need to set the power pin again.
    
    Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

commit 460ed2ea04da012e5575eb357a47a7f6407767de
Author: Mike Frysinger <vapier.adi@gmail.com>
Date:   Sat May 17 18:22:26 2008 +0800

    Blackfin SPORTS UART Driver: converting BFIN->BLACKFIN
    
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit eedd306b51274fb64c00924b5ead679153fca78d
Author: Javier Herrero <jherrero@hvsistemas.es>
Date:   Sat May 17 18:21:57 2008 +0800

    Blackfin serial driver: add extra IRQ flag for 8250 serial driver
    
    Signed-off-by: Javier Herrero <jherrero@hvsistemas.es>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit b4aa54d951d38d7a989d6b6385494ef5ea7371d7
Author: Javier Herrero <jherrero@hvsistemas.es>
Date:   Sat May 17 18:21:42 2008 +0800

    8250 Serial Driver: Added support for 8250-class UARTs in HV Sistemas H8606 board
    
    Added support for 8250-class UARTs in HV Sistemas H8606 board,
    modification in 8250.c driver for correct compilation with Blackfin
    
    Besides, I think that there is more people using 8250-class UARTs
    with a different hardware than the H8606 board. This code can be shared
    by them.
    
    Signed-off-by: Javier Herrero <jherrero@hvsistemas.es>
    Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 7e291434eb128d7b4217dde6e0543f4342dd51fa
Author: Bryan Wu <cooloney@kernel.org>
Date:   Mon May 19 14:56:42 2008 +0800

    Blackfin arch: Fix bug - USB fails to build for BF524/BF526
    
    BF524 is the same as BF525, except the speed of the processor
    BF526 is the same as BF527, except the speed of the processor
    
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit ecb9567e287e082f78fcf055e34613eaf1f7df24
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Mon May 19 14:56:33 2008 +0800

    Blackfin arch: update boards defconfig files
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 59069676383c6446f50555e04aed7f51d5de695e
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Sat May 17 16:38:52 2008 +0800

    Blackfin arch: IO Port functions to read/write unalligned memory
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 86ad79321cbacdc4deebcde81849d19e26dd18e2
Author: Cliff Cai <cliff.cai@analog.com>
Date:   Sat May 17 16:36:52 2008 +0800

    Blackfin arch: enable a choice to provide 4M DMA memory
    
    support two cascaded AD73322 cards, more uncached DMA
    memory is needed, so add a choice to provide 4M DMA memory
    
    Signed-off-by: Cliff Cai <cliff.cai@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit c6c6f75d54ca734c409e336245662934c21fcee0
Author: Mike Frysinger <vapier.adi@gmail.com>
Date:   Sat May 17 16:18:08 2008 +0800

    Blackfin arch: cleanup the icplb/dcplb multiple hit checks
    
    so that we always send the same signal and we handle the NULL ptr condition properly
    
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 803a8d2acbf220aeb27f0a98dacb36d4af3d6559
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Sat May 17 16:01:51 2008 +0800

    Blackfin arch: Add workaround to read edge triggered GPIOs
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 92322da9b568a5ddc3ab872491bdc0f1b47ef904
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Sat May 17 15:59:11 2008 +0800

    Blackfin arch: Sync channel defines with struct dma_register dma_io_base_addr.
    
    Otherwise we use the wrong DMA channels.
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 5ce998cf6d1dbb28f14dea879a366ed5348f9681
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Sat May 17 15:57:01 2008 +0800

    Blackfin arch: Check for Anomaly 05000182
    
    IMDMA does not operate to full speed for 600MHz and higher devices
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 6793a051fb9311f0f1ab7eafc5a9e69b8a1bd8d4
Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date:   Wed May 14 17:10:12 2008 -0700

    [PATCH] list_for_each_rcu must die: audit
    
    All uses of list_for_each_rcu() can be profitably replaced by the
    easier-to-use list_for_each_entry_rcu().  This patch makes this change
    for the Audit system, in preparation for removing the list_for_each_rcu()
    API entirely.  This time with well-formed SOB.
    
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit fcaf1eb8685a00a99259e138e403841e984385b0
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Wed May 14 16:11:48 2008 -0700

    [patch 1/1] audit_send_reply(): fix error-path memory leak
    
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10663
    
    Reporter: Daniel Marjamki <danielm77@spray.se>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 6ee650467d5bf972d10441e99688e9b48171f99c
Author: Steve Grubb <sgrubb@redhat.com>
Date:   Tue Apr 29 15:01:13 2008 -0400

    [PATCH] open sessionid permissions
    
    The current permissions on sessionid are a little too restrictive.
    
    Signed-off-by: Steve Grubb <sgrubb@redhat.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit e9baf6e59842285bcf9570f5094e4c27674a0f7c
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 15 04:49:12 2008 -0400

    [PATCH] return to old errno choice in mkdir() et.al.
    
    	In case when both EEXIST and EROFS would apply we used to
    return the former in mkdir(2) and friends.  Lest anyone suspects
    us of being consistent, in the same situation knfsd gave clients
    nfs_erofs...
    
    	ro-bind series had switched the syscall side of things to
    returning -EROFS and immediately broke an application - namely,
    mkdir -p.  Patch restores the original behaviour...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 23c4971e3d97de4e1b7961ca6eacee35aa15ce5f
Author: WANG Cong <xiyou.wangcong@gmail.com>
Date:   Thu May 8 21:52:33 2008 +0800

    [Patch] fs/binfmt_elf.c: fix wrong return values
    
    create_elf_tables() returns 0 on success. But when strnlen_user() "fails",
    it returns 0 directly. So this is wrong.
    
    Signed-off-by: WANG Cong <wangcong@zeuux.org>
    Cc: Alexander Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 08a6fac1c63233c87eec129938022f1a9a4d51f6
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Sat May 10 16:38:25 2008 -0400

    [PATCH] get rid of leak in compat_execve()
    
    Even though copy_compat_strings() doesn't cache the pages,
    copy_strings_kernel() and stuff indirectly called by e.g.
    ->load_binary() is doing that, so we need to drop the
    cache contents in the end.
    
    [found by WANG Cong <wangcong@zeuux.org>]
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 5f719558edf9c84bfbb1f7ad37e84c483282d09f
Author: WANG Cong <xiyou.wangcong@gmail.com>
Date:   Tue May 6 12:45:35 2008 +0800

    [Patch] fs/binfmt_elf.c: fix a wrong free
    
    In kmalloc failing path, we shouldn't free pointers in 'info',
    because the struct 'info' is uninitilized when kmalloc is called.
    
    And when kmalloc returns NULL, it's needless to kfree it.
    
    Signed-off-by: WANG Cong <wangcong@zeuux.org>
    Cc: Alexander Viro <viro@zeniv.linux.org.uk>
    Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
    
    --
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit eceea0b3df05ed262ae32e0c6340cc7a3626632d
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Sat May 10 10:08:32 2008 -0400

    [PATCH] avoid multiplication overflows and signedness issues for max_fds
    
    Limit sysctl_nr_open - we don't want ->max_fds to exceed MAX_INT and
    we don't want size calculation for ->fd[] to overflow.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit adbecb128cd2cc5d14b0ebef6d020ced0efd0ec6
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 21:19:42 2008 -0400

    [PATCH] dup_fd() part 4 - race fix
    
    Parent _can_ be a clone task, contrary to the comment.  Moreover,
    more files could be opened while we allocate a copy, in which case
    we end up copying only part into new descriptor table.  Since what
    we get _is_ affected by all changes in the old range, we can get
    rather weird effects - e.g.
    	dup2(0, 1024); close(0);
    in parallel with fork() resulting in child that sees the effect of
    close(), but not that of dup2() done just before that close().
    
    What we need is to recalculate the open_count after having reacquired
    ->file_lock and if external fdtable we'd just allocated is too small for
    it, free the sucker and redo allocation.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit afbec7fff4928c273a1f1bb14dfdfdf62688a193
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 21:11:17 2008 -0400

    [PATCH] dup_fd() - part 3
    
    merge alloc_files() into dup_fd(), leave setting newf->fdt until the end
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 9dec3c4d306b09b31331e475e895bb9674e16d81
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 21:02:45 2008 -0400

    [PATCH] dup_fd() part 2
    
    use alloc_fdtable() instead of expand_files(), get rid of pointless
    grabbing newf->file_lock, kill magic in copy_fdtable() that used to
    be there only to skip copying when called from dup_fd().
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 02afc6267f6d55d47aba9fcafdbd1b7230d2294a
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 19:42:56 2008 -0400

    [PATCH] dup_fd() fixes, part 1
    
    Move the sucker to fs/file.c in preparation to the rest
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit f52111b1546943545e67573c4dde1c7613ca33d3
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 18:19:16 2008 -0400

    [PATCH] take init_files to fs/file.c
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 1d2e88e73ee0af52b0ed63b5fb8f42a919a4d9de
Author: Adrian Bunk <bunk@kernel.org>
Date:   Fri May 2 13:42:45 2008 -0700

    nfs: make nfs4_drop_state_owner() static
    
    nfs4_drop_state_owner() can now become static.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 31f31db1a15671513df9cd9fbe56ef45ee1e9a2a
Author: Jan Blunck <jblunck@suse.de>
Date:   Fri May 2 13:42:45 2008 -0700

    nfs: path_{get,put}() cleanups
    
    Here are some more places where path_{get,put}() can be used instead of
    dput()/mntput() pair.
    
    Signed-off-by: Jan Blunck <jblunck@suse.de>
    Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
    Cc: "J. Bruce Fields" <bfields@fieldses.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 3110ff8048fb757b36112b044b384aea9c44d6e4
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Fri May 2 13:42:44 2008 -0700

    nfs: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
    Cc: "J. Bruce Fields" <bfields@fieldses.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 46c8ac74250a396aca855e494f49a960797a6b5e
Author: Eric Paris <eparis@redhat.com>
Date:   Fri May 2 13:42:42 2008 -0700

    nfs/lsm: make NFSv4 set LSM mount options
    
    NFSv3 get_sb operations call into the LSM layer to set security options passed
    from userspace.  NFSv4 hooks were not originally added since it was reasonably
    late in the merge window and NFSv3 was the only thing that had regressed (v4
    has never supported any LSM options)
    
    This patch makes NFSv4 call into the LSM to set security options rather than
    just blindly dropping them with no notice to the user as happens today.  This
    patch was tested in a simple NFSv4 environment with the context= option and
    appeared to work as expected.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
    Cc: "J. Bruce Fields" <bfields@fieldses.org>
    Cc: Stephen Smalley <sds@tycho.nsa.gov>
    Acked-by: James Morris <jmorris@namei.org>
    Cc: Casey Schaufler <casey@schaufler-ca.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 3a6258e1fb5ff717dcefa04afc35f81aaae3f3e0
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue May 6 13:32:40 2008 -0400

    NFSv4: Check the return value of decode_compound_hdr_arg()
    
    If decode_compound_hdr_arg() returns a resource error, then we cannot
    proceed to process the callback. Return a 'GARBAGE_ARGS' rpc-level error to
    the caller instead.
    If, however, the minor version field is incorrect, then we need to
    propagate the resulting NFS4ERR_MINOR_VERS_MISMATCH error back as the
    compound status field (setting the nops field to 0).
    
    Finally, if encode_compound_hdr_res() returns an error, we need to return
    an RPC_SYSTEM_ERR to the caller.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 38def50fabc479dc96ea6bd2cb2526e0dfc36fa4
Author: Fred Isaman <iisaman@citi.umich.edu>
Date:   Thu May 1 20:03:22 2008 +0300

    nfs: fix race in nfs_dirty_request
    
    When called from nfs_flush_incompatible, the req is not locked, so
    req->wb_page might be set to NULL before it is used by PageWriteback.
    
    Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
    Signed-off-by: Benny Halevy <bhalevy@panasas.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit b0b539739fe9b7d75002412a787cfdf4efddbc33
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Mon May 5 11:45:41 2008 -0400

    NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching
    
    Both the 'noac' and 'actimeo=0' mount options should ensure that attributes
    are not cached, however a bug in nfs_attribute_timeout() means that
    currently, the attributes may in fact get cached for up to one jiffy. This
    has been seen to cause corruption in some applications.
    
    The reason for the bug is that the time_in_range() test returns 'true' as
    long as the current time lies between nfsi->read_cache_jiffies and
    nfsi->read_cache_jiffies + nfsi->attrtimeo. In other words, if jiffies
    equals nfsi->read_cache_jiffies, then we still cache the attribute data.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit bfd3c7a728fbe642f79f99482a6c01158c675545
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Mon May 12 12:05:43 2008 -0700

    sh: use the common ascii hex helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 65b83427c6e5814556855c42bf9b4edeafd66623
Author: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Date:   Thu May 15 17:44:00 2008 +0900

    sh: fix sh7785 master clock value
    
    Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 561c2bccc7c5cf3d42f38f1f4d61c7b609d4631e
Author: Hideo Saito <saito@densan.co.jp>
Date:   Thu May 15 13:30:05 2008 +0900

    sh: Fix up thread info pointer in syscall_badsys resume path.
    
    Entry to resume_userspace expects r8 to contain current_thread_info,
    which happens in all paths except for syscall_badsys, where r8 was
    being inadvertently trampled. Reload it before the branch.
    
    Signed-off-by: Hideo Saito <saito@densan.co.jp>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit e08b954c9a140f2062649faec72514eb505f18c3
Author: Hideo Saito <saito@densan.co.jp>
Date:   Thu May 15 13:28:46 2008 +0900

    sh: Fix up optimized SH-4 memcpy on big endian.
    
    Signed-off-by: Hideo Saito <saito@densan.co.jp>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 972ad0e0d51b67b862ae6143d858fb7da2f2a5f6
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Tue May 13 17:41:46 2008 +0900

    sh: disable initrd defaults in .empty_zero_page.
    
    When using initramfs on systems that don't explicitly clear LOADER_TYPE,
    unpack_to_rootfs() tramples tramples the range with the defaults taken
    out of .empty_zero_page. This causes kernels with valid initramfs images
    to bail out with crc or gzip magic mismatch errors after the second
    unpack takes place on certain platform configurations.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 0105346cc763a6e34e80feb6adb36ed9781150d4
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Tue May 13 17:40:17 2008 +0900

    sh: display boot params by default on entry.
    
    Some kernel and boot loader configurations tweak the .empty_zero_page
    settings, while others do not. Print the values out on entry as a
    debugging aid.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 88ae600d58a8d3160144af480133a988404b8d59
Author: Pierre Ossman <drzeus@drzeus.cx>
Date:   Sun Aug 12 14:23:50 2007 +0200

    mmc: mmc host test driver
    
    A dummy driver that performs a series of requests that are often mis-
    handled by host drivers.
    
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

commit df48dd028766ce2fc05d1f1d9da9bf89855d5282
Author: Tony Lindgren <tony@atomide.com>
Date:   Tue May 6 16:36:47 2008 -0700

    mmc: Fix omap compile by replacing dev_name with dma_dev_name
    
    This patch fixes error:
    
    drivers/mmc/host/omap.c: In function 'mmc_omap_get_dma_channel':
    drivers/mmc/host/omap.c:1038: error: called object 'dev_name' is not a function
    
    Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 adds a function
    called dev_name. This will cause a name conflict as dev_dbg calls
    dev_name(((host->mmc)->parent)).
    
    This same issue should not affect other drivers as they don't seem
    to use dev_name with dev_dbg.
    
    Thanks to Paul Walmsley <paul@pwsan.com> for figuring this one out.
    
    Cc: Paul Walmsley <paul@pwsan.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

commit 9cd9c616f5890c9345546e03c99ba392b7a82cdf
Author: Mike Frysinger <vapier.adi@gmail.com>
Date:   Tue May 13 12:31:32 2008 +0800

    [Blackfin] arch: rename bf5xx-flash to bfin-async-flash
    
     - move all kconfig board settings into board resources
     - fixup casting style according to lkml feedback
     - rewrite driver so that it can handle arbitrary
       of instances according to the declared platform resources
    
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Cc: Joern Engel <joern@logfs.org>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 00377d8e3842776d1da633ad9c79a16ecb548b92
Author: Jean Delvare <khali@linux-fr.org>
Date:   Fri May 9 17:59:51 2008 +0200

    [GFS2] Prefer strlcpy() over snprintf()
    
    strlcpy is faster than snprintf when you don't use the returned value.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

commit ad99f77778e83358c371dab7a50bde69270ed6b8
Author: Andrew Price <andy@andrewprice.me.uk>
Date:   Thu May 1 11:55:38 2008 +0100

    [GFS2] Fix cast from unsigned int to s64
    
    This fixes bz 444829 where allocating a new block caused gfs2 file systems to
    report 0 bytes used in df. It was caused by a broken cast from an unsigned int
    in gfs2_block_alloc() to a negative s64 in gfs2_statfs_change(). This patch
    casts the unsigned int to an s64 before the unary minus is applied.
    
    Signed-off-by: Andrew Price <andy@andrewprice.me.uk>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

commit 091806edd458486af13ad83c9802f5b8b54d6d19
Author: Bob Peterson <rpeterso@redhat.com>
Date:   Tue Apr 29 12:35:48 2008 -0500

    [GFS2] filesystem consistency error from do_strip
    
    This patch fixes a GFS2 filesystem consistency error reported from
    function do_strip.  The problem was caused by a timing window
    that allowed two vfs inodes to be created in memory that point
    to the same file.  The problem is fixed by making the vfs's
    iget_test, iget_set mechanism check and set a new bit in the
    in-core gfs2_inode structure while the vfs inode spin_lock is held.
    
    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

commit 45b3947c2de5841d691f1d27d30419b9fae2d86c
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Mon May 12 11:55:10 2008 +0800

    [Blackfin] arch: Blackfin checksum annotations
    
    FSVOtest in this case, since I don't have the hardware...
    However, all changes seen by gcc are actually
     - explicit cast to unsigned short in return expression of functions
        returning unsigned short
     - csum_fold() return type changed from unsigned int to __sum16
       (unsigned short), same as for all other architecture and as net/* expects;
       expression actually returned is ((~(sum << 16)) >> 16) with sum being
       unsigned 32bit, so it's (a) going to fit into the range of unsigned short
       and (b) had been unsigned all along, so no sign expansion mess happened.
    
    Tested-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: David Miller <davem@davemloft.net>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 1f5d3a6b6532e25a5cdf1f311956b2b03d343a48
Author: S.Çağlar Onur <caglar@pardus.org.tr>
Date:   Fri May 2 14:10:08 2008 +0300

    Remove *.rej pattern from .gitignore
    
    With commit 3f1b0e1f287547903f11fa1e6de7d2765597766e ".gitignore update"
    Linus's current git tree starts to ignore any "*.rej" files.
    So "git status" no longer shows these files, but the ones who works with
    quilt patchsets, this not makes life easier as expected.
    Because sometimes a work flow (at least for me) requires
    "quilt push -f" followed by "git status" to see unresolved merge
    conflicts, work on these conflicts to correct them and finalize
    the patch with "quilt refresh".
    
    And if there are some "*.rej" files exists in tree, for whatever
    reason, this means something goes really wrong there and i think
    this situation not deserves to be ignored.
    
    Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit 591b0179e80f7d59b5e6e57063e92fdbface98fb
Author: Sam Ravnborg <sam@ravnborg.org>
Date:   Sun May 11 10:07:03 2008 +0200

    MAINTAINERS: document names of new kbuild trees
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit fd1db0a31319bd21c521b197ce17c557556b821b
Author: Andi Kleen <andi@firstfloor.org>
Date:   Thu May 8 13:41:11 2008 +0200

    kbuild: disable modpost warnings for linkonce sections
    
    Disable modpost warnings for linkonce sections
    
    My build gives lots of warnings like
    
    WARNING: sound/core/snd.o (.gnu.linkonce.wi.mpspec_def.h.30779716): unexpected section name.
    The (.[number]+) following section name are ld generated and not expected.
    Did you forget to use "ax"/"aw" in a .S file?
    Note that for example <linux/init.h> contains
    section definitions for use in .S files.
    
    But for .linkonce. duplicated sections are actually ok and expected.
    So just disable the warning for this case.
    
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit a95bcfac2b5f353f99c6a338d77eb5584ab35d83
Author: Masatake YAMATO <yamato@redhat.com>
Date:   Wed May 7 16:04:31 2008 +0900

    kbuild: escape meta characters in regular expression in make TAGS
    
    Alexey Dobriyan <adobriyan@gmail.com> introduced a code adds
    menuconfig SOMETHING in Kconfig to tags output when you did "make tags".
    
    See http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=80ff26241623875636674a31c0540a78c0fb5433
    
    "make tags" may work fine with his code. However make TAGS doesn't work well
    because etags command requires backslashes to escape meta characters like
    `(', `)' and `|'.
    
    Here is a patch.
    
    Signed-off-by: Masatake YAMATO <yamato@redhat.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit e948e99400b28af152414f15f8c8023ff2430b79
Author: Keith Packard <keithp@keithp.com>
Date:   Wed May 7 12:27:53 2008 +1000

    drm/i915: save and restore dsparb and d_state registers.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a59e122a67b88925944d3bbf33d15229cf0fc3de
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Wed May 7 12:25:46 2008 +1000

    drm/i915: fix off by one in VGA save/restore of AR & CR regs.
    
    turns out it's important to save/restore AR14 in particular.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit f116cc561eae0a426b8fa6b3e22e80ba0bcf7aee
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Wed May 7 12:22:39 2008 +1000

    drm: disable tasklets not IRQs when taking the drm lock spinlock
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit af6061af0d9f84a4665f88186dc1ff9e4fb78330
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed May 7 12:15:39 2008 +1000

    Revert "drm/vbl rework: rework how the drm deals with vblank."
    
    This reverts commit ac741ab71bb39e6977694ac0cc26678d8673cda4.
    
    Okay this looks like wasn't as fully baked as I'd led myself to believe.
    
    Revert for now for further baking.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>