ALSA System on Chip repository. branch, wm8995, created. v2.6.37-rc6-2-gf3e85ae

git at opensource.wolfsonmicro.com git at opensource.wolfsonmicro.com
Tue Dec 21 17:44:48 GMT 2010


The branch wm8995 has been created
        at  f3e85aec913f46a0f5ab9a9bad0b9b8595cbf8cb (commit)

- Log -----------------------------------------------------------------
commit f3e85aec913f46a0f5ab9a9bad0b9b8595cbf8cb
Author: Dimitris Papastamos <dp at opensource.wolfsonmicro.com>
Date:   Tue Dec 21 13:18:52 2010 +0000

    ASoC: Add initial WM8995 driver
    
    The WM8995 is a digital audio hub CODEC designed for smartphones.
    The current driver supports most of the basic functionality of the
    WM8995.
    
    Signed-off-by: Dimitris Papastamos <dp at opensource.wolfsonmicro.com>

commit aab7a006913b8f63d7f75fdf656616bfdd8b8968
Author: Dimitris Papastamos <dp at opensource.wolfsonmicro.com>
Date:   Thu Dec 16 15:53:39 2010 +0000

    ASoC: soc-dapm: Introduce the new snd_soc_dapm_virt_mux type
    
    This new type is a virtual version of snd_soc_dapm_mux.  It is used
    when a backing register value is not necessary for deciding which
    input path to connect.  A simple virtual enumeration control e.g.
    SOC_DAPM_ENUM_VIRT() can be exposed to userspace which will be used
    to choose which path to connect.
    
    The snd_soc_dapm_virt_mux type ensures that during the initial
    path setup, the first (which is also the default) input path will
    be connected.
    
    Signed-off-by: Dimitris Papastamos <dp at opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit b0c3844d8af6b9f3f18f31e1b0502fbefa2166be
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Dec 15 17:24:48 2010 -0800

    Linux 2.6.37-rc6

commit c01c8106f43ec7e460eeb56c7a8ae666acdfe5a0
Merge: a4851d8f7d6351a395d36ae8fdcf41745a832d76 52f6c5ad430e41736133acac179607b224eaaa11
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Dec 15 17:24:05 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h

commit a4851d8f7d6351a395d36ae8fdcf41745a832d76
Merge: 667c78afaec0ac500908e191e8f236e9578d7b1f 6d5c3aa84b3e431f2d0fc39c73c867d1a4dd8cff
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Dec 15 12:41:17 2010 -0800

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: fix typo which broke '..' detection in ext4_find_entry()
      ext4: Turn off multiple page-io submission by default

commit 667c78afaec0ac500908e191e8f236e9578d7b1f
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date:   Wed Dec 8 12:39:12 2010 -0800

    xen: Provide a variant of __RING_SIZE() that is an integer constant expression
    
    Without this, gcc 4.5 won't compile xen-netfront and xen-blkfront, where
    this is being used to specify array sizes.
    
    Signed-off-by: Jan Beulich <jbeulich at novell.com>
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
    Cc: Jens Axboe <axboe at kernel.dk>
    Cc: David Miller <davem at davemloft.net>
    Cc: Stable Kernel <stable at kernel.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6c965ff5e7ca844494f1dcf0ec0440146db01294
Author: Daniel Walker <dwalker at codeaurora.org>
Date:   Thu Dec 9 15:45:27 2010 -0800

    MAINTAINERS: update MSM git tree
    
    The MSM main git tree has changed over to this new address.
    
    Signed-off-by: Daniel Walker <dwalker at codeaurora.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 462e635e5b73ba9a4c03913b77138cd57ce4b050
Author: Tavis Ormandy <taviso at cmpxchg8b.com>
Date:   Thu Dec 9 15:29:42 2010 +0100

    install_special_mapping skips security_file_mmap check.
    
    The install_special_mapping routine (used, for example, to setup the
    vdso) skips the security check before insert_vm_struct, allowing a local
    attacker to bypass the mmap_min_addr security restriction by limiting
    the available pages for special mappings.
    
    bprm_mm_init() also skips the check, and although I don't think this can
    be used to bypass any restrictions, I don't see any reason not to have
    the security check.
    
      $ uname -m
      x86_64
      $ cat /proc/sys/vm/mmap_min_addr
      65536
      $ cat install_special_mapping.s
      section .bss
          resb BSS_SIZE
      section .text
          global _start
          _start:
              mov     eax, __NR_pause
              int     0x80
      $ nasm -D__NR_pause=29 -DBSS_SIZE=0xfffed000 -f elf -o install_special_mapping.o install_special_mapping.s
      $ ld -m elf_i386 -Ttext=0x10000 -Tbss=0x11000 -o install_special_mapping install_special_mapping.o
      $ ./install_special_mapping &
      [1] 14303
      $ cat /proc/14303/maps
      0000f000-00010000 r-xp 00000000 00:00 0                                  [vdso]
      00010000-00011000 r-xp 00001000 00:19 2453665                            /home/taviso/install_special_mapping
      00011000-ffffe000 rwxp 00000000 00:00 0                                  [stack]
    
    It's worth noting that Red Hat are shipping with mmap_min_addr set to
    4096.
    
    Signed-off-by: Tavis Ormandy <taviso at google.com>
    Acked-by: Kees Cook <kees at ubuntu.com>
    Acked-by: Robert Swiecki <swiecki at google.com>
    [ Changed to not drop the error code - akpm ]
    Reviewed-by: James Morris <jmorris at namei.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 52f6c5ad430e41736133acac179607b224eaaa11
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Wed Dec 15 17:58:57 2010 +0800

    crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h
    
    Add missing header file:
    
    arch/x86/crypto/ghash-clmulni-intel_glue.c:256: error: implicit declaration of function 'IS_ERR'
    arch/x86/crypto/ghash-clmulni-intel_glue.c:257: error: implicit declaration of function 'PTR_ERR'
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

commit 0fcdcfbbc98f70f559e4b36773a69972489a6d8f
Merge: 6d5e93c2aa1248b25f9de0eaca1dca038e31d79d 2d64672ed38721b7a3815009d79bfb90a1f34a17
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 18:50:10 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
      workqueue: It is likely that WORKER_NOT_RUNNING is true
      MAINTAINERS: Add workqueue entry
      workqueue: check the allocation of system_unbound_wq

commit 6d5e93c2aa1248b25f9de0eaca1dca038e31d79d
Merge: 3d0b6087f3f2c88caef25e1455ff8db0816d4e11 589a594be1fb8815b3f18e517be696c48664f728
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 18:49:40 2010 -0800

    Merge branch 'for-linus' of git://neil.brown.name/md
    
    * 'for-linus' of git://neil.brown.name/md:
      md: protect against NULL reference when waiting to start a raid10.
      md: fix bug with re-adding of partially recovered device.
      md: fix possible deadlock in handling flush requests.
      md: move code in to submit_flushes.
      md: remove handling of flush_pending in md_submit_flush_data

commit 3d0b6087f3f2c88caef25e1455ff8db0816d4e11
Author: Major Lee <major_lee at wistron.com>
Date:   Fri Dec 10 10:13:49 2010 +0000

    dw_spi: Fix missing final read in some polling situations
    
    There is a possibility that the last word of a transaction will be lost
    if data is not ready.  Re-read in poll_transfer() to solve this issue
    when poll_mode is enabled.
    
    Verified on SPI touch screen device.
    
    Signed-off-by: Major Lee <major_lee at wistron.com>
    Signed-off-by: Alan Cox <alan at linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 54efdfeb49f03adfd0196935335890469ed314b9
Author: Alan Cox <alan at linux.intel.com>
Date:   Tue Dec 14 15:29:08 2010 +0000

    i2c_intel_mid: Fix slash in sysfs name
    
    This gets caught by the new sanity check code. Instead of the slash use a
    different symbol. This was originally found by Major Lee who proposed a
    rather more complex patch which changed the name according to the chip
    type.
    
    On the basis that we are in a late -rc and making Linus grumpy isn't always
    a good idea (however fun) this is a simple alternative.
    
    Signed-off-by: Alan Cox <alan at linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6d5c3aa84b3e431f2d0fc39c73c867d1a4dd8cff
Author: Aaro Koskinen <aaro.koskinen at nokia.com>
Date:   Tue Dec 14 21:45:31 2010 -0500

    ext4: fix typo which broke '..' detection in ext4_find_entry()
    
    There should be a check for the NUL character instead of '0'.
    
    Fortunately the only thing that cares about this is NFS serving, which
    is why we didn't notice this in the merge window testing.
    
    Reported-by: Phil Carmody <ext-phil.2.carmody at nokia.com>
    Signed-off-by: Aaro Koskinen <aaro.koskinen at nokia.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit dbd9fd63bdc7d73f3822a5e9dfaa6654e530518c
Merge: ec5d043f2809b9aaf14e6676ddb0dc8c3a6dc8de 21b6e4c7106b2d68a6710506d8706608272fd78b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 17:37:08 2010 -0800

    Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: wire up accept4 syscall (non-multiplexed path)
      sh: Enable deprecated IRQ chip APIs for MFD and GPIOLIB drivers.

commit ec5d043f2809b9aaf14e6676ddb0dc8c3a6dc8de
Merge: fc47e672ee2a8dfcde7673997c8b1e0cec38e2c9 c2015dc88a57090bcf67ab7cfcdbc34671598d36
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 17:36:35 2010 -0800

    Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks
      OMAP2+: PM/serial: fix console semaphore acquire during suspend
      OMAP1: SRAM: fix size for OMAP1611 SoCs
      arm: omap2: io: fix clk_get() error check
      arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check
      omap: nand: remove hardware ECC as default
      omap: zoom: wl1271 slot is MMC_CAP_POWER_OFF_CARD
      omap: PM debug: fix wake-on-timer debugfs dependency

commit fc47e672ee2a8dfcde7673997c8b1e0cec38e2c9
Merge: 478b2a34e7d496b0cc3ae7696362740f954c91ba 85b093bcc5322baa811a03ec73de0909c157f181
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 17:36:10 2010 -0800

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6535/1: V6 MPCore v6_dma_inv_range and v6_dma_flush_range RWFO fix
      ARM: 6534/1: Make CONFIG_FPE_NWFPE depend on !CONFIG_THUMB2_KERNEL
      ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6
      Change bcmring Maintainer list.
      ARM: Update mach-types
      ARM: 6528/1: Use CTR for the I-cache line size on ARMv7
      ARM: 6527/1: Use CTR instead of CCSIDR for the D-cache line size on ARMv7
      ARM: pxa/palm: fix ifdef around gen_nand driver registration
      ARM: pxa: fix pxa2xx-flash section mismatch
      ARM: mmp2: remove not used clk_rtc

commit 478b2a34e7d496b0cc3ae7696362740f954c91ba
Merge: b4fe2a03422e6bd20bd8df5e428109a85c9ea961 595a251c0740785fd3c0d2156d78578c7479811e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 17:34:00 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc: Write to prom console using indirect buffer.
      sparc: Delete prom_*getchar().
      sparc: Pass buffer pointer all the way down to prom_{get,put}char().
      sparc: Do not export prom_nb{get,put}char().
      sparc64: Delete prom_setcallback().
      sparc64: Unexport prom_service_exists().
      sparc: Kill prom devops_{32,64}.c
      sparc: Remove prom_pathtoinode()
      sparc64: Delete prom_puts() unused.
      SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the value of HZ

commit b4fe2a03422e6bd20bd8df5e428109a85c9ea961
Merge: 85cb7f1264c4d9e60ccdce52740238222e77ccd0 2a27a03d3a891e87ca33d27a858b4db734a4cbab
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 17:33:40 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (75 commits)
      pppoe.c: Fix kernel panic caused by __pppoe_xmit
      WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.
      bnx2x: Advance a version number to 1.60.01-0
      bnx2x: Fixed a compilation warning
      bnx2x: LSO code was broken on BE platforms
      qlge: Fix deadlock when cancelling worker.
      net: fix skb_defer_rx_timestamp()
      cxgb4vf: Ingress Queue Entry Size needs to be 64 bytes
      phy: add the IC+ IP1001 driver
      atm: correct sysfs 'device' link creation and parent relationships
      MAINTAINERS: remove me from tulip
      SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address
      enic: Bug Fix: Pass napi reference to the isr that services receive queue
      ipv6: fix nl group when advertising a new link
      connector: add module alias
      net: Document the kernel_recvmsg() function
      r8169: Fix runtime power management
      hso: IP checksuming doesn't work on GE0301 option cards
      xfrm: Fix xfrm_state_migrate leak
      net: Convert netpoll blocking api in bonding driver to be a counter
      ...

commit 85cb7f1264c4d9e60ccdce52740238222e77ccd0
Merge: 3373c3ddb26848beee7b8a96fb98d89533dbf9d7 7c03b87048f2467087ae7e51392e5fb57ea8f58b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 17:32:56 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF
      [SCSI] qla2xxx: Update version number to 8.03.05-k0.
      [SCSI] qla2xxx: Properly set the return value in qla2xxx_eh_abort function.
      [SCSI] qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts.
      [SCSI] qla2xxx: Change MSI initialization from using incorrect request_irq parameter.
      [SCSI] qla2xxx: Populate Command Type 6 LUN field properly.
      [SCSI] zfcp: Issue FCP command without holding SCSI host_lock
      [SCSI] zfcp: Prevent usage w/o holding a reference
      [SCSI] zfcp: No ERP escalation on gpn_ft eval
      [SCSI] zfcp: Correct false abort data assignment.
      [SCSI] zfcp: Fix common FCP request reception
      [SCSI] Eliminate error handler overload of the SCSI serial number
      [SCSI] pmcraid: disable msix and expand device config entry
      [SCSI] bsg: correct fault if queue object removed while dev_t open
      [SCSI] osd: checking NULL instead of ERR_PTR()

commit 3373c3ddb26848beee7b8a96fb98d89533dbf9d7
Merge: 3907969596091f429b7864cfe4e473a227876a96 8863ada9c47503bb93eba5e3a9ba88e6311db31f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 14:35:04 2010 -0800

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      kgdboc,input: Fix regression with keyboard release key and early debugging

commit 3907969596091f429b7864cfe4e473a227876a96
Merge: 66ef6aa63defa54b2c7e8edcc69e0641d2bb61ef 23437b5c50f523a87ca5c02fd883b069ca8be7f3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 14:33:33 2010 -0800

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI / PM: Do not save/restore NVS on Sony Vaio VGN-NW130D
      ACPI/HEST: adjust section selection
      ACPI: eliminate unused variable warning for !ACPI_SLEEP
      ACPI/PNP: avoid section mismatch warning
      ACPI thermal: remove two unused functions
      ACPI: fix a section mismatch
      ACPI, APEI, use raw spinlock in ERST
      ACPI: video: fix build for CONFIG_ACPI=n
      ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=n
      ACPI: fix allowing to add/remove multiple _OSI strings
      acpi: fix _OSI string setup regression
      ACPI: EC: Add another dmi match entry for MSI hardware
      ACPI battery: update status upon sysfs query
      ACPI ac: update AC status upon sysfs query
      ACPI / PM: Do not refcount power resources that can't be turned on
      ACPI / PM: Check device state before refcounting power resources

commit 66ef6aa63defa54b2c7e8edcc69e0641d2bb61ef
Merge: 1c00802d3f62769a88e46212fae6f38082d30731 56b9aea3b740be7665be100872a913da9bdc653b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 14:33:13 2010 -0800

    Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
    
    * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
      intel_idle: recognize ARAT on WSM-EX

commit 85b093bcc5322baa811a03ec73de0909c157f181
Author: Valentine Barshak <vbarshak at mvista.com>
Date:   Tue Dec 14 00:03:16 2010 +0100

    ARM: 6535/1: V6 MPCore v6_dma_inv_range and v6_dma_flush_range RWFO fix
    
    Cache ownership must be acquired by reading/writing data from the
    cache line to make cache operation have the desired effect on the
    SMP MPCore CPU. However, the ownership is never acquired in the
    v6_dma_inv_range function when cleaning the first line and
    flushing the last one, in case the address is not aligned
    to D_CACHE_LINE_SIZE boundary.
    Fix this by reading/writing data if needed, before performing
    cache operations.
    While at it, fix v6_dma_flush_range to prevent RWFO outside
    the buffer.
    
    Cc: stable at kernel.org
    Signed-off-by: Valentine Barshak <vbarshak at mvista.com>
    Signed-off-by: George G. Davis <gdavis at mvista.com>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 593c252a731389ffdd00d4cb2d20192c47aa18c1
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Dec 13 21:56:03 2010 +0100

    ARM: 6534/1: Make CONFIG_FPE_NWFPE depend on !CONFIG_THUMB2_KERNEL
    
    Because the nwfpe support is unlikely to be used on new platforms
    and requires CONFIG_OABI_COMPAT, which is not generally used with
    ARMv7+, we shouldn't expect to build nwfpe support into a Thumb-2
    kernel.
    
    At present, nwfpe contains assembly code which isn't Thumb-2
    compatible, and for now it doesn't appear useful to port this
    code.
    
    All ARMv7-A/R platforms necessarily have VFPv3 hardware floating-
    point natively, making emulation unnecessary.
    
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Acked-by: Nicolas Pitre <nicolas.pitre at linaro.org>
    Acked-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Dec 13 21:53:53 2010 +0100

    ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6
    
    This makes sense, because Thumb-2 code can't execute on plain
    ARMv6 processors.
    
    This will avoid accidentally configuring a broken kernel where the
    config otherwise would allow multiple architecture versions to
    coexist in the same kernel.
    
    Not adding !CPU_V5 etc., because the chance of anyone trying to
    put v5 and v7 in the same kernel is low, and I'm not aware of
    any mach which can do this.  These could be added later if it
    matters.
    
    Note that the rules may need to be refined if support for the
    ARM1156J(F)-S processor is later added to the kernel, since this
    processor supports the rare ARMv6T2 extensions, which add support
    for Thumb-2 and a few other ARMv7 features.
    
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Acked-by: Nicolas Pitre <nicolas.pitre at linaro.org>
    Acked-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit d6db46675dba21203378b6993068ec04bb53389c
Author: Jiandong Zheng <jdzheng at broadcom.com>
Date:   Tue Dec 14 21:55:49 2010 +0000

    Change bcmring Maintainer list.
    
    I am Jiandong Zheng working on BCMRING in Broadcom Canada Ltd. I am
    replacing Leo Chen (leochen at broadcom.com) as "ARM/BCMRING ARM
    ARCHITECTURE" and "ARM/BCMRING MTD NAND DRIVER" maintainer from
    Broadcom as he is no longer the maintainer of these components.
    
    Signed-off-by: Jiandong Zheng <jdzheng at broadcom.com>
    Acked-by: Scott Branden <sbranden at broadcom.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 1c00802d3f62769a88e46212fae6f38082d30731
Merge: dc99bf78238a7554578a319d8fd06655151121a3 e504b84805c574cf18d705c610c9e4a8f6e61017
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:37:12 2010 -0800

    Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
    
    * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
      fbdev: Fix fb_find_nearest_mode refresh comparison

commit dc99bf78238a7554578a319d8fd06655151121a3
Merge: 5d43a1de26f37080b75d7c0cf2a0b97523457568 0a6bf658c3b9d1d0e520d320b6392c8680c2e381
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:36:26 2010 -0800

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
      hwmon: (ltc4215) make sysfs file match the alarm cause

commit 5d43a1de26f37080b75d7c0cf2a0b97523457568
Merge: 7103b71b0ff6a5d8d71438e63dfc539a6f0a61bd 59a609d9b59be9452f168fe228befea53d5962ff
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:35:47 2010 -0800

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      dmaengine: at_hdmac: fix buffer transfer size specification
      fsldma: fix issue of slow dma
      dmaengine i.MX SDMA: initialize on module_init
      dma : EG20T PCH: Fix miss-setting DMA descriptor
      intel_mid_dma: fix section mismatch warnings
      dmaengine: imx-sdma: fix bug in buffer descriptor initialization
      drivers/dma/ppc4xx: Use printf extension %pR for struct resource
      drivers/dma/ioat: Use the ccflag-y instead of EXTRA_CFLAGS
      drivers/dma/: Use the ccflag-y instead of EXTRA_CFLAGS
      dma: intel_mid_dma: fix double free on mid_setup_dma error path
      dma: imx-dma: fix imxdma_probe error path

commit 7103b71b0ff6a5d8d71438e63dfc539a6f0a61bd
Merge: a49cd5f6e9035151c1a0ba1e27fe155f0b82f1d6 7182afea8d1afd432a17c18162cc3fd441d0da93
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:34:25 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB/uverbs: Handle large number of entries in poll CQ

commit a49cd5f6e9035151c1a0ba1e27fe155f0b82f1d6
Merge: 353495a5abcee1368a93f71b0e49390f96f24fb4 9993e0fe0f5f29c69e79efcb271ffc9843002985
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:33:52 2010 -0800

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI
      firewire: ohci: fix regression with VIA VT6315, disable MSI

commit 353495a5abcee1368a93f71b0e49390f96f24fb4
Merge: f9ae3e125ceb8226c94d7d0c640927fa8b7f256a 1b39ed0cf51193f3ba03044369ab4d144712a9b8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:33:21 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
      regulator: tps6586x: correct register table
      regulator: tps6586x: Handle both enable reg/bits being the same
      regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
      regulator: tps6586x: Add missing bit mask generation

commit f9ae3e125ceb8226c94d7d0c640927fa8b7f256a
Merge: 6371e82307237dede71f884ad8e8e11faa75e8be d70ab7f7ee0692efc880d772dc5c212174d67e3b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:32:40 2010 -0800

    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: Quirk for Dell Vostro 320 to make microphone work
      ALSA: hda - Reset sample sizes and max bitrates when reading ELD
      ALSA: hda - Always allow basic audio irrespective of ELD info
      ALSA: hda - Do not wrongly restrict min_channels based on ELD
      ASoC: Correct WM8962 interrupt mask register read
      ASoC: WM8580: Debug BCLK and sample size
      ASoC: Fix resource leak if soc_register_ac97_dai_link failed
      ASoC: Hold client_mutex while calling snd_soc_instantiate_cards()
      ASoC: Fix swap of left and right channels for WM8993/4 speaker boost gain
      ASoC: Fix off by one error in WM8994 EQ register bank size
      ALSA: hda: Use position_fix=1 for Acer Aspire 5538 to enable capture on internal mic
      ALSA: hda - Enable jack sense for Thinkpad Edge 13
      ALSA: hda - Fix ThinkPad T410[s] docking station line-out
      ALSA: hda: Use model=lg quirk for LG P1 Express to enable playback and capture

commit 6371e82307237dede71f884ad8e8e11faa75e8be
Merge: c3606c60a91969cc42c12bae71a022ca56de83d2 e726f3c368e7c1919a7166ec09c5705759f1a69d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:32:19 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      amd64_edac: Fix interleaving check
      EDAC: Correct MiB_TO_PAGES() macro
      EDAC: Fix workqueue-related crashes

commit c3606c60a91969cc42c12bae71a022ca56de83d2
Merge: d5f04ff5fba75e3e9607a65f46cfbfbdf8d69ce4 f3886f85cfde578f1d0ba6e40ac5f9d70043923b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:31:49 2010 -0800

    Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: don't apply 7xx HDP flush workaround on AGP
      drm: use after free in drm_queue_vblank_event()
      drm/kms: remove spaces from connector names (v2)

commit d5f04ff5fba75e3e9607a65f46cfbfbdf8d69ce4
Merge: 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd 8b0f1840a46449e1946fc88860ef3ec8d6b1c2c7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 13:31:23 2010 -0800

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (adm1026) Allow 1 as a valid divider value
      hwmon: (adm1026) Fix setting fan_div
      hwmon: (it87) Fix manual fan speed control on IT8721F

commit 1449032be17abb69116dbc393f67ceb8bd034f92
Author: Theodore Ts'o <tytso at mit.edu>
Date:   Tue Dec 14 15:27:50 2010 -0500

    ext4: Turn off multiple page-io submission by default
    
    Jon Nelson has found a test case which causes postgresql to fail with
    the error:
    
    psql:t.sql:4: ERROR: invalid page header in block 38269 of relation base/16384/16581
    
    Under memory pressure, it looks like part of a file can end up getting
    replaced by zero's.  Until we can figure out the cause, we'll roll
    back the change and use block_write_full_page() instead of
    ext4_bio_write_page().  The new, more efficient writing function can
    be used via the mount option mblk_io_submit, so we can test and fix
    the new page I/O code.
    
    To reproduce the problem, install postgres 8.4 or 9.0, and pin enough
    memory such that the system just at the end of triggering writeback
    before running the following sql script:
    
    begin;
    create temporary table foo as select x as a, ARRAY[x] as b FROM
    generate_series(1, 10000000 ) AS x;
    create index foo_a_idx on foo (a);
    create index foo_b_idx on foo USING GIN (b);
    rollback;
    
    If the temporary table is created on a hard drive partition which is
    encrypted using dm_crypt, then under memory pressure, approximately
    30-40% of the time, pgsql will issue the above failure.
    
    This patch should fix this problem, and the problem will come back if
    the file system is mounted with the mblk_io_submit mount option.
    
    Reported-by: Jon Nelson <jnelson at jamponi.net>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd
Merge: e13cf63f2bbd38721af557f0205da994ea068427 c1ac3ffcd0bc7e9617f62be8c7043d53ab84deac
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 11:09:05 2010 -0800

    Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
    
    * 'for-2.6.37' of git://linux-nfs.org/~bfields/linux:
      nfsd: Fix possible BUG_ON firing in set_change_info
      sunrpc: prevent use-after-free on clearing XPT_BUSY

commit e13cf63f2bbd38721af557f0205da994ea068427
Merge: 073f21ae1319348f4f8630003b7901e3be254327 83a50de97fe96aca82389e061862ed760ece2283
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 11:08:13 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: prevent RAID level downgrades when space is low
      Btrfs: account for missing devices in RAID allocation profiles
      Btrfs: EIO when we fail to read tree roots
      Btrfs: fix compiler warnings
      Btrfs: Make async snapshot ioctl more generic
      Btrfs: pwrite blocked when writing from the mmaped buffer of the same page
      Btrfs: Fix a crash when mounting a subvolume
      Btrfs: fix sync subvol/snapshot creation
      Btrfs: Fix page leak in compressed writeback path
      Btrfs: do not BUG if we fail to remove the orphan item for dead snapshots
      Btrfs: fixup return code for btrfs_del_orphan_item
      Btrfs: do not do fast caching if we are allocating blocks for tree_root
      Btrfs: deal with space cache errors better
      Btrfs: fix use after free in O_DIRECT

commit 073f21ae1319348f4f8630003b7901e3be254327
Merge: 497b5b13c9e946651991e0296374a15d38590ce1 7572777eef78ebdee1ecb7c258c0ef94d35bad16
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 11:07:39 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
      fuse: verify ioctl retries
      fuse: fix ioctl when server is 32bit

commit 497b5b13c9e946651991e0296374a15d38590ce1
Merge: e97b71ded9ebe527681961c9e6f5ba99f6711974 05340d4ab2ec2b6b4962c1c41c6ea8fb550f947b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 11:06:17 2010 -0800

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
    
    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: log timestamp changes to the source inode in rename

commit e97b71ded9ebe527681961c9e6f5ba99f6711974
Merge: 38971ce2fac484249d697fe48a9b0851a0b62572 1cd275f609ba46c8cae3ee77e499c54a0d13a983
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 11:02:15 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: fix ioctl magic
      ceph: Behave better when handling file lock replies.
      ceph: pass lock information by struct file_lock instead of as individual params.
      ceph: Handle file locks in replies from the MDS.
      ceph: avoid possible null deref in readdir after dir llseek

commit 38971ce2fac484249d697fe48a9b0851a0b62572
Merge: caa4a59574a39e6574664e82b92455d41eca27a8 5b362ac3799ff4225c40935500f520cad4d7ed66
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 08:51:12 2010 -0800

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFS: Fix panic after nfs_umount()
      nfs: remove extraneous and problematic calls to nfs_clear_request
      nfs: kernel should return EPROTONOSUPPORT when not support NFSv4
      NFS: Fix fcntl F_GETLK not reporting some conflicts
      nfs: Discard ACL cache on mode update
      NFS: Readdir cleanups
      NFS: nfs_readdir_search_for_cookie() don't mark as eof if cookie not found
      NFS: Fix a memory leak in nfs_readdir
      Call the filesystem back whenever a page is removed from the page cache
      NFS: Ensure we use the correct cookie in nfs_readdir_xdr_filler

commit caa4a59574a39e6574664e82b92455d41eca27a8
Merge: 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 545c988b2018a593f24d291b66776a0d08525acd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 14 08:49:15 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: remove bogus remapping of error in cifs_filldir()
      cifs: allow calling cifs_build_path_to_root on incomplete cifs_sb
      cifs: fix check of error return from is_path_accessable
      cifs: remove Local_System_Name
      cifs: fix use of CONFIG_CIFS_ACL
      cifs: add attribute cache timeout (actimeo) tunable

commit 2d64672ed38721b7a3815009d79bfb90a1f34a17
Author: Steven Rostedt <srostedt at redhat.com>
Date:   Fri Dec 3 23:12:33 2010 -0500

    workqueue: It is likely that WORKER_NOT_RUNNING is true
    
    Running the annotate branch profiler on three boxes, including my
    main box that runs firefox, evolution, xchat, and is part of the distcc farm,
    showed this with the likelys in the workqueue code:
    
     correct incorrect  %        Function                  File              Line
     ------- ---------  -        --------                  ----              ----
          96   996253  99 wq_worker_sleeping             workqueue.c          703
          96   996247  99 wq_worker_waking_up            workqueue.c          677
    
    The likely()s in this case were assuming that WORKER_NOT_RUNNING will
    most likely be false. But this is not the case. The reason is
    (and shown by adding trace_printks and testing it) that most of the time
    WORKER_PREP is set.
    
    In worker_thread() we have:
    
    	worker_clr_flags(worker, WORKER_PREP);
    
    	[ do work stuff ]
    
    	worker_set_flags(worker, WORKER_PREP, false);
    
    (that 'false' means not to wake up an idle worker)
    
    The wq_worker_sleeping() is called from schedule when a worker thread
    is putting itself to sleep. Which happens most of the time outside
    of that [ do work stuff ].
    
    The wq_worker_waking_up is called by the wakeup worker code, which
    is also callod outside that [ do work stuff ].
    
    Thus, the likely and unlikely used by those two functions are actually
    backwards.
    
    Remove the annotation and let gcc figure it out.
    
    Acked-by: Tejun Heo <tj at kernel.org>
    Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
    Signed-off-by: Tejun Heo <tj at kernel.org>

commit 3e6cd7a4b6a04cf354a18c9d2e7ecec8fa1772fb
Author: Tejun Heo <tj at kernel.org>
Date:   Fri Dec 10 17:20:23 2010 +0100

    MAINTAINERS: Add workqueue entry
    
    Signed-off-by: Tejun Heo <tj at kernel.org>

commit e504b84805c574cf18d705c610c9e4a8f6e61017
Author: Andrew Kephart <andrew.kephart at alereon.com>
Date:   Mon Dec 13 09:46:34 2010 -0600

    fbdev: Fix fb_find_nearest_mode refresh comparison
    
    Refresh rate nearness is not calculated or reset when nearest resolution
    changes.
    
    This patch resets the refresh rate differential measurement whenever a
    new nearest resolution is discovered.  This fixes two error cases;
    first, wherein the first mode's refresh rate differential is never
    calculated and second, when the closest refresh rate from a previous
    nearest resolution is erroneously preserved.
    
    Signed-off-by: Andrew Kephart <andrew.kephart at alereon.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 21b6e4c7106b2d68a6710506d8706608272fd78b
Author: Carmelo AMOROSO <carmelo.amoroso at st.com>
Date:   Mon Dec 13 10:20:26 2010 +0000

    sh: wire up accept4 syscall (non-multiplexed path)
    
    Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 59a609d9b59be9452f168fe228befea53d5962ff
Author: Nicolas Ferre <nicolas.ferre at atmel.com>
Date:   Mon Dec 13 13:48:41 2010 +0100

    dmaengine: at_hdmac: fix buffer transfer size specification
    
    Buffer transfer size is the number of transfers to be performed in
    relation with the width of the _source_ interface.
    So in the DMA_FROM_DEVICE case, it should be the register width that
    should be taken into account.
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit 8863ada9c47503bb93eba5e3a9ba88e6311db31f
Author: Jason Wessel <jason.wessel at windriver.com>
Date:   Wed Dec 1 13:01:01 2010 -0600

    kgdboc,input: Fix regression with keyboard release key and early debugging
    
    The commit 111c182340cd22e238ab1cc6564df336c6ebd7cb (kgdboc: reset
    input devices (keyboards) when exiting debugger) introduced a
    regression in early debugging such that you get a kernel oops on
    continue (with the go command) if you boot a kernel with:
    
        earlyprintk=vga ekgdboc=kbd kgdbwait
    
    The restore kgdboc_restore_input() routine schedules work for the
    purpose of sending key release events for any keys that were in the
    depressed state prior to entering the kernel debugger.  A simple fix
    to the crash is to not invoke the schedule_work() if the kernel
    system_state is anything other than SYSTEM_RUNNING.
    
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
    Acked-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>
    Reviewed-by: Sergei Shtylyov <sshtylyov at mvista.com>

commit 23437b5c50f523a87ca5c02fd883b069ca8be7f3
Merge: 6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290 291a73c9be15f12046a7291ec0bf7176a58d4f14
Author: Len Brown <len.brown at intel.com>
Date:   Mon Dec 13 22:40:54 2010 -0500

    Merge branch 'bugzilla-23002' into release

commit 291a73c9be15f12046a7291ec0bf7176a58d4f14
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date:   Sun Dec 12 21:10:42 2010 +0100

    ACPI / PM: Do not save/restore NVS on Sony Vaio VGN-NW130D
    
    The saving of the NVS memory area during suspend and restoring it
    during resume causes problems to appear on Sony Vaio VGN-NW130D, so
    blacklist that machine to avoid those problems.
    
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=23002
    
    Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
    Reported-and-tested-by: Adriano <adriano.vilela at yahoo.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 83a50de97fe96aca82389e061862ed760ece2283
Author: Chris Mason <chris.mason at oracle.com>
Date:   Mon Dec 13 15:06:46 2010 -0500

    Btrfs: prevent RAID level downgrades when space is low
    
    The extent allocator has code that allows us to fill
    allocations from any available block group, even if it doesn't
    match the raid level we've requested.
    
    This was put in because adding a new drive to a filesystem
    made with the default mkfs options actually upgrades the metadata from
    single spindle dup to full RAID1.
    
    But, the code also allows us to allocate from a raid0 chunk when we
    really want a raid1 or raid10 chunk.  This can cause big trouble because
    mkfs creates a small (4MB) raid0 chunk for data and metadata which then
    goes unused for raid1/raid10 installs.
    
    The allocator will happily wander in and allocate from that chunk when
    things get tight, which is not correct.
    
    The fix here is to make sure that we provide duplication when the
    caller has asked for it.  It does all the dups to be any raid level,
    which preserves the dup->raid1 upgrade abilities.
    
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit cd02dca56442e1504fd6bc5b96f7f1870162b266
Author: Chris Mason <chris.mason at oracle.com>
Date:   Mon Dec 13 14:56:23 2010 -0500

    Btrfs: account for missing devices in RAID allocation profiles
    
    When we mount in RAID degraded mode without adding a new device to
    replace the failed one, we can end up using the wrong RAID flags for
    allocations.
    
    This results in strange combinations of block groups (raid1 in a raid10
    filesystem) and corruptions when we try to allocate blocks from single
    spindle chunks on drives that are actually missing.
    
    The first device has two small 4MB chunks in it that mkfs creates and
    these are usually unused in a raid1 or raid10 setup.  But, in -o degraded,
    the allocator will fall back to these because the mask of desired raid groups
    isn't correct.
    
    The fix here is to count the missing devices as we build up the list
    of devices in the system.  This count is used when picking the
    raid level to make sure we continue using the same levels that were
    in place before we lost a drive.
    
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit f3c677b997757326e1f29d33060719a6a5091950
Author: Forrest Shi <b29237 at freescale.com>
Date:   Thu Dec 9 16:14:04 2010 +0800

    fsldma: fix issue of slow dma
    
    Fixed fsl dma slow issue by initializing dma mode register with
    bandwidth control. It boosts dma performance and should works
    with 85xx board.
    
    Signed-off-by: Forrest Shi <b29237 at freescale.com>
    Signed-off-by: Li Yang <leoli at freescale.com>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit 68433b73b104bff388aac376631d32abbbd872b0
Author: Chris Mason <chris.mason at oracle.com>
Date:   Mon Dec 13 14:47:58 2010 -0500

    Btrfs: EIO when we fail to read tree roots
    
    If we just get a plain IO error when we read tree roots, the code
    wasn't properly sending that error up the chain.  This allowed mounts to
    continue when they should failed, and allowed operations
    on partially setup root structs.  The end result was usually oopsen
    on spinlocks that hadn't been spun up correctly.
    
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 0a6bf658c3b9d1d0e520d320b6392c8680c2e381
Author: Ira W. Snyder <iws at ovro.caltech.edu>
Date:   Mon Dec 13 11:42:30 2010 -0500

    hwmon: (ltc4215) make sysfs file match the alarm cause
    
    The ltc4215 driver used the chip's "power good" status bit to provide
    the power1_alarm file. This is wrong: the chip is really reporting the
    status of one of the monitored voltages.
    
    Change the sysfs file from power1_alarm to in2_min_alarm instead. This
    matches the voltage that the chip is raising an alarm for.
    
    Signed-off-by: Ira W. Snyder <iws at ovro.caltech.edu>
    Signed-off-by: Guenter Roeck <guenter.roeck at ericsson.com>

commit 80fbf8382e110656ea67327300f16cfd2488a9bf
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Mon Dec 13 14:59:51 2010 +0900

    sh: Enable deprecated IRQ chip APIs for MFD and GPIOLIB drivers.
    
    There are still quite a number of MFD and GPIO expander drivers that are
    using the old irq_chip APIs that haven't had a chance to update during
    the .37 cycle, resulting in allyes/modconfig errors on some
    configurations.
    
    Mark Brown has done most of the legwork to get these fixed up in .38,
    so this should just be a .37 stop-gap that we can drop at the end of the
    .38 merge window.
    
    Reported-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 819c1a651fec6b370211609ce6eceefd20cf31e4
Merge: 440e2e4759805437f89f7eda78de72cb46729d04 9f1ee150fc7039eb65039ab17d9a95dfa6250133
Author: Russell King <rmk+kernel at arm.linux.org.uk>
Date:   Sun Dec 12 23:45:39 2010 +0000

    Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

commit 440e2e4759805437f89f7eda78de72cb46729d04
Author: Russell King <rmk+kernel at arm.linux.org.uk>
Date:   Sun Dec 12 23:24:28 2010 +0000

    ARM: Update mach-types
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit da30e0ac0f9a521f0cfec8145ddd1ad131f66d61
Author: Catalin Marinas <catalin.marinas at arm.com>
Date:   Tue Dec 7 16:56:29 2010 +0100

    ARM: 6528/1: Use CTR for the I-cache line size on ARMv7
    
    The current implementation of the v7_coherent_*_range function assumes
    that the D and I cache lines have the same size, which is incorrect
    architecturally. This patch adds the icache_line_size macro which reads
    the CTR register. The main loop in v7_coherent_*_range is split in two
    independent loops or the D and I caches. This also has the performance
    advantage that the DSB is moved outside the main loop.
    
    Reported-by: Kevin Sapp <ksapp at quicinc.com>
    Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit f91e2c3bd427239c198351f44814dd39db91afe0
Author: Catalin Marinas <catalin.marinas at arm.com>
Date:   Tue Dec 7 16:52:04 2010 +0100

    ARM: 6527/1: Use CTR instead of CCSIDR for the D-cache line size on ARMv7
    
    The current implementation of the dcache_line_size macro reads the L1
    cache size from the CCSIDR register. This, however, is not guaranteed to
    be the smallest cache line in the cache hierarchy. The patch changes to
    the macro to use the more architecturally correct CTR register.
    
    Reported-by: Kevin Sapp <ksapp at quicinc.com>
    Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 2a27a03d3a891e87ca33d27a858b4db734a4cbab
Author: Andrej Ota <andrej at ota.si>
Date:   Sun Dec 12 15:06:16 2010 -0800

    pppoe.c: Fix kernel panic caused by __pppoe_xmit
    
    __pppoe_xmit function return value was invalid resulting in
    additional call to kfree_skb on already freed skb. This resulted in
    memory corruption and consequent kernel panic after PPPoE peer
    terminated the link.
    
    This fixes commit 55c95e738da85373965cb03b4f975d0fd559865b.
    
    Reported-by: Gorik Van Steenberge <gvs at zemos.net>
    Reported-by: Daniel Kenzelmann <kernel.bugzilla at kenzelmann.dyndns.info>
    Reported-by: Denys Fedoryshchenko <nuclearcat at nuclearcat.com>
    Reported-by: Pawel Staszewski <pstaszewski at artcom.pl>
    Diagnosed-by: Andrej Ota <andrej at ota.si>
    Diagnosed-by: Eric Dumazet <eric.dumazet at gmail.com>
    Tested-by: Denys Fedoryshchenko <nuclearcat at nuclearcat.com>
    Tested-by: Pawel Staszewski <pstaszewski at artcom.pl>
    Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
    Signed-off-by: Andrej Ota <andrej at ota.si>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit eaff9453d3e2b63969af93e9d42a85e803060121
Author: Krzysztof Halasa <khc at pm.waw.pl>
Date:   Sun Dec 12 12:06:47 2010 +0000

    WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.
    
    We must not wake the TX queue without free TX descriptors.
    sca_xmit() expects at least one free descriptor and BUGs otherwise.
    
    Problem reported and fix tested by Bernie Innocenti and Ward Vandewege.
    
    Signed-off-by: Krzysztof Hałasa <khc at pm.waw.pl>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 9f5449611c9d6d7bdcae8020a197d8b4d9b6443c
Author: Vladislav Zolotarov <vladz at broadcom.com>
Date:   Sun Dec 12 04:12:29 2010 +0000

    bnx2x: Advance a version number to 1.60.01-0
    
    Signed-off-by: Vladislav Zolotarov <vladz at broadcom.com>
    Signed-off-by: Eilon Greenstein <eilong at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 372e43eb2fc34001250e27d63f99c20e46ea58a7
Author: Vladislav Zolotarov <vladz at broadcom.com>
Date:   Sun Dec 12 04:12:12 2010 +0000

    bnx2x: Fixed a compilation warning
    
    bnx2x_src_init_t2() is used only when BCM_CNIC is defined.
    So, to avoid a compilation warning, we won't define it unless
    BCM_CNIC is defined.
    
    Signed-off-by: Vladislav Zolotarov <vladz at broadcom.com>
    Signed-off-by: Eilon Greenstein <eilong at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 099978b434d4924594516db540ccc50652e7cc94
Author: Vladislav Zolotarov <vladz at broadcom.com>
Date:   Sun Dec 12 04:11:45 2010 +0000

    bnx2x: LSO code was broken on BE platforms
    
    Make the LSO code work on BE platforms: parsing_data field of
    a parsing BD (PBD) for 57712 was improperly composed which made FW read wrong
    values for TCP header's length and offset and, as a result, the corresponding
    PCI device was performing bad DMA reads triggering EEH.
    
    Signed-off-by: Vladislav Zolotarov <vladz at broadcom.com>
    Signed-off-by: Eilon Greenstein <eilong at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 4d7b6b5d247aa71ea27709b9eac1ba6e752fbe87
Author: Ron Mercer <ron.mercer at qlogic.com>
Date:   Sat Dec 11 11:06:50 2010 +0000

    qlge: Fix deadlock when cancelling worker.
    
    Removing usage of rtnl_lock() to protect firmware interface registers.
    These registers are accessed in some worker threads and can create a
    deadlock if rtnl_lock is taken by upper layers while the worker is still
    pending.
    We remove rtnl_lock and use a driver mutex just while mailboxes are
    accessed.
    
    Signed-off-by: Ron Mercer <ron.mercer at qlogic.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 36eac2130cdbac08606bb2c05775e52ab79b163c
Merge: a19faf0250e09b16cac169354126404bc8aa342b e4dde731ae70072338352c6f8fb75fd04a42cf8d
Author: David S. Miller <davem at davemloft.net>
Date:   Sun Dec 12 14:16:51 2010 -0800

    Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

commit 9993e0fe0f5f29c69e79efcb271ffc9843002985
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date:   Tue Dec 7 20:32:40 2010 +0100

    firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI
    
    Agere FW643 rev 06, listed as "11c1:5901 (rev 06) (prog-if 10 [OHCI])",
    produced SBP-2 I/O errors since kernel 2.6.36.  Disabling MSI fixes it.
    
    Since MSI work on Agere FW643-E (same vendor and device ID, but rev 07),
    introduce a device revision field into firewire-ohci's quirks list so
    that different quirks can be defined for older and newer revisions.
    
    Reported-by: Jonathan Isom <jeisom at gmail.com>
    Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
    Cc: <stable at kernel.org> # 2.6.36.y

commit af0cdf4947818becfe209610b209315578645ab4
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date:   Tue Dec 7 19:16:02 2010 +0100

    firewire: ohci: fix regression with VIA VT6315, disable MSI
    
    "VIA Technologies, Inc. VT6315 Series Firewire Controller [1106:3403]"
    does not generate any interrupts if Message Signaled Interrupts were
    enabled.  This is a regression since kernel 2.6.36 in which MSI support
    was added to firewire-ohci.  Hence blacklist MSI on all VIA controllers.
    
    Reported-by: Robin Cook <rcook at wyrms.net>
    Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
    Cc: <stable at kernel.org> # 2.6.36.y

commit 6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290
Merge: a5dc4f898c2a0f66e2cefada6c687db82ba2fcbc 3138b32d5e0998ba3cbd1c74bdc1887d74c5279b 12b3b5afed67e08aa641d30e57df20dab2e33432 bec4f22a2dbd5a26079cbddbcadf38f8c7e5381f 12d3206466d2074ef0684aaf7759ae01a0a92560
Author: Len Brown <len.brown at intel.com>
Date:   Sat Dec 11 02:02:02 2010 -0500

    Merge branches 'bugzilla-15418', 'bugzilla-21722', 'bugzilla-22932', 'misc-2.6.37' and 'osi-regression' into release

commit bec4f22a2dbd5a26079cbddbcadf38f8c7e5381f
Author: Jan Beulich <JBeulich at novell.com>
Date:   Tue Dec 7 14:58:44 2010 +0000

    ACPI/HEST: adjust section selection
    
    Properly const-, __init-, and __read_mostly-annotate this code.
    
    Signed-off-by: Jan Beulich <jbeulich at novell.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 091aad6af4ab29af693ced5d6970ceee9d5981c8
Author: Jan Beulich <JBeulich at novell.com>
Date:   Tue Dec 7 14:52:25 2010 +0000

    ACPI: eliminate unused variable warning for !ACPI_SLEEP
    
    Signed-off-by: Jan Beulich <jbeulich at novell.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 66c3ec4f1f70ee87833363166b594855631d7ba6
Author: Jan Beulich <JBeulich at novell.com>
Date:   Tue Dec 7 15:05:49 2010 +0000

    ACPI/PNP: avoid section mismatch warning
    
    Signed-off-by: Jan Beulich <jbeulich at novell.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit b9047599695ae835252ba3d6a19eada98c19dc89
Author: Zhang Rui <rui.zhang at intel.com>
Date:   Wed Dec 8 10:40:26 2010 +0800

    ACPI thermal: remove two unused functions
    
    When CONFIG_CPU_FREQ=n ...
    
    drivers/acpi/processor_thermal.c:159:12: warning: ‘acpi_thermal_cpufreq_increase’ defined but not used
    drivers/acpi/processor_thermal.c:163:12: warning: ‘acpi_thermal_cpufreq_decrease’ defined but not used
    
    Remove unused declaration of ‘acpi_thermal_cpufreq_increase’ and
    ‘acpi_thermal_cpufreq_decrease’
    
    Signed-off-by: Zhang Rui <rui.zhang at intel.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 32d47eeff05981bfb89a95747eb182bc12630d58
Author: Zhang Rui <rui.zhang at intel.com>
Date:   Wed Dec 8 10:40:36 2010 +0800

    ACPI: fix a section mismatch
    
    WARNING: drivers/acpi/acpi.o(.text+0xeda): Section mismatch in reference from the function acpi_os_initialize1() to the function .init.text:set_osi_linux()
    
    The function acpi_os_initialize1() references
    the function __init set_osi_linux().
    
    Signed-off-by: Zhang Rui <rui.zhang at intel.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 3b38bb5f7f06356a89bb2cbf92ad346025e95192
Author: Huang Ying <ying.huang at intel.com>
Date:   Thu Dec 2 10:40:53 2010 +0800

    ACPI, APEI, use raw spinlock in ERST
    
    ERST writing may be used in NMI or Machine Check Exception handler. So
    it need to use raw spinlock instead of normal spinlock.  This patch
    fixes it.
    
    Signed-off-by: Huang Ying <ying.huang at intel.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit b72512ed706efb26087fcbbc5f98ed64ac1230d5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 5 14:51:49 2010 +0100

    ACPI: video: fix build for CONFIG_ACPI=n
    
    In file included from drivers/gpu/drm/i915/intel_opregion.c:30:
    include/acpi/video.h:22: warning: ‘struct acpi_device’ declared inside parameter list
    ...
    include/acpi/video.h:24: error: ‘ENODEV’ undeclared (first use in this function)
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 3353bebe7c89725ab2f476b9d8d618259402d52e
Author: Len Brown <len.brown at intel.com>
Date:   Tue Nov 30 18:21:46 2010 -0500

    ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=n
    
    drivers/built-in.o: In function `acpi_video_bus_put_devices':
    video.c:(.text+0x79663): undefined reference to
    `video_output_unregister'
    drivers/built-in.o: In function `acpi_video_bus_add':
    video.c:(.text+0x7b0b3): undefined reference to `video_output_register'
    
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 12d3206466d2074ef0684aaf7759ae01a0a92560
Author: Lin Ming <ming.m.lin at intel.com>
Date:   Thu Dec 9 16:51:06 2010 +0800

    ACPI: fix allowing to add/remove multiple _OSI strings
    
    commit b0ed7a91(ACPICA/ACPI: Add new host interfaces for _OSI suppor)
    introduced another regression that only one _OSI string can be added or
    removed.
    
    Now multiple _OSI strings can be added or removed, for example
    
    acpi_osi=Linux acpi_osi=FreeBSD acpi_osi="!Windows 2006"
    
    Signed-off-by: Lin Ming <ming.m.lin at intel.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit d90aa92c0c1625d7f02050e4d2924805840cda3d
Author: Lin Ming <ming.m.lin at intel.com>
Date:   Thu Dec 9 16:50:52 2010 +0800

    acpi: fix _OSI string setup regression
    
    commit b0ed7a91(ACPICA/ACPI: Add new host interfaces for _OSI suppor)
    introduced a regression that _OSI string setup fails.
    
    There are 2 paths to setup _OSI string.
    
    DMI:
    acpi_dmi_osi_linux -> set_osi_linux -> acpi_osi_setup -> copy _OSI
    string to osi_setup_string
    
    Boot command line:
    acpi_osi_setup -> copy _OSI string to osi_setup_string
    
    Later, acpi_osi_setup_late will be called to handle osi_setup_string.
    If _OSI string is "Linux" or "!Linux", then the call path is,
    
    acpi_osi_setup_late -> acpi_cmdline_osi_linux -> set_osi_linux ->
    acpi_osi_setup -> copy _OSI string to osi_setup_string
    
    This actually never installs _OSI string(acpi_install_interface not
    called), but just copy the _OSI string to osi_setup_string.
    
    This patch fixes the regression.
    
    Reported-and-tested-by: Lukas Hejtmanek <xhejtman at ics.muni.cz>
    Signed-off-by: Lin Ming <ming.m.lin at intel.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit c2015dc88a57090bcf67ab7cfcdbc34671598d36
Author: Paul Walmsley <paul at pwsan.com>
Date:   Mon Dec 6 20:52:40 2010 +0000

    OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks
    
    After Charu's GPIO hwmod patches, GPIO initialization on N800 emits
    the following messages for all GPIO banks:
    
    omap_hwmod: gpio1: cannot be enabled (3)
    
    This is due to OMAP24XX_ST_GPIOS_SHIFT being defined as a bitmask.
    Fix this and also fix two other macros that had the same problem.
    
    Thanks to Tony Lindgren <tony at atomide.com> for originally reporting
    this bug.
    
    Signed-off-by: Paul Walmsley <paul at pwsan.com
    Cc: Charulatha Varadarajan <charu at ti.com>
    Signed-off-by: Tony Lindgren <tony at atomide.com>

commit a19faf0250e09b16cac169354126404bc8aa342b
Author: Eric Dumazet <eric.dumazet at gmail.com>
Date:   Sun Dec 5 18:50:32 2010 +0000

    net: fix skb_defer_rx_timestamp()
    
    After commit c1f19b51d1d8 (net: support time stamping in phy devices.),
    kernel might crash if CONFIG_NETWORK_PHY_TIMESTAMPING=y and
    skb_defer_rx_timestamp() handles a packet without an ethernet header.
    
    Fixes kernel bugzilla #24102
    
    Reference: https://bugzilla.kernel.org/show_bug.cgi?id=24102
    Reported-and-tested-by: Andrew Watts <akwatts at ymail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c710245caa41060e983cc9cb5ffcc020e02ca45f
Author: Casey Leedom <leedom at chelsio.com>
Date:   Thu Dec 9 09:38:24 2010 +0000

    cxgb4vf: Ingress Queue Entry Size needs to be 64 bytes
    
    Was using L1_CACHE_BYTES for the Ingress Queue Entry Size but it really
    needs to be 64 bytes in order to support the largest message sizes.
    
    Signed-off-by: Casey Leedom <leedom at chelsio.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 377ecca9ba6d98f31517e2322075e94d1be94561
Author: Giuseppe CAVALLARO <peppe.cavallaro at st.com>
Date:   Wed Dec 8 23:05:13 2010 +0000

    phy: add the IC+ IP1001 driver
    
    This patch adds the IC+ IP1001 (Gigabit Ethernet Transceiver) driver.
    I've had to add an additional delay (2ns) to adjust RX clock phase at
    GMII/ RGMII interface (according to the PHY data-sheet). This helps to
    have the RGMII working on some ST platforms.
    
    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro at st.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit d9ca676bcb26e1fdff9265a3e70f697cd381c889
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Dec 8 19:40:47 2010 +0000

    atm: correct sysfs 'device' link creation and parent relationships
    
    The ATM subsystem was incorrectly creating the 'device' link for ATM
    nodes in sysfs.  This led to incorrect device/parent relationships
    exposed by sysfs and udev.  Instead of rolling the 'device' link by hand
    in the generic ATM code, pass each ATM driver's bus device down to the
    sysfs code and let sysfs do this stuff correctly.
    
    Signed-off-by: Dan Williams <dcbw at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit fb890ae7d615f4b4f5689144b6832230ab2046aa
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Thu Dec 9 09:50:08 2010 +0000

    MAINTAINERS: remove me from tulip
    
    It was a nice idea, but -ENOTIME and -ENOHW. I never got around to doing
    a lot of the clean up that I intended to.
    
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
    Acked-by: Grant Grundler <grundler at parisc-linux.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 40a010395cd66053f07bffeb3da5e44683bac30e
Author: Wei Yongjun <yjwei at cn.fujitsu.com>
Date:   Tue Dec 7 17:11:09 2010 +0000

    SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address
    
    SCTP_SET_PEER_PRIMARY_ADDR does not accpet v4mapped address, using
    v4mapped address in SCTP_SET_PEER_PRIMARY_ADDR socket option will
    get -EADDRNOTAVAIL error if v4map is enabled. This patch try to
    fix it by mapping v4mapped address to v4 address if allowed.
    
    Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
    Acked-by: Vlad Yasevich <vladislav.yasevich at hp.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 79aeec5822cea63cf732bbc0c9f3337542352616
Author: Vasanthy Kolluri <vkolluri at cisco.com>
Date:   Wed Dec 8 13:05:45 2010 +0000

    enic: Bug Fix: Pass napi reference to the isr that services receive queue
    
    Pass reference to napi instead of enic device to the isr that services receive queue.
    
    Signed-off-by: Vasanthy Kolluri <vkolluri at cisco.com>
    Signed-off-by: Roopa Prabhu <roprabhu at cisco.com>
    Signed-off-by: David Wang <dwang2 at cisco.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3dd1462e82bcab7625cec129952f26dae7a8b742
Author: Jan Beulich <jbeulich at novell.com>
Date:   Tue Dec 7 14:54:09 2010 +0000

    Btrfs: fix compiler warnings
    
    ... regarding an unused function when !MIGRATION, and regarding a
    printk() format string vs argument mismatch.
    
    Signed-off-by: Jan Beulich <jbeulich at novell.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit fdfb1e4f6c61477a61890b64974d65cdc3a98702
Author: Li Zefan <lizf at cn.fujitsu.com>
Date:   Fri Dec 10 06:41:56 2010 +0000

    Btrfs: Make async snapshot ioctl more generic
    
    If we had reserved some bytes in struct btrfs_ioctl_vol_args, we
    wouldn't have to create a new structure for async snapshot creation.
    
    Here we convert async snapshot ioctl to use a more generic ABI, as
    we'll add more ioctls for snapshots/subvolumes in the future, readonly
    snapshots for example.
    
    Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 914ee295af418e936ec20a08c1663eaabe4cd07a
Author: Xin Zhong <xin.zhong at intel.com>
Date:   Thu Dec 9 09:30:14 2010 +0000

    Btrfs: pwrite blocked when writing from the mmaped buffer of the same page
    
    This problem is found in meego testing:
    http://bugs.meego.com/show_bug.cgi?id=6672
    A file in btrfs is mmaped and the mmaped buffer is passed to pwrite to write to the same page
    of the same file. In btrfs_file_aio_write(), the pages is locked by prepare_pages(). So when
    btrfs_copy_from_user() is called, page fault happens and the same page needs to be locked again
    in filemap_fault(). The fix is to move iov_iter_fault_in_readable() before prepage_pages() to make page
    fault happen before pages are locked. And also disable page fault in critical region in
    btrfs_copy_from_user().
    
    Reviewed-by: Yan, Zheng<zheng.z.yan at intel.com>
    Signed-off-by: Zhong, Xin <xin.zhong at intel.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit f106e82caaa0d943e47cacc184f5b40d538e0044
Author: Li Zefan <lizf at cn.fujitsu.com>
Date:   Tue Dec 7 01:51:26 2010 +0000

    Btrfs: Fix a crash when mounting a subvolume
    
    We should drop dentry before deactivating the superblock, otherwise
    we can hit this bug:
    
    BUG: Dentry f349a690{i=100,n=/} still in use (1) [unmount of btrfs loop1]
    ...
    
    Steps to reproduce the bug:
    
      # mount /dev/loop1 /mnt
      # mkdir save
      # btrfs subvolume snapshot /mnt save/snap1
      # umount /mnt
      # mount -o subvol=save/snap1 /dev/loop1 /mnt
      (crash)
    
    Reported-by: Michael Niederle <mniederle at gmx.at>
    Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 75eaa0e22c055e38982df267d0f84cc510ba38bf
Author: Sage Weil <sage at newdream.net>
Date:   Fri Dec 10 00:36:28 2010 +0000

    Btrfs: fix sync subvol/snapshot creation
    
    We were incorrectly taking the async path even for the sync ioctls by
    passing in &transid unconditionally.
    
    There's ample room for further cleanup here, but this keeps the fix simple.
    
    Signed-off-by: Sage Weil <sage at newdream.net>
    Reviewed-by: Li Zefan <lizf at cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 24ae63656a165c870c0d69fcc8aac1dc35e25e34
Author: Yan, Zheng <zheng.z.yan at linux.intel.com>
Date:   Mon Dec 6 07:02:36 2010 +0000

    Btrfs: Fix page leak in compressed writeback path
    
    "start + num_bytes >= actual_end" can happen when compressed page writeback races
    with file truncation. In that case we need unlock and release pages past the end
    of file.
    
    Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 84cd948cb11041f205242de457e680b9bb872a36
Author: Josef Bacik <josef at redhat.com>
Date:   Wed Dec 8 12:24:01 2010 -0500

    Btrfs: do not BUG if we fail to remove the orphan item for dead snapshots
    
    Not being able to delete an orphan item isn't a horrible thing.  The worst that
    happens is the next time around we try and do the orphan cleanup and we can't
    find the referenced object and just delete the item and move on.
    
    Signed-off-by: Josef Bacik <josef at redhat.com>

commit e91db5cd6f2203ef2a93ce8770f2728e9107c4f7
Merge: 5f75a1042feca37c0a436ba42a4b1f7f75c35778 0a54917c3fc295cb61f3fb52373c173fd3b69f48
Author: David S. Miller <davem at davemloft.net>
Date:   Fri Dec 10 12:51:02 2010 -0800

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 5f75a1042feca37c0a436ba42a4b1f7f75c35778
Author: Nicolas Dichtel <nicolas.dichtel at 6wind.com>
Date:   Tue Dec 7 23:38:31 2010 +0000

    ipv6: fix nl group when advertising a new link
    
    New idev are advertised with NL group RTNLGRP_IPV6_IFADDR, but
    should use RTNLGRP_IPV6_IFINFO.
    Bug was introduced by commit 8d7a76c9.
    
    Signed-off-by: Wang Xuefu <xuefu.wang at 6wind.com>
    Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com>
    Acked-by: Thomas Graf <tgraf at infradead.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3700c3c2934467d53d443682f020cc5c1f75f1f2
Author: Stephen Hemminger <shemminger at vyatta.com>
Date:   Fri Dec 10 12:27:49 2010 -0800

    connector: add module alias
    
    Since connector can be built as a module and uses netlink socket
    to communicate. The module should have an alias to autoload when socket
    of NETLINK_CONNECTOR type is requested.
    
    Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
    Acked-by: Evgeniy Polyakov <zbr at ioremap.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c1249c0aae4c93a753c70496ab2e9a51430a6f02
Author: Martin Lucina <mato at kotelna.sk>
Date:   Fri Dec 10 00:04:05 2010 +0000

    net: Document the kernel_recvmsg() function
    
    Signed-off-by: Martin Lucina <mato at kotelna.sk>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e4fbce740f078bbc925ba5c86648d9c883968479
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date:   Wed Dec 8 15:32:14 2010 +0000

    r8169: Fix runtime power management
    
    I noticed that one of the post-2.6.36 patches broke runtime PM of the
    r8169 on my MSI Wind test machine in such a way that the link was not
    brought up after reconnecting the network cable.
    
    In the process of debugging the issue I realized that we only should
    invoke the runtime PM functions in rtl8169_check_link_status() when
    link change is reported and if we do so, the problem goes away.
    Moreover, this allows rtl8169_runtime_idle() to be simplified quite
    a bit.
    
    Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
    Acked-by: Francois Romieu <romieu at fr.zoreil.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 5b362ac3799ff4225c40935500f520cad4d7ed66
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Fri Dec 10 12:31:14 2010 -0500

    NFS: Fix panic after nfs_umount()
    
    After a few unsuccessful NFS mount attempts in which the client and
    server cannot agree on an authentication flavor both support, the
    client panics.  nfs_umount() is invoked in the kernel in this case.
    
    Turns out nfs_umount()'s UMNT RPC invocation causes the RPC client to
    write off the end of the rpc_clnt's iostat array.  This is because the
    mount client's nrprocs field is initialized with the count of defined
    procedures (two: MNT and UMNT), rather than the size of the client's
    proc array (four).
    
    The fix is to use the same initialization technique used by most other
    upper layer clients in the kernel.
    
    Introduced by commit 0b524123, which failed to update nrprocs when
    support was added for UMNT in the kernel.
    
    BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=24302
    BugLink: http://bugs.launchpad.net/bugs/683938
    
    Reported-by: Stefan Bader <stefan.bader at canonical.com>
    Tested-by: Stefan Bader <stefan.bader at canonical.com>
    Cc: stable at kernel.org # >= 2.6.32
    Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 6934d33556b366d22392a415ca09d720fed6a442
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date:   Tue Dec 7 22:21:52 2010 +0000

    hso: IP checksuming doesn't work on GE0301 option cards
    
    There is definitly a problem, that some option cards send up broken
    IP pakets leading to corrupted IP packets. These corruptions aren't
    detected, because the driver claims that the packets are already
    checksummed. This change removes the CHECKSUM_UNNECESSARY option
    and let IP detect broken data.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 78347c8c6b2ddf20535bc1b18d749a3bbdea2a60
Author: Thomas Egerer <thomas.egerer at secunet.com>
Date:   Mon Dec 6 23:28:56 2010 +0000

    xfrm: Fix xfrm_state_migrate leak
    
    xfrm_state_migrate calls kfree instead of xfrm_state_put to free
    a failed state. According to git commit 553f9118 this can cause
    memory leaks.
    
    Signed-off-by: Thomas Egerer <thomas.egerer at secunet.com>
    Signed-off-by: Steffen Klassert <steffen.klassert at secunet.com>
    Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit fb4fa76a1fa59340154c42d998d700e1f8bf21e0
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Mon Dec 6 09:05:50 2010 +0000

    net: Convert netpoll blocking api in bonding driver to be a counter
    
    A while back I made some changes to enable netpoll in the bonding driver.  Among
    them was a per-cpu flag that indicated we were in a path that held locks which
    could cause the netpoll path to block in during tx, and as such the tx path
    should queue the frame for later use.  This appears to have given rise to a
    regression.  If one of those paths on which we hold the per-cpu flag yields the
    cpu, its possible for us to come back on a different cpu, leading to us clearing
    a different flag than we set.  This results in odd netpoll drops, and BUG
    backtraces appearing in the log, as we check to make sure that we only clear set
    bits, and only set clear bits.  I had though briefly about changing the
    offending paths so that they wouldn't sleep, but looking at my origional work
    more closely, it doesn't appear that a per-cpu flag is warranted.  We alrady
    gate the checking of this flag on IFF_IN_NETPOLL, so we don't hit this in the
    normal tx case anyway.  And practically speaking, the normal use case for
    netpoll is to only have one client anyway, so we're not going to erroneously
    queue netpoll frames when its actually safe to do so.  As such, lets just
    convert that per-cpu flag to an atomic counter.  It fixes the rescheduling bugs,
    is equivalent from a performance perspective and actually eliminates some code
    in the process.
    
    Tested by the reporter and myself, successfully
    
    Reported-by: Liang Zheng <lzheng at redhat.com>
    CC: Jay Vosburgh <fubar at us.ibm.com>
    CC: Andy Gospodarek <andy at greyhouse.net>
    CC: David S. Miller <davem at davemloft.net>
    Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e83df17f178360a8e7874441bca04a710c869e42
Author: Kevin Hilman <khilman at deeprootsystems.com>
Date:   Wed Dec 8 22:40:40 2010 +0000

    OMAP2+: PM/serial: fix console semaphore acquire during suspend
    
    commit 0d8e2d0dad98a693bad88aea6876ac8b94ad95c6 (OMAP2+: PM/serial:
    hold console semaphore while OMAP UARTs are disabled) added use of the
    console semaphore to protect UARTs from being accessed after disabled
    during idle, but this causes problems in suspend.
    
    During suspend, the console semaphore is acquired by the console
    suspend method (console_suspend()) so the try_acquire_console_sem()
    will always fail and suspend will be aborted.
    
    To fix, introduce a check so the console semaphore is only attempted
    during idle, and not during suspend.  Also use the same check so that
    the console semaphore is not prematurely released during resume.
    
    Thanks to Paul Walmsley for suggesting adding the same check during
    resume.
    
    Cc: Paul Walmsley <paul at pwsan.com>
    Tested-by: Jean Pihet <j-pihet at ti.com>
    Tested-by: Paul Walmsley <paul at pwsan.com>
    Signed-off-by: Kevin Hilman <khilman at deeprootsystems.com>
    Signed-off-by: Tony Lindgren <tony at atomide.com>

commit 28dd31983f6c3a4d89369ff8f0c93de2cda868db
Author: Kevin Hilman <khilman at deeprootsystems.com>
Date:   Wed Dec 8 01:02:12 2010 +0000

    OMAP1: SRAM: fix size for OMAP1611 SoCs
    
    Kernel was failing to boot on omap1611 based OSK boards due to
    mis-configured SRAM size.  Existing code was using a hard-coded value
    for 250k, which was then rounded down by PAGE_SIZE.  Increasing this to
    256k allows kernel to boot on omap1611 SoCs.
    
    Problem reported by and initial fix suggested by Tim Bird.
    
    Thanks to Tony Lindgren for helping diagnose the problem to being
    specific to OMAP1611 and not affecting OMAP1610/OMAP1623.
    
    Reported-by: Tim Bird <tim.bird at am.sony.com>
    Signed-off-by: Kevin Hilman <khilman at deeprootsystems.com>
    Signed-off-by: Tony Lindgren <tony at atomide.com>

commit 05340d4ab2ec2b6b4962c1c41c6ea8fb550f947b
Author: Christoph Hellwig <hch at infradead.org>
Date:   Tue Dec 7 10:16:41 2010 +0000

    xfs: log timestamp changes to the source inode in rename
    
    Now that we don't mark VFS inodes dirty anymore for internal
    timestamp changes, but rely on the transaction subsystem to push
    them out, we need to explicitly log the source inode in rename after
    updating it's timestamps to make sure the changes actually get
    forced out by sync/fsync or an AIL push.
    
    We already account for the fourth inode in the log reservation, as a
    rename of directories needs to update the nlink field, so just
    adding the xfs_trans_log_inode call is enough.
    
    This fixes the xfsqa 065 regression introduced by:
    
    	"xfs: don't use vfs writeback for pure metadata modifications"
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Reviewed-by: Dave Chinner <dchinner at redhat.com>
    Signed-off-by: Alex Elder <aelder at sgi.com>

commit a5dc4f898c2a0f66e2cefada6c687db82ba2fcbc
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date:   Thu Dec 9 17:07:54 2010 -0500

    ACPI: EC: Add another dmi match entry for MSI hardware
    
    http://bugzilla.kernel.org/show_bug.cgi?id=15418
    
    Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
    cc: stable at kernel.org
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 7c03b87048f2467087ae7e51392e5fb57ea8f58b
Author: Mike Miller <mike.miller at hp.com>
Date:   Wed Dec 1 11:16:07 2010 -0600

    [SCSI] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF
    
    PCI_DEVICE_ID_CISSF is defined as 323b in pci_ids.h but redefined as 3fff in
    hpsa.c. The ID of 3fff will _never_ ship as a standalone controller. It is
    intended only as part a complete storage solution. As such, this patch
    removes the redefinition and the StorageWorks P1210m from the product table.
    
    It also removes a duplicate line for the "unknown" controller support.
    
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 3138b32d5e0998ba3cbd1c74bdc1887d74c5279b
Author: Zhang Rui <rui.zhang at intel.com>
Date:   Wed Dec 8 10:40:49 2010 +0800

    ACPI battery: update status upon sysfs query
    
    Sometimes the Battery driver doesn't get notifications when it's
    plugged/unplugged. And this results in the incorrect Battery
    status reported by the power supply sysfs I/F.
    
    Update Battery status first when querying from sysfs.
    http://marc.info/?l=linux-acpi&m=128855015826728&w=2
    
    Tested_by: Seblu <seblu at seblu.net>
    Signed-off-by: Zhang Rui <rui.zhang at intel.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 3151dbb04ad5a5bd6358371c0bfb457216d00205
Author: Zhang Rui <rui.zhang at intel.com>
Date:   Wed Dec 8 10:40:45 2010 +0800

    ACPI ac: update AC status upon sysfs query
    
    http://marc.info/?l=linux-acpi&m=128855015826728&w=2
    https://bugzilla.kernel.org/show_bug.cgi?id=21722
    
    Tested_by: Seblu <seblu at seblu.net>
    Signed-off-by: Zhang Rui <rui.zhang at intel.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 13d38d9df26b5b9a5ad5f9fbc065078bc42a8748
Author: Madhuranath Iyengar <Madhu.Iyengar at qlogic.com>
Date:   Tue Nov 23 16:52:50 2010 -0800

    [SCSI] qla2xxx: Update version number to 8.03.05-k0.
    
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 69abf61ea1005bc362b678639a4ae219e23829f3
Author: Saurav Kashyap <saurav.kashyap at qlogic.com>
Date:   Tue Nov 23 16:52:49 2010 -0800

    [SCSI] qla2xxx: Properly set the return value in qla2xxx_eh_abort function.
    
    A return value is not set for the successful case and it has a garbage value.
    This fix will set the default value to SUCCESS and in case of any failures
    it is changed.
    
    Signed-off-by: Saurav Kashyap <saurav.kashyap at qlogic.com>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 087c621e22f49c326cdc65d98c6fc0737ac13533
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date:   Tue Nov 23 16:52:48 2010 -0800

    [SCSI] qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts.
    
    This would cause a panic while reading the NPIV-config data.
    
    Cc: stable at kernel.org
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 7992abfc8b851456f2dfac3229ecb3a5e5637df0
Author: Mike Hernandez <michael.hernandez at qlogic.com>
Date:   Tue Nov 23 16:52:47 2010 -0800

    [SCSI] qla2xxx: Change MSI initialization from using incorrect request_irq parameter.
    
    IRQF_SHARED flag should not be set when calling request_irq for MSI
    since this interrupt mechanism cannot be shared like standard INTx.
    
    Signed-off-by: Mike Hernandez <michael.hernandez at qlogic.com>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 85727e1f78bd8392a0657ad6a4ff85fef1cc4a6d
Author: Mike Hernandez <michael.hernandez at qlogic.com>
Date:   Tue Nov 23 16:52:46 2010 -0800

    [SCSI] qla2xxx: Populate Command Type 6 LUN field properly.
    
    Use the host_to_fcp_swap call to correctly populate the LUN field
    in the Command Type 6 path.  This field is used during LUN reset
    cleanup and must match the field used in the FCP command.
    
    Cc: stable at kernel.org
    Signed-off-by: Mike Hernandez <michael.hernandez at qlogic.com>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 7e1fea731da8c1b5fcf5d8e157befd389b030760
Author: Josef Bacik <josef at redhat.com>
Date:   Wed Dec 8 12:22:34 2010 -0500

    Btrfs: fixup return code for btrfs_del_orphan_item
    
    If the orphan item doesn't exist, we return 1, which doesn't make any sense to
    the callers.  Instead return -ENOENT if we didn't find the item.  Thanks,
    
    Signed-off-by: Josef Bacik <josef at redhat.com>

commit b8399dee478db7939cd0d6fda8ecacddf2facd03
Author: Josef Bacik <josef at redhat.com>
Date:   Wed Dec 8 09:15:11 2010 -0500

    Btrfs: do not do fast caching if we are allocating blocks for tree_root
    
    Since the fast caching uses normal tree locking, we can possibly deadlock if we
    get to the caching via a btrfs_search_slot() on the tree_root.  So just check to
    see if the root we are on is the tree root, and just don't do the fast caching.
    
    Reported-by: Sage Weil <sage at newdream.net>
    Signed-off-by: Josef Bacik <josef at redhat.com>

commit 2b20982e3154266106573beac2a4d4ba57a2789a
Author: Josef Bacik <josef at redhat.com>
Date:   Fri Dec 3 13:17:53 2010 -0500

    Btrfs: deal with space cache errors better
    
    Currently if the space cache inode generation number doesn't match the
    generation number in the space cache header we will just fail to load the space
    cache, but we won't mark the space cache as an error, so we'll keep getting that
    error each time somebody tries to cache that block group until we actually clear
    the thing.  Fix this by marking the space cache as having an error so we only
    get the message once.  This patch also makes it so that we don't try and setup
    space cache for a block group that isn't cached, since we won't be able to write
    it out anyway.  None of these problems are actual problems, they are just
    annoying and sub-optimal.  Thanks,
    
    Signed-off-by: Josef Bacik <josef at redhat.com>

commit 955256f2c3e25c94ad373c43fbc38d2ac8af2a71
Author: Josef Bacik <josef at redhat.com>
Date:   Fri Nov 19 09:41:10 2010 -0500

    Btrfs: fix use after free in O_DIRECT
    
    This fixes a bug where we use dip after we have freed it.  Instead just use the
    file_offset that was passed to the function.  Thanks,
    
    Signed-off-by: Josef Bacik <josef at redhat.com>

commit e55f87531c2c1eb071a296df7eb67f83d5f0b5df
Author: Christof Schmitt <christof.schmitt at de.ibm.com>
Date:   Thu Nov 18 14:53:18 2010 +0100

    [SCSI] zfcp: Issue FCP command without holding SCSI host_lock
    
    Interrupting the connection to the FCP channel while I/O requests are
    being issued can lead to this deadlock. scsi_dispatch_cmd already
    holds the host_lock while the recovery trigger tries to acquire the
    host_lock again when iterating through the scsi_devices.
    
     INFO: lockdep is turned off.
     BUG: spinlock lockup on CPU#1, blast/9660, 0000000078f38878
     CPU: 1 Not tainted 2.6.35.7SWEN2 #2
     Process blast (pid: 9660, task: 0000000071f75940, ksp: 0000000074393ac0)
            0000000074393640 00000000743935c0 0000000000000002 0000000000000000
            0000000074393660 00000000743935d8 00000000743935d8 00000000005590c2
            0000000000000000 0000000078f38878 0000000026ede800 0000000078f38878
            000000000000000d 040000000000000c 0000000074393628 0000000000000000
            0000000000000000 0000000000100b2a 00000000743935c0 0000000074393600
     Call Trace:
     ([<0000000000100a32>] show_trace+0xee/0x144)
      [<00000000003be202>] do_raw_spin_lock+0x112/0x178
      [<000000000055d408>] _raw_spin_lock_irqsave+0x90/0xb0
      [<00000000003f1514>] __scsi_iterate_devices+0x38/0xbc
      [<00000000004849b0>] zfcp_erp_clear_adapter_status+0xd0/0x16c
      [<000000000048587a>] zfcp_erp_adapter_reopen+0x3a/0xb4
      [<0000000000489812>] zfcp_fsf_req_send+0x166/0x180
      [<000000000048c8d6>] zfcp_fsf_fcp_cmnd+0x272/0x408
      [<000000000048f864>] zfcp_scsi_queuecommand+0x11c/0x1e0
      [<00000000003f1f2a>] scsi_dispatch_cmd+0x1d6/0x324
      [<00000000003f9910>] scsi_request_fn+0x42c/0x56c
      [<00000000003828ae>] __blk_run_queue+0x86/0x140
      [<000000000037f742>] elv_insert+0x11a/0x208
      [<000000000038104c>] blk_insert_cloned_request+0x84/0xe4
      [<000003c0032b7c64>] dm_dispatch_request+0x6c/0x94 [dm_mod]
      [<000003c0032b7d5c>] map_request+0xd0/0x100 [dm_mod]
      [<000003c0032b9a78>] dm_request_fn+0xec/0x1bc [dm_mod]
      [<0000000000382c0e>] generic_unplug_device+0x5a/0x6c
      [<000003c0032b7f98>] dm_unplug_all+0x74/0x9c [dm_mod]
      [<00000000001d1272>] sync_page+0x76/0x9c
      [<00000000001d12ba>] sync_page_killable+0x22/0x60
      [<000000000055a768>] __wait_on_bit_lock+0xc0/0x124
      [<00000000001d1140>] __lock_page_killable+0x78/0x84
      [<00000000001d351c>] generic_file_aio_read+0x5a4/0x7e8
      [<0000000000228ec0>] do_sync_read+0xc8/0x12c
      [<0000000000229edc>] vfs_read+0xac/0x1ac
      [<000000000022a0d8>] SyS_read+0x58/0xa8
      [<00000000001146de>] sysc_noemu+0x10/0x16
      [<00000200000493c4>] 0x200000493c4
     INFO: lockdep is turned off.
    
    Call zfcp_fsf_fcp_cmnd without the host_lock and disable the
    interrupts when acquiring the req_q_lock. According to the patch
    description in "[PATCH] Eliminate error handler overload of the SCSI
    serial number", the serial_number is not used, so simply drop the
    queuecommand wrapper function and run zfcp_scsi_queuecommand without
    holding the host_lock.
    
    Reviewed-by: Swen Schillig <swen at vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 14718e3cd8e9c6937114cebbf3ce5d504328da8c
Author: Swen Schillig <swen at vnet.ibm.com>
Date:   Wed Nov 17 14:23:43 2010 +0100

    [SCSI] zfcp: Prevent usage w/o holding a reference
    
    The ERP got values assigned for which no reference was taken.  This
    can lead to an unpredictable race condition.  Fix this by only
    assigning the values which are required and for which a reference was
    pulled or is held implicitly.
    
    Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit d3e1088d68735eb7da12f79a0c3c0d951cbc89f1
Author: Swen Schillig <swen at vnet.ibm.com>
Date:   Wed Nov 17 14:23:42 2010 +0100

    [SCSI] zfcp: No ERP escalation on gpn_ft eval
    
    If the evaluation of GPN_FT requests wants to remove an invalid port
    from the system the zfcp_erp_port_shutdown function is triggered.
    Depending on the system status a superior action (e.g. adapter reopen)
    is required. This can lead to an invalid mem access of the port struct
    which might be freed at the time since the superior action is not
    holding a reference of the port which triggered this ERP action.
    
    Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 6fbf25e86beef1c6719e760a241a7aef9ad145e3
Author: Swen Schillig <swen at vnet.ibm.com>
Date:   Wed Nov 17 14:23:41 2010 +0100

    [SCSI] zfcp: Correct false abort data assignment.
    
    The request data assignment between the fsf abort initiator and its
    corresponding handler is not consistent and leads to an unpredictable
    behaviour, e.g. kernel panic.  This patch fixes this issue and assigns
    the correct value.
    
    Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 5bfb2c31487eaff3840e02548e6acf89a048765b
Author: Swen Schillig <swen at vnet.ibm.com>
Date:   Wed Nov 17 14:23:40 2010 +0100

    [SCSI] zfcp: Fix common FCP request reception
    
    The reception of a common FCP request should only be evaluated if the
    corresponding SCSI request data is available. Therefore put the
    information under the lock protection and verify the existence before
    processing.  This fixes the following kernel panic.
    
    Unable to handle kernel pointer dereference at virtual kernel address 0000000180000000
    Oops: 003b [#1] PREEMPT SMP DEBUG_PAGEALLOC
    CPU: 0 Not tainted 2.6.35.7-45.x.20101007-s390xdefault #1
    Process blast (pid: 9711, task: 00000000a3be8e40, ksp: 00000000b221bac0)
    Krnl PSW : 0704300180000000 0000000000489878 (zfcp_fsf_fcp_handler_common+0x4c/0x3a0)
               R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:3 PM:0 EA:3
    Krnl GPRS: 00000000b663c1b8 0000000180000000 000000007ab5bdf0 0000000000000000
               00000000b0ccd800 0000000000000018 07000000a3be8e78 00000000b5d3e600
               000000007ab5bdf0 0000000000000066 00000000b72137f0 00000000b72137f0
               0000000000000000 00000000005a8178 00000000bdf37a60 00000000bdf379f0
    Krnl Code: 0000000000489866: e3c030000004       lg      %r12,0(%r3)
               000000000048986c: e310c0000004       lg      %r1,0(%r12)
               0000000000489872: e31011e00004       lg      %r1,480(%r1)
              >0000000000489878: 581011ec           l       %r1,492(%r1)
               000000000048987c: a774001c           brc     7,4898b4
               0000000000489880: b91400b1           lgfr    %r11,%r1
               0000000000489884: 5810405c           l       %r1,92(%r4)
               0000000000489888: 5510d00c           cl      %r1,12(%r13)
    Call Trace:
    ([<000000000010d344>] debug_event_common+0x22c/0x244)
     [<000000000048a0b4>] zfcp_fsf_fcp_cmnd_handler+0x2c/0x3b4
     [<000000000048b5b6>] zfcp_fsf_req_complete+0x1b6/0x9dc
     [<000000000048bede>] zfcp_fsf_reqid_check+0x102/0x138
     [<000000000048e478>] zfcp_qdio_int_resp+0x70/0x110
     [<000000000044a1ec>] qdio_kick_handler+0xb0/0x19c
     [<000000000044c228>] __tiqdio_inbound_processing+0x30c/0xebc
     [<000000000014a5fc>] tasklet_action+0x1b4/0x1e8
     [<000000000014b676>] __do_softirq+0x106/0x1cc
     [<000000000010d91a>] do_softirq+0xe6/0xec
     [<000000000014b0c8>] irq_exit+0xd4/0xd8
     [<00000000004307ec>] do_IRQ+0x7c0/0xf54
     [<0000000000114d28>] io_return+0x0/0x16
     [<000000000055fef0>] sub_preempt_count+0x50/0xe4
    ([<00000000b1f873c0>] 0xb1f873c0)
     [<000000000055e25a>] _raw_spin_unlock+0x46/0x74
     [<0000000000241c40>] __d_lookup+0x288/0x2c8
     [<000000000023502c>] do_lookup+0x7c/0x25c
     [<0000000000237fa8>] link_path_walk+0x5e4/0xe2c
     [<0000000000238a00>] path_walk+0x98/0x148
     [<0000000000238c98>] do_path_lookup+0x74/0xc0
     [<000000000023989c>] user_path_at+0x64/0xa4
     [<000000000022e366>] vfs_fstatat+0x4e/0xb0
     [<000000000022e4d6>] SyS_newstat+0x2e/0x54
     [<00000000001146de>] sysc_noemu+0x10/0x16
     [<0000020000153456>] 0x20000153456
    INFO: lockdep is turned off.
    Last Breaking-Event-Address:
     [<000000000048a0ae>] zfcp_fsf_fcp_cmnd_handler+0x26/0x3b4
    
    Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 459dbf72e4d2b4aa13620e6b70d54f098547bf13
Author: James Bottomley <James.Bottomley at suse.de>
Date:   Wed Nov 17 10:10:57 2010 -0600

    [SCSI] Eliminate error handler overload of the SCSI serial number
    
    The error handler is using the test cmd->serial_number == 0 in the
    abort routines to signal that the command to be aborted has already
    completed normally.  This design was to close a race window in the
    original error handler where a command could go through the normal
    completion routines after it timed out but before error handling was
    started.
    
    Mike Anderson pointed out that when we converted our timeout and
    softirq completions, we picked up atomicity here because the block
    layer now mediates this with the REQ_ATOM_COMPLETE flag and guarantees
    that *either* the command times out or our done routine is called, but
    ensures we can't get both occurring.  That makes the serial number
    zero check redundant and it can be removed.
    
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 5da61410054d125e63aeab9cc7a11874a69465c0
Author: Anil Ravindranath <anil_ravindranath at pmc-sierra.com>
Date:   Tue Nov 16 13:43:41 2010 -0800

    [SCSI] pmcraid: disable msix and expand device config entry
    
    Firmware requires a larger configuration entry size than the driver
    currently allows, and MSI-X pretty much doesn't work with current FW,
    so disable it for now.
    
    Signed-off-by: Anil Ravindranath <anil_ravindranath at pmc-sierra.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit c7a841f3aca469187db76842676951a672fd27d1
Author: James Smart <james.smart at emulex.com>
Date:   Sun Nov 14 11:12:04 2010 -0500

    [SCSI] bsg: correct fault if queue object removed while dev_t open
    
    This patch corrects an issue in bsg that results in a general protection
    fault if an LLD is removed while an application is using an open file
    handle to a bsg device, and the application issues an ioctl. The fault
    occurs because the class_dev is NULL, having been cleared in
    bsg_unregister_queue() when the driver was removed.  With this
    patch, a check is made for the class_dev, and the application
    will receive ENXIO if the related object is gone.
    
    Signed-off-by: Carl Lajeunesse <carl.lajeunesse at emulex.com>
    Signed-off-by: James Smart <james.smart at emulex.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 057f02a38e67a944a2d0b89bb0111efb9dbe6e6e
Author: Dan Carpenter <error27 at gmail.com>
Date:   Fri Nov 12 07:31:46 2010 +0300

    [SCSI] osd: checking NULL instead of ERR_PTR()
    
    bio_map_kern() returns ERR_PTRs on failure and never returns NULL.
    
    [jejb: remove redundant unlikely spotted by Tobias Klauser]
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Acked-by: Boaz Harrosh <bharrosh at panasas.com>
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>

commit 1b39ed0cf51193f3ba03044369ab4d144712a9b8
Author: Danny Huang <dahuang at nvidia.com>
Date:   Wed Dec 1 13:37:31 2010 -0700

    regulator: tps6586x: correct register table
    
    Correct the register table for SM2, LDO8, RTC
    
    Change-Id: I45348cec5ffbb7da9bd7523764fb611b537236b8
    Signed-off-by: Danny Huang <dahuang at nvidia.com>
    Signed-off-by: Olof Johansson <olofj at chromium.org>
    Signed-off-by: Stephen Warren <swarren at nvidia.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit 1dbcf35cb5b775e564a793a338c7c3eb65fc6980
Author: Danny Huang <dahuang at nvidia.com>
Date:   Wed Dec 1 13:37:30 2010 -0700

    regulator: tps6586x: Handle both enable reg/bits being the same
    
    Change-Id: I40400bb65eab496bb1becd26b37a9653b99d4f41
    Signed-off-by: Danny Huang <dahuang at nvidia.com>
    Signed-off-by: Olof Johansson <olofj at chromium.org>
    Signed-off-by: Stephen Warren <swarren at nvidia.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
      (Split into separate patches)
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit 64db657b5a45f1676d421e2bdfb7d4910dce87d3
Author: Danny Huang <dahuang at nvidia.com>
Date:   Wed Dec 1 13:37:29 2010 -0700

    regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
    
    Change-Id: Idacf5e1e51dbbbcd5ea93f310a4e907977e7359e
    Signed-off-by: Danny Huang <dahuang at nvidia.com>
    Signed-off-by: Olof Johansson <olofj at chromium.org>
    Signed-off-by: Stephen Warren <swarren at nvidia.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
      (Split into separate patches)
      (Minor formatting fixes)
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit 4f58670709af7b890eceab325e9e470f209459ca
Author: Danny Huang <dahuang at nvidia.com>
Date:   Wed Dec 1 13:37:28 2010 -0700

    regulator: tps6586x: Add missing bit mask generation
    
    Change-Id: I76eaceb31b56264f6978af15db1e6fc7e2e01b5a
    Signed-off-by: Danny Huang <dahuang at nvidia.com>
    Signed-off-by: Olof Johansson <olofj at chromium.org>
    Signed-off-by: Stephen Warren <swarren at nvidia.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
      (Split into separate patches)
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit f3886f85cfde578f1d0ba6e40ac5f9d70043923b
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Dec 8 10:05:34 2010 -0500

    drm/radeon/kms: don't apply 7xx HDP flush workaround on AGP
    
    It should be required for all 7xx asics, but seems to cause
    problems on some AGP 7xx chips.
    
    Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=19002
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Reported-and-Tested-by: Duncan <1i5t5.duncan at cox.net>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 6f331623b99e1900e3a664bbe6e95406ff4b27f4
Author: Dan Carpenter <error27 at gmail.com>
Date:   Thu Dec 9 08:35:40 2010 +0300

    drm: use after free in drm_queue_vblank_event()
    
    The "e" pointer is either NULL or freed when we call
    drm_vblank_put(dev, e->pipe) on the error path.  Just pass the "pipe"
    variable directly instead.
    
    I changed another caller to use "pipe" as well for consistency.
    
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit d70ab7f7ee0692efc880d772dc5c212174d67e3b
Merge: 58936b29c4c3e633a92bb918409fe1f0ca148144 2a7b1a00206895cfa444fd83477dca67a88a9d25
Author: Takashi Iwai <tiwai at suse.de>
Date:   Thu Dec 9 08:24:32 2010 +0100

    Merge branch 'fix/asoc' into for-linus

commit 58936b29c4c3e633a92bb918409fe1f0ca148144
Merge: 2ff38c9fbaa86264ad819117ab137361067ab5f1 8a96b1e02029aa512199b1b6d281dcede9ed81f1
Author: Takashi Iwai <tiwai at suse.de>
Date:   Thu Dec 9 08:24:25 2010 +0100

    Merge branch 'fix/hda' into for-linus

commit 8a96b1e02029aa512199b1b6d281dcede9ed81f1
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Thu Dec 9 07:17:27 2010 +0100

    ALSA: HDA: Quirk for Dell Vostro 320 to make microphone work
    
    BugLink: http://launchpad.net/497546
    
    Confirmed that the ideapad model works better than the current
    quirk for Dell Vostro 320.
    
    Cc: stable at kernel.org (2.6.35+)
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit e76116ca9671e2e5239054a40303b94feab585ad
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Dec 8 19:09:42 2010 -0500

    drm/kms: remove spaces from connector names (v2)
    
    Grub doesn't parse spaces in parameters correctly, so
    this makes it impossible to force video= parameters
    for kms on the grub kernel command line.
    
    v2: shorten the names to make them easier to type.
    
    Reported-by: Sergej Pupykin <ml at sergej.pp.ru>
    
    Cc: Sergej Pupykin <ml at sergej.pp.ru>
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 589a594be1fb8815b3f18e517be696c48664f728
Author: NeilBrown <neilb at suse.de>
Date:   Thu Dec 9 17:02:14 2010 +1100

    md: protect against NULL reference when waiting to start a raid10.
    
    When we fail to start a raid10 for some reason, we call
    md_unregister_thread to kill the thread that was created.
    
    Unfortunately md_thread() will then make one call into the handler
    (raid10d) even though md_wakeup_thread has not been called.  This is
    not safe and as md_unregister_thread is called after mddev->private
    has been set to NULL, it will definitely cause a NULL dereference.
    
    So fix this at both ends:
     - md_thread should only call the handler if THREAD_WAKEUP has been
       set.
     - raid10 should call md_unregister_thread before setting things
       to NULL just like all the other raid modules do.
    
    This is applicable to 2.6.35 and later.
    
    Cc: stable at kernel.org
    Reported-by: "Citizen" <citizen_lee at thecus.com>
    Signed-off-by: NeilBrown <neilb at suse.de>

commit 1a855a0606653d2d82506281e2c686bacb4b2f45
Author: NeilBrown <neilb at suse.de>
Date:   Thu Dec 9 16:36:28 2010 +1100

    md: fix bug with re-adding of partially recovered device.
    
    With v0.90 metadata, a hot-spare does not become a full member of the
    array until recovery is complete.  So if we re-add such a device to
    the array, we know that all of it is as up-to-date as the event count
    would suggest, and so it a bitmap-based recovery is possible.
    
    However with v1.x metadata, the hot-spare immediately becomes a full
    member of the array, but it record how much of the device has been
    recovered.  If the array is stopped and re-assembled recovery starts
    from this point.
    
    When such a device is hot-added to an array we currently lose the 'how
    much is recovered' information and incorrectly included it as a full
    in-sync member (after bitmap-based fixup).
    This is wrong and unsafe and could corrupt data.
    
    So be more careful about setting saved_raid_disk - which is what
    guides the re-adding of devices back into an array.
    The new code matches the code in slot_store which does a similar
    thing, which is encouraging.
    
    This is suitable for any -stable kernel.
    
    Reported-by: "Dailey, Nate" <Nate.Dailey at stratus.com>
    Cc: stable at kernel.org
    Signed-off-by: NeilBrown <neilb at suse.de>

commit a035fc3e2531703b539f23bec4ca7943cfc69349
Author: NeilBrown <neilb at suse.de>
Date:   Thu Dec 9 16:17:51 2010 +1100

    md: fix possible deadlock in handling flush requests.
    
    As recorded in
        https://bugzilla.kernel.org/show_bug.cgi?id=24012
    
    it is possible for a flush request through md to hang.  This is due to
    an interaction between the recursion avoidance in
    generic_make_request, the insistence in md of only having one flush
    active at a time, and the possibility of dm (or md) submitting two
    flush requests to a device from the one generic_make_request.
    
    If a generic_make_request call into dm causes two flush requests to be
    queued (as happens if the dm table has two targets - they get one
    each), these two will be queued inside generic_make_request.
    
    Assume they are for the same md device.
    The first is processed and causes 1 or more flush requests to be sent
    to lower devices.  These get queued within generic_make_request too.
    Then the second flush to the md device gets handled and it blocks
    waiting for the first flush to complete.  But it won't complete until
    the two lower-device requests complete, and they haven't even been
    submitted yet as they are on the generic_make_request queue.
    
    The deadlock can be broken by using a separate thread to submit the
    requests to lower devices.  md has such a thread readily available:
    md_wq.
    
    So use it to submit these requests.
    
    Reported-by: Giacomo Catenazzi <cate at cateee.net>
    Tested-by: Giacomo Catenazzi <cate at cateee.net>
    Signed-off-by: NeilBrown <neilb at suse.de>

commit a7a07e69653acf8540daa1da053cd84bf86e8e66
Author: NeilBrown <neilb at suse.de>
Date:   Thu Dec 9 16:04:25 2010 +1100

    md: move code in to submit_flushes.
    
    submit_flushes is called from exactly one place.
    Move the code that is before and after that call into
    submit_flushes.
    
    This has not functional change, but will make the next patch
    smaller and easier to follow.
    
    Signed-off-by: NeilBrown <neilb at suse.de>

commit 2b74e12e567feb4163e32815bce0be57489e73b9
Author: NeilBrown <neilb at suse.de>
Date:   Thu Dec 9 15:59:01 2010 +1100

    md: remove handling of flush_pending in md_submit_flush_data
    
    None of the functions called between setting flush_pending to 1, and
    atomic_dec_and_test can change flush_pending, or will anything
    running in any other thread (as ->flush_bio is not NULL).  So the
    atomic_dec_and_test will always succeed.
    So remove the atomic_sec and the atomic_dec_and_test.
    
    Signed-off-by: NeilBrown <neilb at suse.de>

commit 4e085e76cbe558b79b54cbab772f61185879bc64
Author: David S. Miller <davem at davemloft.net>
Date:   Wed Dec 8 18:42:23 2010 -0800

    econet: Fix crash in aun_incoming().
    
    Unconditional use of skb->dev won't work here,
    try to fetch the econet device via skb_dst()->dev
    instead.
    
    Suggested by Eric Dumazet.
    
    Reported-by: Nelson Elhage <nelhage at ksplice.com>
    Tested-by: Nelson Elhage <nelhage at ksplice.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 7182afea8d1afd432a17c18162cc3fd441d0da93
Author: Dan Carpenter <error27 at gmail.com>
Date:   Wed Oct 13 09:13:12 2010 +0000

    IB/uverbs: Handle large number of entries in poll CQ
    
    In ib_uverbs_poll_cq() code there is a potential integer overflow if
    userspace passes in a large cmd.ne.  The calls to kmalloc() would
    allocate smaller buffers than intended, leading to memory corruption.
    There iss also an information leak if resp wasn't all used.
    Unprivileged userspace may call this function, although only if an
    RDMA device that uses this function is present.
    
    Fix this by copying CQ entries one at a time, which avoids the
    allocation entirely, and also by moving this copying into a function
    that makes sure to initialize all memory copied to userspace.
    
    Special thanks to Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
    for his help and advice.
    
    Cc: <stable at kernel.org>
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    
    [ Monkey around with things a bit to avoid bad code generation by gcc
      when designated initializers are used.  - Roland ]
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit f19872575ff7819a3723154657a497d9bca66b33
Author: Eric Dumazet <eric.dumazet at gmail.com>
Date:   Tue Dec 7 12:20:47 2010 +0000

    tcp: protect sysctl_tcp_cookie_size reads
    
    Make sure sysctl_tcp_cookie_size is read once in
    tcp_cookie_size_check(), or we might return an illegal value to caller
    if sysctl_tcp_cookie_size is changed by another cpu.
    
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Cc: Ben Hutchings <bhutchings at solarflare.com>
    Cc: William Allen Simpson <william.allen.simpson at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ad9f4f50fe9288bbe65b7dfd76d8820afac6a24c
Author: Eric Dumazet <eric.dumazet at gmail.com>
Date:   Tue Dec 7 12:03:55 2010 +0000

    tcp: avoid a possible divide by zero
    
    sysctl_tcp_tso_win_divisor might be set to zero while one cpu runs in
    tcp_tso_should_defer(). Make sure we dont allow a divide by zero by
    reading sysctl_tcp_tso_win_divisor exactly once.
    
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 0a54917c3fc295cb61f3fb52373c173fd3b69f48
Author: David Kilroy <kilroyd at googlemail.com>
Date:   Sun Dec 5 15:43:55 2010 +0000

    orinoco: fix TKIP countermeasure behaviour
    
    Enable the port when disabling countermeasures, and disable it on
    enabling countermeasures.
    
    This bug causes the response of the system to certain attacks to be
    ineffective.
    
    It also prevents wpa_supplicant from getting scan results, as
    wpa_supplicant disables countermeasures on startup - preventing the
    hardware from scanning.
    
    wpa_supplicant works with ap_mode=2 despite this bug because the commit
    handler re-enables the port.
    
    The log tends to look like:
    
    State: DISCONNECTED -> SCANNING
    Starting AP scan for wildcard SSID
    Scan requested (ret=0) - scan timeout 5 seconds
    EAPOL: disable timer tick
    EAPOL: Supplicant port status: Unauthorized
    Scan timeout - try to get results
    Failed to get scan results
    Failed to get scan results - try scanning again
    Setting scan request: 1 sec 0 usec
    Starting AP scan for wildcard SSID
    Scan requested (ret=-1) - scan timeout 5 seconds
    Failed to initiate AP scan.
    
    Reported by: Giacomo Comes <comes at naic.edu>
    Signed-off by: David Kilroy <kilroyd at googlemail.com>
    Cc: stable at kernel.org
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit ba34fcee476d11e7c9df95932787a22a96ff6e68
Author: David Kilroy <kilroyd at googlemail.com>
Date:   Sun Dec 5 15:45:58 2010 +0000

    orinoco: clear countermeasure setting on commit
    
    ... and interface up.
    
    In these situations, you are usually trying to connect to a new AP, so
    keeping TKIP countermeasures active is confusing. This is already how
    the driver behaves (inadvertently). However, querying SIOCGIWAUTH may
    tell userspace that countermeasures are active when they aren't.
    
    Clear the setting so that the reporting matches what the driver has
    done..
    
    Signed-off by: David Kilroy <kilroyd at googlemail.com>
    Cc: stable at kernel.org
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 7e2447075690860e2cea96b119fc9cadbaa7e83c
Author: Helmut Schaa <helmut.schaa at googlemail.com>
Date:   Thu Dec 2 18:44:09 2010 +0100

    mac80211: Fix BUG in pskb_expand_head when transmitting shared skbs
    
    mac80211 doesn't handle shared skbs correctly at the moment. As a result
    a possible resize can trigger a BUG in pskb_expand_head.
    
    [  676.030000] Kernel bug detected[#1]:
    [  676.030000] Cpu 0
    [  676.030000] $ 0   : 00000000 00000000 819662ff 00000002
    [  676.030000] $ 4   : 81966200 00000020 00000000 00000020
    [  676.030000] $ 8   : 819662e0 800043c0 00000002 00020000
    [  676.030000] $12   : 3b9aca00 00000000 00000000 00470000
    [  676.030000] $16   : 80ea2000 00000000 00000000 00000000
    [  676.030000] $20   : 818aa200 80ea2018 80ea2000 00000008
    [  676.030000] $24   : 00000002 800ace5c
    [  676.030000] $28   : 8199a000 8199bd20 81938f88 80f180d4
    [  676.030000] Hi    : 0000026e
    [  676.030000] Lo    : 0000757e
    [  676.030000] epc   : 801245e4 pskb_expand_head+0x44/0x1d8
    [  676.030000]     Not tainted
    [  676.030000] ra    : 80f180d4 ieee80211_skb_resize+0xb0/0x114 [mac80211]
    [  676.030000] Status: 1000a403    KERNEL EXL IE
    [  676.030000] Cause : 10800024
    [  676.030000] PrId  : 0001964c (MIPS 24Kc)
    [  676.030000] Modules linked in: mac80211_hwsim rt2800lib rt2x00soc rt2x00pci rt2x00lib mac80211 crc_itu_t crc_ccitt cfg80211 compat arc4 aes_generic deflate ecb cbc [last unloaded: rt2800pci]
    [  676.030000] Process kpktgend_0 (pid: 97, threadinfo=8199a000, task=81879f48, tls=00000000)
    [  676.030000] Stack : ffffffff 00000000 00000000 00000014 00000004 80ea2000 00000000 00000000
    [  676.030000]         818aa200 80f180d4 ffffffff 0000000a 81879f78 81879f48 81879f48 00000018
    [  676.030000]         81966246 80ea2000 818432e0 80f1a420 80203050 81814d98 00000001 81879f48
    [  676.030000]         81879f48 00000018 81966246 818432e0 0000001a 8199bdd4 0000001c 80f1b72c
    [  676.030000]         80203020 8001292c 80ef4aa2 7f10b55d 801ab5b8 81879f48 00000188 80005c90
    [  676.030000]         ...
    [  676.030000] Call Trace:
    [  676.030000] [<801245e4>] pskb_expand_head+0x44/0x1d8
    [  676.030000] [<80f180d4>] ieee80211_skb_resize+0xb0/0x114 [mac80211]
    [  676.030000] [<80f1a420>] ieee80211_xmit+0x150/0x22c [mac80211]
    [  676.030000] [<80f1b72c>] ieee80211_subif_start_xmit+0x6f4/0x73c [mac80211]
    [  676.030000] [<8014361c>] pktgen_thread_worker+0xfac/0x16f8
    [  676.030000] [<8002ebe8>] kthread+0x7c/0x88
    [  676.030000] [<80008e0c>] kernel_thread_helper+0x10/0x18
    [  676.030000]
    [  676.030000]
    [  676.030000] Code: 24020001  10620005  2502001f <0200000d> 0804917a  00000000  2502001f  00441023  00531021
    
    Fix this by making a local copy of shared skbs prior to mangeling them.
    To avoid copying the skb unnecessarily move the skb_copy call below the
    checks that don't need write access to the skb.
    
    Also, move the assignment of nh_pos and h_pos below the skb_copy to point
    to the correct skb.
    
    It would be possible to avoid another resize of the copied skb by using
    skb_copy_expand instead of skb_copy but that would make the patch more
    complex. Also, shared skbs are a corner case right now, so the resize
    shouldn't matter much.
    
    Cc: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: Helmut Schaa <helmut.schaa at googlemail.com>
    Cc: stable at kernel.org
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit f933ebed7888a9a7d73ebeeb6bcbb3f710c423b4
Author: Sujith Manoharan <Sujith.Manoharan at atheros.com>
Date:   Wed Dec 1 12:30:27 2010 +0530

    ath9k_htc: Fix suspend/resume
    
    The HW has to be set to FULLSLEEP mode during suspend,
    when no interface has been brought up. Not doing this would
    break resume, as the chip won't be powered up at all.
    
    Signed-off-by: Sujith Manoharan <Sujith.Manoharan at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit b93996cf67d47597efad03d5e5431c7b8b11e688
Author: Javier Cardona <javier at cozybit.com>
Date:   Tue Dec 7 13:37:56 2010 -0800

    ath5k: Put the right tsf value in mesh beacons
    
    Signed-off-by: Javier Cardona <javier at cozybit.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit c26d5339424e68f8643cf3448986c4f77b941a65
Author: Javier Cardona <javier at cozybit.com>
Date:   Tue Dec 7 13:36:55 2010 -0800

    ath5k: Prevent mesh interfaces from being counted as ad-hoc
    
    This results in an erroneus num_adhoc_vifs count, as the this counter
    was incremented but not decremented for mesh interfaces.
    
    Signed-off-by: Javier Cardona <javier at cozybit.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit d82b577b8cf89a17cab932db272769dfc69a98df
Author: Javier Cardona <javier at cozybit.com>
Date:   Tue Dec 7 13:35:55 2010 -0800

    ath5k: Fix beaconing in mesh mode
    
    This patch fixes the oops below when attempting to bring up a mesh
    interface on ath5k hardware.
    
    [  128.933099] kernel BUG at drivers/net/wireless/ath/ath5k/base.c:197!
    [  128.933099] invalid opcode: 0000 [#1]
    (...)
    [  128.933099] Call Trace:
    [  128.933099]  [<c83b77fa>] ? ath5k_beacon_update+0x57/0x1f8 [ath5k]
    [  128.933099]  [<c02d9a40>] ? __sysfs_add_one+0x28/0x76
    [  128.933099]  [<c83b830e>] ? ath5k_bss_info_changed+0x13f/0x173
    [ath5k]
    [  128.933099]  [<c82ff629>] ? ieee80211_config_beacon+0xc0/0x17e
    [mac80211]
    [  128.933099]  [<c82f073e>] ?
    ieee80211_bss_info_change_notify+0x182/0x18b [mac80211]
    [  128.933099]  [<c83b81cf>] ? ath5k_bss_info_changed+0x0/0x173 [ath5k]
    [  128.933099]  [<c82ff6d6>] ? ieee80211_config_beacon+0x16d/0x17e
    [mac80211]
    [  128.933099]  [<c82ff753>] ? ieee80211_add_beacon+0x34/0x39 [mac80211]
    [  128.933099]  [<c830a4ed>] ? ieee80211s_init+0xf8/0x10f [mac80211]
    [  128.933099]  [<c830a5df>] ? ieee80211_mesh_init_sdata+0xdb/0x154 [mac80211]
    
    Signed-off-by: Javier Cardona <javier at cozybit.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 229bd792be0bad245b78ed8f119952733a4752e5
Author: David Kilroy <kilroyd at googlemail.com>
Date:   Tue Dec 7 18:50:42 2010 +0000

    orinoco: initialise priv->hw before assigning the interrupt
    
    The interrupt handler takes a lock - but since commit bcad6e80f3f this
    lock goes through an indirection specified in the hermes_t structure.
    We must therefore initialise the structure before setting up the
    interrupt handler.
    
    Fix orinoco_cs and spectrum_cs
    
    <https://bugzilla.kernel.org/show_bug.cgi?id=23932>
    
    Bisected by: Matt Domsch <Matt_Domsch at dell.com>
    Signed-off by: David Kilroy <kilroyd at googlemail.com>
    Cc: stable at kernel.org
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit c7757fdb41dfcf6add9f8a4576eb85aa5e77a4eb
Author: Breno Leitao <leitao at linux.vnet.ibm.com>
Date:   Wed Dec 8 12:19:14 2010 -0800

    ehea: Fixing LRO configuration
    
    In order to set LRO on ehea, the user must set a module parameter, which
    is not the standard way to do so. This patch adds a way to set LRO using
    the ethtool tool.
    
    Signed-off-by: Breno Leitao <leitao at linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 67631510a318d5a930055fe927607f483716e100
Author: Tom Herbert <therbert at google.com>
Date:   Wed Dec 8 12:16:33 2010 -0800

    tcp: Replace time wait bucket msg by counter
    
    Rather than printing the message to the log, use a mib counter to keep
    track of the count of occurences of time wait bucket overflow.  Reduces
    spam in logs.
    
    Signed-off-by: Tom Herbert <therbert at google.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 171995e5d82dcc92bea37a7d2a2ecc21068a0f19
Author: Apollon Oikonomopoulos <apollon at noc.grnet.gr>
Date:   Tue Dec 7 09:43:30 2010 +0000

    x25: decrement netdev reference counts on unload
    
    x25 does not decrement the network device reference counts on module unload.
    Thus unregistering any pre-existing interface after unloading the x25 module
    hangs and results in
    
     unregister_netdevice: waiting for tap0 to become free. Usage count = 1
    
    This patch decrements the reference counts of all interfaces in x25_link_free,
    the way it is already done in x25_link_device_down for NETDEV_DOWN events.
    
    Signed-off-by: Apollon Oikonomopoulos <apollon at noc.grnet.gr>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 408cc293c29ada769ae772420a39961320da1854
Author: Joe Jin <joe.jin at oracle.com>
Date:   Mon Dec 6 03:00:59 2010 +0000

    driver/net/benet: fix be_cmd_multicast_set() memcpy bug
    
    Regarding  benet be_cmd_multicast_set() function, now using
    netdev_for_each_mc_addr() helper for mac address copy, but
    when copying to req->mac[] did not increase of the index.
    
    Cc: Sathya Perla <sathyap at serverengines.com>
    Cc: Subbu Seetharaman <subbus at serverengines.com>
    Cc: Sarveshwar Bandi <sarveshwarb at serverengines.com>
    Cc: Ajit Khaparde <ajitk at serverengines.com>
    Signed-off-by: Joe Jin <joe.jin at oracle.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e8d34a884e4ff118920bb57664def8a73b1b784f
Author: Michal Marek <mmarek at suse.cz>
Date:   Mon Dec 6 02:39:12 2010 +0000

    l2tp: Fix modalias of l2tp_ip
    
    Using the SOCK_DGRAM enum results in
    "net-pf-2-proto-SOCK_DGRAM-type-115", so use the numeric value like it
    is done in net/dccp.
    
    Signed-off-by: Michal Marek <mmarek at suse.cz>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 0c62fc6dd02c8d793c75ae76a9b6881fc36388ad
Author: Nelson Elhage <nelhage at ksplice.com>
Date:   Wed Dec 8 10:13:55 2010 -0800

    econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.
    
    We need to drop the mutex and do a dev_put, so set an error code and break like
    the other paths, instead of returning directly.
    
    Signed-off-by: Nelson Elhage <nelhage at ksplice.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 083384755252cde25af187acf1807a0f5edb901f
Merge: 35d9b0c906ad92d32a0b8db5daa6fabfcc2f068d e8f149924a3111015d16dfbbb4816cfc75ba53cd
Author: David S. Miller <davem at davemloft.net>
Date:   Wed Dec 8 12:13:23 2010 -0800

    Merge branch 'sfc-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6

commit e726f3c368e7c1919a7166ec09c5705759f1a69d
Author: Borislav Petkov <borislav.petkov at amd.com>
Date:   Mon Dec 6 16:20:25 2010 +0100

    amd64_edac: Fix interleaving check
    
    When matching error address to the range contained by one memory node,
    we're in valid range when node interleaving
    
    1. is disabled, or
    2. enabled and when the address bits we interleave on match the
    interleave selector on this node (see the "Node Interleaving" section in
    the BKDG for an enlightening example).
    
    Thus, when we early-exit, we need to reverse the compound logic
    statement properly.
    
    Cc: <stable at kernel.org>
    Signed-off-by: Borislav Petkov <borislav.petkov at amd.com>

commit 76f04f2591e60fa76e70a2736965bc810bf1c764
Author: Andrei Konovalov <akonovalov at mvista.com>
Date:   Tue Dec 7 07:48:00 2010 -0500

    EDAC: Correct MiB_TO_PAGES() macro
    
    This corrects the misprint introduced when moving '#if
    PAGE_SHIFT' from i7core_edac.c to edac_core.h (commit
    e9144601d364d5b81f3e63949337f8507eb58dca)
    
    Cc: Mauro Carvalho Chehab <mchehab at redhat.com>
    Signed-off-by: Andrei Konovalov <akonovalov at mvista.com>
    Signed-off-by: Borislav Petkov <borislav.petkov at amd.com>

commit bb31b3122c0dd07d2d958da17a50ad771ce79e2b
Author: Borislav Petkov <borislav.petkov at amd.com>
Date:   Thu Dec 2 17:48:35 2010 +0100

    EDAC: Fix workqueue-related crashes
    
    00740c58541b6087d78418cebca1fcb86dc6077d changed edac_core to
    un-/register a workqueue item only if a lowlevel driver supplies a
    polling routine. Normally, when we remove a polling low-level driver, we
    go and cancel all the queued work. However, the workqueue unreg happens
    based on the ->op_state setting, and edac_mc_del_mc() sets this to
    OP_OFFLINE _before_ we cancel the work item, leading to NULL ptr oops on
    the workqueue list.
    
    Fix it by putting the unreg stuff in proper order.
    
    Cc: <stable at kernel.org> #36.x
    Reported-and-tested-by: Tobias Karnat <tobias.karnat at googlemail.com>
    LKML-Reference: <1291201307.3029.21.camel at Tobias-Karnat>
    Signed-off-by: Borislav Petkov <borislav.petkov at amd.com>

commit 545c988b2018a593f24d291b66776a0d08525acd
Author: Suresh Jayaraman <sjayaraman at suse.de>
Date:   Mon Dec 6 13:45:50 2010 +0530

    cifs: remove bogus remapping of error in cifs_filldir()
    
    As the FIXME points out correctly, now filldir() itself returns -EOVERFLOW if
    it not possible to represent the inode number supplied by the filesystem in
    the field provided by userspace.
    
    Signed-off-by: Suresh Jayaraman <sjayaraman at suse.de>
    Reviewed-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit 35d9b0c906ad92d32a0b8db5daa6fabfcc2f068d
Author: Eric Dumazet <eric.dumazet at gmail.com>
Date:   Sun Dec 5 02:03:26 2010 +0000

    llc: fix a device refcount imbalance
    
    Le dimanche 05 décembre 2010 à 12:23 +0100, Eric Dumazet a écrit :
    > Le dimanche 05 décembre 2010 à 09:19 +0100, Eric Dumazet a écrit :
    >
    > > Hmm..
    > >
    > > If somebody can explain why RTNL is held in arp_ioctl() (and therefore
    > > in arp_req_delete()), we might first remove RTNL use in arp_ioctl() so
    > > that your patch can be applied.
    > >
    > > Right now it is not good, because RTNL wont be necessarly held when you
    > > are going to call arp_invalidate() ?
    >
    > While doing this analysis, I found a refcount bug in llc, I'll send a
    > patch for net-2.6
    
    Oh well, of course I must first fix the bug in net-2.6, and wait David
    pull the fix in net-next-2.6 before sending this rcu conversion.
    
    Note: this patch should be sent to stable teams (2.6.34 and up)
    
    [PATCH net-2.6] llc: fix a device refcount imbalance
    
    commit abf9d537fea225 (llc: add support for SO_BINDTODEVICE) added one
    refcount imbalance in llc_ui_bind(), because dev_getbyhwaddr() doesnt
    take a reference on device, while dev_get_by_index() does.
    
    Fix this using RCU locking. And since an RCU conversion will be done for
    2.6.38 for dev_getbyhwaddr(), put the rcu_read_lock/unlock exactly at
    their final place.
    
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Cc: stable at kernel.org
    Cc: Octavian Purdila <opurdila at ixiacom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 75c1c82566f23dd539fb7ccbf57a1caa7ba82628
Author: Changli Gao <xiaosuo at gmail.com>
Date:   Sat Dec 4 14:09:08 2010 +0000

    ifb: goto resched directly if error happens and dp->tq isn't empty
    
    If we break the loop when there are still skbs in tq and no skb in
    rq, the skbs will be left in txq until new skbs are enqueued into rq.
    In rare cases, no new skb is queued, then these skbs will stay in rq
    forever.
    
    After this patch, if tq isn't empty when we break the loop, we goto
    resched directly.
    
    Signed-off-by: Changli Gao <xiaosuo at gmail.com>
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b1afde60f2b9ee8444fba4e012dc99a3b28d224d
Author: Nandita Dukkipati <nanditad at google.com>
Date:   Fri Dec 3 13:33:44 2010 +0000

    tcp: Bug fix in initialization of receive window.
    
    The bug has to do with boundary checks on the initial receive window.
    If the initial receive window falls between init_cwnd and the
    receive window specified by the user, the initial window is incorrectly
    brought down to init_cwnd. The correct behavior is to allow it to
    remain unchanged.
    
    Signed-off-by: Nandita Dukkipati <nanditad at google.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ce9aeb583a1071304d0e4ab8db600bfc8a6a1b44
Author: Dimitris Michailidis <dm at chelsio.com>
Date:   Fri Dec 3 10:39:04 2010 +0000

    cxgb4: fix MAC address hash filter
    
    Fix the calculation of the inexact hash-based MAC address filter.
    It's 64 bits but current code is missing a ULL.  Results in filtering out
    some legitimate packets.
    
    Signed-off-by: Dimitris Michailidis <dm at chelsio.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c1ac3ffcd0bc7e9617f62be8c7043d53ab84deac
Author: Neil Brown <neilb at suse.de>
Date:   Thu Dec 2 11:14:30 2010 +1100

    nfsd: Fix possible BUG_ON firing in set_change_info
    
    If vfs_getattr in fill_post_wcc returns an error, we don't
    set fh_post_change.
    For NFSv4, this can result in set_change_info triggering a BUG_ON.
    i.e. fh_post_saved being zero isn't really a bug.
    
    So:
     - instead of BUGging when fh_post_saved is zero, just clear ->atomic.
     - if vfs_getattr fails in fill_post_wcc, take a copy of i_ctime anyway.
       This will be used i seg_change_info, but not overly trusted.
     - While we are there, remove the pointless 'if' statements in set_change_info.
       There is no harm setting all the values.
    
    Signed-off-by: NeilBrown <neilb at suse.de>
    Cc: stable at kernel.org
    Signed-off-by: J. Bruce Fields <bfields at redhat.com>

commit e83293233faf6e49870e7bfdcddf5374cb463d54
Author: Kim Lilliestierna XX <kim.xx.lilliestierna at stericsson.com>
Date:   Tue Nov 30 09:11:22 2010 +0000

    CAIF: Fix U5500 compile error for shared memory driver
    
    Rearrange pr_fmt so it compiles.
    
    Signed-off-by: Sjur Braendeland <sjur.brandeland at stericsson.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 4f58605e6b7ae30a0d048af6a868582768e6754c
Merge: b8eb3a1046f68a5b8f284830d971c62688cd606b d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c
Author: David S. Miller <davem at davemloft.net>
Date:   Wed Dec 8 08:13:01 2010 -0800

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 8b0f1840a46449e1946fc88860ef3ec8d6b1c2c7
Author: Gabriele Gorla <gorlik at penguintown.net>
Date:   Wed Dec 8 16:27:22 2010 +0100

    hwmon: (adm1026) Allow 1 as a valid divider value
    
    Allow 1 as a valid div value as specified in the ADM1026 datasheet.
    
    Signed-off-by: Gabriele Gorla <gorlik at penguintown.net>
    Cc: stable at kernel.org
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit 52bc9802ce849d0d287cc5fe76d06b0daa3986ca
Author: Gabriele Gorla <gorlik at penguintown.net>
Date:   Wed Dec 8 16:27:22 2010 +0100

    hwmon: (adm1026) Fix setting fan_div
    
    Prevent setting fan_div from stomping on other fans that share the
    same I2C register.
    
    Signed-off-by: Gabriele Gorla <gorlik at penguintown.net>
    Cc: stable at kernel.org
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit 6229cdb23648d0c2875b3fb102cdaf4bf08fcfa4
Author: Jean Delvare <khali at linux-fr.org>
Date:   Wed Dec 8 16:27:22 2010 +0100

    hwmon: (it87) Fix manual fan speed control on IT8721F
    
    The manual fan speed control logic of the IT8721F is much different
    from what older devices had. Update the code to properly support that.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Acked-by: Guenter Roeck <guenter.roeck at ericsson.com>

commit 6313e3c21743cc88bb5bd8aa72948ee1e83937b6
Merge: 6dde39be39e636c1d41e73590668d5903b11535b e7a3481c0246c8e45e79c629efd63b168e91fcda 18483b81ee7e70ee68d4b18be618be5cfcc0b290 61ab25447ad6334a74e32f60efb135a3467223f8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Dec 8 06:40:59 2010 -0800

    Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86/pvclock: Zero last_value on resume
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf record: Fix eternal wait for stillborn child
      perf header: Don't assume there's no attr info if no sample ids is provided
      perf symbols: Figure out start address of kernel map from kallsyms
      perf symbols: Fix kallsyms kernel/module map splitting
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      nohz: Fix printk_needs_cpu() return value on offline cpus
      printk: Fix wake_up_klogd() vs cpu hotplug

commit 6dde39be39e636c1d41e73590668d5903b11535b
Merge: f8f5d4f11dc7d321fb372b09fc8767069a18bf30 599bbb9de0fe9c494a223a34d790b353ad4d69f8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Dec 8 06:34:39 2010 -0800

    Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/i915: i915 cannot provide switcher services.
      drm/radeon/kms: fix vram base calculation on rs780/rs880
      drm/radeon/kms: fix formatting of vram and gtt info
      drm/radeon/kms: forbid big bo allocation (fdo 31708) v3
      drm: Don't try and disable an encoder that was never enabled
      drm: Add missing drm_vblank_put() along queue vblank error path
      drm/i915/dp: Only apply the workaround if the select is still active
      drm/i915: Emit a request to clear a flushed and idle ring for unbusy bo
      drm/i915/lvds: Always restore panel-fitter when enabling the LVDS
      drm/i915/ringbuffer: Only print an error on the second attempt to reset head
      drm/i915: announce to userspace that the bsd ring is coherent
      agp/intel: Fix wrong kunmap in i830_cleanup()
      drm/i915: Factor in pixel-repeat in FDI M/N calculation
      drm/i915: Death to the unnecessary 64bit divide
      drm/i915: Clean conflicting modesetting registers upon init
      drm/i915: Apply a workaround for transitioning from DP on pipe B to HDMI.
      drm/i915: Always set the DP transcoder config to 8BPC.

commit f8f5d4f11dc7d321fb372b09fc8767069a18bf30
Merge: 2cedcc4f122934c3ad38dfb2a400b98a62703e6d 47d092352c132a2d0ee4156b5dca263eaad2c17f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Dec 8 06:34:02 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: wacom - add new Bamboo PT (0xdb)
      Input: add input driver for polled GPIO buttons
      Input: turbografx - fix reference counting
      Input: synaptics - fix handling of 2-button ClickPads
      Input: wacom - add IDs for two new Bamboo PTs
      Input: document struct input_absinfo
      Input: add keycodes for touchpad on/off keys
      Input: usbtouchscreen - add support for LG Flatron T1710B

commit 0bbaee3a58c379c4f7bab9635c71d7bad9c422a2
Author: Anssi Hannula <anssi.hannula at iki.fi>
Date:   Tue Dec 7 21:19:23 2010 +0200

    ALSA: hda - Reset sample sizes and max bitrates when reading ELD
    
    When a new HDMI/DP device is plugged in, hdmi_update_short_audio_desc()
    is called for every SAD (Short Audio Descriptor) in the ELD data. For
    LPCM coding type SAD defines the supported sample sizes. For several
    other coding types (such as AC-3), a maximum bitrate is defined.
    
    The maximum bitrate and sample size fields are not always cleared.
    Therefore, if a device is unplugged and a different one is plugged in,
    and the coding types of some SAD positions differ between the devices,
    the old max_bitrate or sample_bits values will persist if the new SADs
    do not define those values.
    
    The leftover max_bitrate and sample_bits do not cause any issues other
    than wrongly showing up in eld#X.Y procfs file and kernel log.
    
    Fix that by always clearing sample_bits and max_bitrate when reading
    SADs.
    
    Signed-off-by: Anssi Hannula <anssi.hannula at iki.fi>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 599bbb9de0fe9c494a223a34d790b353ad4d69f8
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Dec 6 12:42:46 2010 +1000

    drm/i915: i915 cannot provide switcher services.
    
    it has a DSM but the switcher is done via WMI.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 47d092352c132a2d0ee4156b5dca263eaad2c17f
Author: David Foley <favux.is at gmail.com>
Date:   Tue Dec 7 21:05:59 2010 -0800

    Input: wacom - add new Bamboo PT (0xdb)
    
    Adds new Bamboo Pen & Touch model - Bamboo P & T Special Edition
    Medium (CTH661/L; Product ID = 0xdb).
    
    Tested-by: Tobias Verbeke <tobias.verbeke at gmail.com>
    Signed-off-by: David Foley <favux.is at gmail.com>
    Acked-by: Ping Cheng <pingc at wacom.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 2df485a774ba59c3f43bfe84107672c1d9b731a0
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Tue Dec 7 22:39:17 2010 -0500

    nfs: remove extraneous and problematic calls to nfs_clear_request
    
    When a nfs_page is freed, nfs_free_request is called which also calls
    nfs_clear_request to clean out the lock and open contexts and free the
    pagecache page.
    
    However, a couple of places in the nfs code call nfs_clear_request
    themselves. What happens here if the refcount on the request is still high?
    We'll be releasing contexts and freeing pointers while the request is
    possibly still in use.
    
    Remove those bare calls to nfs_clear_context. That should only be done when
    the request is being freed.
    
    Note that when doing this, we need to watch out for tests of req->wb_page.
    Previously, nfs_set_page_tag_locked() and nfs_clear_page_tag_locked()
    would check the value of req->wb_page to figure out if the page is mapped
    into the nfsi->nfs_page_tree. We now indicate the page is mapped using
    the new bit PG_MAPPED in req->wb_flags .
    
    Reported-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit e281f7ec95fbbf905c10e11c83231f3d9090c22f
Author: Aaro Koskinen <Aaro.Koskinen at nokia.com>
Date:   Tue Nov 30 14:17:58 2010 +0000

    arm: omap2: io: fix clk_get() error check
    
    clk_get() return value should be checked with IS_ERR().
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at nokia.com>
    Acked-by: Kevin Hilman <khilman at deeprootsystems.com>
    Signed-off-by: Tony Lindgren <tony at atomide.com>

commit ed2849d3ecfa339435818eeff28f6c3424300cec
Author: NeilBrown <neilb at suse.de>
Date:   Tue Nov 16 16:55:19 2010 +1100

    sunrpc: prevent use-after-free on clearing XPT_BUSY
    
    When an xprt is created, it has a refcount of 1, and XPT_BUSY is set.
    The refcount is *not* owned by the thread that created the xprt
    (as is clear from the fact that creators never put the reference).
    Rather, it is owned by the absence of XPT_DEAD.  Once XPT_DEAD is set,
    (And XPT_BUSY is clear) that initial reference is dropped and the xprt
    can be freed.
    
    So when a creator clears XPT_BUSY it is dropping its only reference and
    so must not touch the xprt again.
    
    However svc_recv, after calling ->xpo_accept (and so getting an XPT_BUSY
    reference on a new xprt), calls svc_xprt_recieved.  This clears
    XPT_BUSY and then svc_xprt_enqueue - this last without owning a reference.
    This is dangerous and has been seen to leave svc_xprt_enqueue working
    with an xprt containing garbage.
    
    So we need to hold an extra counted reference over that call to
    svc_xprt_received.
    
    For safety, any time we clear XPT_BUSY and then use the xprt again, we
    first get a reference, and the put it again afterwards.
    
    Note that svc_close_all does not need this extra protection as there are
    no threads running, and the final free can only be called asynchronously
    from such a thread.
    
    Signed-off-by: NeilBrown <neilb at suse.de>
    Cc: stable at kernel.org
    Signed-off-by: J. Bruce Fields <bfields at redhat.com>

commit 2cedcc4f122934c3ad38dfb2a400b98a62703e6d
Merge: 6142e05f30b101adeafb0d12e35983f44f68233e 812c4e40c27b6ea103ecfbf91d43654356629b81
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 7 17:13:50 2010 -0800

    Merge branch 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux
    
    * 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux:
      ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
      ARM: mini2440: Fix Kconfig to allow kernel to build
      ARM: S3C2412: Fix typo in CONFIG_CPU_S3C2412_ONLY definition
      ARM: S3C2443: Select properly ARM core type
      ARM: SMDK2416: Select MACH_SMDK, S3C_DEV_NAND, S3C_DEV_USB_HOST

commit 812c4e40c27b6ea103ecfbf91d43654356629b81
Author: Vasily Khoruzhick <anarsoul at gmail.com>
Date:   Wed Dec 1 08:29:23 2010 +0200

    ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
    
    Currently the {set,get}_pull callbacks of the s3c24xx_gpiocfg_default structure
    are initalized via s3c_gpio_{get,set}pull_1up. This results in a linker
    error when only CONFIG_CPU_S3C2442 is selected:
    
    arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f4): undefined reference to
    `s3c_gpio_getpull_1up'
    arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f8): undefined reference to
    `s3c_gpio_setpull_1up'
    
    The s3c2442 has pulldowns instead of pullups compared to the s3c2440.
    The method of controlling them is the same though.
    So this patch modifies the existing s3c_gpio_{get,set}pull_1up helper functions
    to take an additional parameter deciding whether the pin has a pullup or pulldown.
    The s3c_gpio_{get,set}pull_1{down,up} functions then wrap that functions passing
    either S3C_GPIO_PULL_UP or S3C_GPIO_PULL_DOWN.
    
    Furthermore this patch sets up the s3c24xx_gpiocfg_default.{get,set}_pull fields
    in the s3c244{0,2}_map_io function to the new pulldown helper functions.
    
    Based on patch from "Lars-Peter Clausen" <lars at metafoo.de>
    
    Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>

commit 0de1b7e800188782973598158e0acbb9e08e6c99
Author: Mi Jinlong <mijinlong at cn.fujitsu.com>
Date:   Sat Oct 30 10:19:33 2010 +0800

    nfs: kernel should return EPROTONOSUPPORT when not support NFSv4
    
      When nfs client(kernel) don't support NFSv4, maybe user build
      kernel without NFSv4, there is a problem.
    
      Using command "mount SERVER-IP:/nfsv3 /mnt/" to mount NFSv3
      filesystem, mount should should success, but fail and get error:
    
        "mount.nfs: an incorrect mount option was specified"
    
      System call mount "nfs"(not "nfs4") with "vers=4",
      if CONFIG_NFS_V4 is not defined, the "vers=4" will be parsed
      as invalid argument and kernel return EINVAL to nfs-utils.
    
      About that, we really want get EPROTONOSUPPORT rather than
      EINVAL. This path make sure kernel parses argument success,
      and return EPROTONOSUPPORT at nfs_validate_mount_data().
    
    Signed-off-by: Mi Jinlong <mijinlong at cn.fujitsu.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 21ac19d484a8ffb66f64487846c8d53afef04d2b
Author: Sergey Vlasov <vsu at altlinux.ru>
Date:   Sun Nov 28 21:04:05 2010 +0000

    NFS: Fix fcntl F_GETLK not reporting some conflicts
    
    The commit 129a84de2347002f09721cda3155ccfd19fade40 (locks: fix F_GETLK
    regression (failure to find conflicts)) fixed the posix_test_lock()
    function by itself, however, its usage in NFS changed by the commit
    9d6a8c5c213e34c475e72b245a8eb709258e968c (locks: give posix_test_lock
    same interface as ->lock) remained broken - subsequent NFS-specific
    locking code received F_UNLCK instead of the user-specified lock type.
    To fix the problem, fl->fl_type needs to be saved before the
    posix_test_lock() call and restored if no local conflicts were reported.
    
    Reference: https://bugzilla.kernel.org/show_bug.cgi?id=23892
    Tested-by: Alexander Morozov <amorozov at etersoft.ru>
    Signed-off-by: Sergey Vlasov <vsu at altlinux.ru>
    Cc: <stable at kernel.org>
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 08a22b392a141c201d7ed4d435de942aa853acd3
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date:   Wed Dec 1 10:42:16 2010 +0000

    nfs: Discard ACL cache on mode update
    
    An update of mode bits can result in ACL value being changed. We need
    to mark the acl cache invalid when we update mode. Similarly we need
    to update file attribute when we change ACL value
    
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit c989a7fc139ec8975fdc230e2de42f3c4555880e
Author: Sascha Hauer <s.hauer at pengutronix.de>
Date:   Mon Dec 6 11:09:57 2010 +0100

    dmaengine i.MX SDMA: initialize on module_init
    
    The firmware framework gets initialized during fs_initcall time, so
    we are not allowed to call request_firmware earlier.
    
    Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit 8961d52d4cc52edf5672f8f2712c57162b736793
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Dec 3 14:37:22 2010 -0500

    drm/radeon/kms: fix vram base calculation on rs780/rs880
    
    Avoid overflowing a 32 bit value.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit dd7cc55a258400440aff5869d3e1e111142297cd
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Dec 3 14:37:21 2010 -0500

    drm/radeon/kms: fix formatting of vram and gtt info
    
    print the full 64 bit values.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 93225b0d7bc030f4a93165347a65893685822d70
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Fri Dec 3 16:38:19 2010 -0500

    drm/radeon/kms: forbid big bo allocation (fdo 31708) v3
    
    Forbid allocating buffer bigger than visible VRAM or GTT, also
    properly set lpfn field.
    
    v2 - use max macro
       - silence warning
    v3 - don't explicitly set range limit
       - use min macro
    
    Cc: stable <stable at kernel.org>
    
    Signed-off-by: Jerome Glisse <jglisse at redhat.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 541cc966915b6756e54c20eebe60ae957afdb537
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Dec 6 11:24:07 2010 +0000

    drm: Don't try and disable an encoder that was never enabled
    
    Prevents code that assumes that the encoder is active when asked to be
    disabled from dying a horrible death.
    
    Reported-by: Daniel Vetter <daniel.vetter at ffwll.ch>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit ea5d552c73707645c53d42e8a71c9a4d9cbb85c1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Dec 1 19:41:31 2010 +0000

    drm: Add missing drm_vblank_put() along queue vblank error path
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: Kristian Høgsberg <krh at bitplanet.net>
    Acked-by: Jesse Barnes <jbarnes at virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit e516c7df4cfe335a2ea220480cfac558dc738ae4
Merge: 81e8d2162566379adcf4b3700f03845c62577145 1b39d6f37622f1da70aa2cfd38bfff9a52c13e05
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 8 09:30:59 2010 +1000

    Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes

commit 943d8d8bca431d6c93f17bf38f4b09c65e0a81d7
Author: Tomoya MORINAGA <tomoya-linux at dsn.okisemi.com>
Date:   Wed Dec 1 19:49:48 2010 +0900

    dma : EG20T PCH: Fix miss-setting DMA descriptor
    
    Currently, in case of using scatter/gather mode, head of data is not sent to
    
    destination. The cause is second descriptor address is set to NEXT.
    
    The NEXT must have head of descriptor address.
    
    This patch sets head of descriptor address to the NEXT.
    
    Acked-by: Yong Wang <youg.y.wang at intel.com>
    Signed-off-by: Tomoya MORINAGA <tomoya-linux at dsn.okisemi.com>
    [dan.j.williams at intel.com: fixed up usage of virt_to_phys()]
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit 1b39d6f37622f1da70aa2cfd38bfff9a52c13e05
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Dec 6 11:20:45 2010 +0000

    drm/i915/dp: Only apply the workaround if the select is still active
    
    As we may try to power down the link at various times, it is not
    necessarily still coupled with an encoder and so we must be careful not
    to depend upon an operation that is only valid when the link is still
    attached to a pipe.
    
    Fixes regression in 5bddd17.
    
    Reported-and-tested-by: Daniel Vetter <daniel.vetter at ffwll.ch>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: stable at kernel.org [after applying 5bddd17]

commit e8f149924a3111015d16dfbbb4816cfc75ba53cd
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Tue Dec 7 19:47:34 2010 +0000

    sfc: Fix NAPI list corruption during ring reallocation
    
    Call netif_napi_{add,del}() on the NAPI contexts in the new and
    old channels, respectively.
    
    Since efx_init_napi() cannot fail, make its return type void.
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>

commit 884a963fa1c828a5c5fa7a46b2877dd463bfd47c
Author: Rajkumar Manoharan <rmanoharan at atheros.com>
Date:   Tue Dec 7 17:42:18 2010 +0530

    ath9k: fix beacon resource related race condition
    
    The beacon tasklet is accesssing the bslot info for beacon generation.
    Meanwhile the same slot can be freed on interface deletion.
    Current the remove_interface disables the beacon alert after freeing the slot.
    This may leads to null pointer access.
    
    This patch disables SWBA and kills the beacon tasklet to prevent access
    to the slot to be freed. After releasing the slot, swba will be enabled again
    upon the availablity of beaconing interfaces.
    
    Signed-off-by: Rajkumar Manoharan <rmanoharan at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 38852b20c8b6d97618204ac64abbf14f0080393e
Author: Senthil Balasubramanian <senthilkumar at atheros.com>
Date:   Mon Dec 6 19:09:27 2010 +0530

    ath9k: Fix STA disconnect issue due to received MIC failed bcast frames
    
    AR_RxKeyIdxValid will not be set for bcast/mcast frames and so relying
    this status for MIC failed frames is buggy.
    
    Due to this, MIC failure events for broadcast frames are not sent to
    supplicant resulted in AP disconnecting the STA.
    
    Able to pass Wifi Test case 5.2.18 with this fix.
    
    Cc: Stable <stable at kernel.org> (2.6.36+)
    Signed-off-by: Senthil Balasubramanian <senthilkumar at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 080e1a259acea10b6df8e2a8e49b47481940220a
Author: Felix Fietkau <nbd at openwrt.org>
Date:   Sun Dec 5 20:17:53 2010 +0100

    ath9k: fix a DMA related race condition on reset
    
    When ath_drain_all_txq fails to stop DMA, it issues a hw reset. This reset
    happens at a very problematic point in time, when the hardware rx path has
    not been stopped yet. This could lead to memory corruption, hardware hangs
    or other issues.
    To fix these issues, simply remove the reset entirely and check the tx DMA
    stop status to prevent problems with fast channel changes.
    
    Signed-off-by: Felix Fietkau <nbd at openwrt.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 841051602e3fa18ea468fe5a177aa92b6eb44b56
Author: Matteo Croce <technoboy85 at gmail.com>
Date:   Fri Dec 3 02:25:08 2010 +0100

    ath9k: fix bug in tx power
    
    The ath9k driver subtracts 3 dBm to the txpower as with two radios the
    signal power is doubled.
    The resulting value is assigned in an u16 which overflows and makes
    the card work at full power.
    
    Cc: stable at kernel.org
    Signed-off-by: Matteo Croce <matteo at openwrt.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 94dec6a2d20a26a779b63bb584e48db5fb0ddb53
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Tue Dec 7 19:24:45 2010 +0000

    sfc: Fix crash in legacy onterrupt handler during ring reallocation
    
    If we are using a legacy interrupt, our IRQ may be shared and our
    interrupt handler may be called even though interrupts are disabled on
    the NIC. When we change ring sizes, we reallocate the event queue and
    the interrupt handler may use an invalid pointer when called for
    another device's interrupt.
    
    Maintain a legacy_irq_enabled flag and test that at the top of the
    interrupt handler.  Note that this problem results from the need to
    work around broken INT_ISR0 reads, and does not affect the legacy
    interrupt handler for Falcon A1.
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>

commit 6142e05f30b101adeafb0d12e35983f44f68233e
Author: David Howells <dhowells at redhat.com>
Date:   Tue Dec 7 17:41:40 2010 +0000

    MN10300: Fix interrupt mask alteration function call name in gdbstub
    
    Fix the name of interrupt mask alteration function (ie the
    local_change_intr_mask_level() fn) called in gdbstub to have an arch_
    prefix to match the definition in asm/irqflags.h.
    
    Signed-off-by: David Howells <dhowells at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7d161b7f41e24203b54b0f18ae0d26c18a6c6fab
Author: Jeff Layton <jlayton at redhat.com>
Date:   Tue Dec 7 02:10:35 2010 -0500

    cifs: allow calling cifs_build_path_to_root on incomplete cifs_sb
    
    It's possible that cifs_mount will call cifs_build_path_to_root on a
    newly instantiated cifs_sb. In that case, it's likely that the
    master_tlink pointer has not yet been instantiated.
    
    Fix this by having cifs_build_path_to_root take a cifsTconInfo pointer
    as well, and have the caller pass that in.
    
    Reported-and-Tested-by: Robbert Kouprie <robbert at exx.nl>
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit 03ceace5c6923ffbcf2b4d2e37afbffbdb5d4a67
Author: Jeff Layton <jlayton at redhat.com>
Date:   Mon Dec 6 21:07:33 2010 -0500

    cifs: fix check of error return from is_path_accessable
    
    This function will return 0 if everything went ok. Commit 9d002df4
    however added a block of code after the following check for
    rc == -EREMOTE. With that change and when rc == 0, doing the
    "goto mount_fail_check" here skips that code, leaving the tlink_tree
    and master_tlink pointer unpopulated. That causes an oops later
    in cifs_root_iget.
    
    Reported-and-Tested-by: Robbert Kouprie <robbert at exx.nl>
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit 3dc86429032910bdf762adeb2969112bb303924c
Author: Anssi Hannula <anssi.hannula at iki.fi>
Date:   Tue Dec 7 20:56:19 2010 +0200

    ALSA: hda - Always allow basic audio irrespective of ELD info
    
    Commit bbbe33900d1f3c added functionality to restrict PCM parameters
    based on ELD info (derived from EDID data) of the audio sink.
    
    However, according to CEA-861-D no SAD is needed for basic audio
    (32/44.1/48kHz stereo 16-bit audio), which is instead indicated with a
    basic audio flag in the CEA EDID Extension.
    
    The flag is not present in ELD. However, as all audio capable sinks are
    required to support basic audio, we can assume it to be always
    available.
    
    Fix allowed audio formats with sinks that have SADs (Short Audio
    Descriptors) which do not completely overlap with the basic audio
    formats (there are no reports of affected devices so far) by always
    assuming that basic audio is supported.
    
    Reported-by: Stephen Warren <swarren at nvidia.com>
    Signed-off-by: Anssi Hannula <anssi.hannula at iki.fi>
    Cc: stable at kernel.org
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 4b0dbdb17f846a8887e5f7fbeea2deb0703236bd
Author: Anssi Hannula <anssi.hannula at iki.fi>
Date:   Tue Dec 7 18:41:35 2010 +0200

    ALSA: hda - Do not wrongly restrict min_channels based on ELD
    
    Commit bbbe33900d1f3c added functionality to restrict PCM parameters
    based on ELD info (derived from EDID data) of the audio sink.
    
    However, it wrongly assumes that the bits 0-2 of the first byte of
    CEA Short Audio Descriptors mean a supported number of channels. In
    reality, they mean the maximum number of channels (as per CEA-861-D
    7.5.2). This means that the channel count can only be used to restrict
    max_channels, not min_channels.
    
    Restricting min_channels causes us to deny opening the device in stereo
    mode if the sink only has SADs that declare larger numbers of channels
    (like Primare SP32 AV Processor does).
    
    Fix that by not restricting min_channels based on ELD information.
    
    Signed-off-by: Anssi Hannula <anssi.hannula at iki.fi>
    Reported-by: Jean-Yves Avenard <jyavenard at gmail.com>
    Tested-by: Jean-Yves Avenard <jyavenard at gmail.com>
    Cc: stable at kernel.org
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 47c716cbf638a16583441d78be3fc24345eab636
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Tue Dec 7 12:44:56 2010 -0500

    NFS: Readdir cleanups
    
    No functional changes, but clarify the code.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 18fb5fe40ce7f789b5cfc3aa81ff1e6175b0a5be
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Tue Dec 7 12:41:58 2010 -0500

    NFS: nfs_readdir_search_for_cookie() don't mark as eof if cookie not found
    
    If we're searching for a specific cookie, and it isn't found in the page
    cache, we should try an uncached_readdir(). To do so, we return EBADCOOKIE,
    but we don't set desc->eof.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 81e8d2162566379adcf4b3700f03845c62577145
Merge: ff43fa8b41fe93cc62bb571a1bfeb487a3f79901 25c9170ed64a6551beefe9315882f754e14486f4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 7 08:14:28 2010 -0800

    Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      genirq: Fix incorrect proc spurious output

commit ff43fa8b41fe93cc62bb571a1bfeb487a3f79901
Merge: c2048b0a0a6e589d9813766489f78185cbabcdc6 8b14d7b22c61f17ccb869e0047d9df6dd9f50a9f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 7 08:14:04 2010 -0800

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
      wmi: use memcmp instead of strncmp to compare GUIDs
      ACPI, hp-wmi: Fix memory leak in acpi query
      msi-wmi: fix semantically incorrect use of keycode instead of scancode
      msi-wmi: Add mute key support
      asus-laptop: add wimax and wwan support
      eeepc-wmi: fix compiler warning
      ibm_rtl: _RTL_ is not available in UEFI mode
      ibm_rtl: Loosen the DMI criteria to all IBM machines
      drivers/platform/x86/thinkpad_acpi.c: delete double assignment
      eeepc-wmi: add cpufv sysfs documentation
      toshiba_acpi.c: Add key_entry for a lone FN keypress
      ibm_rtl: fix printk format warning

commit c2048b0a0a6e589d9813766489f78185cbabcdc6
Merge: de47de7404e29df8de82f5822b4fde1a6ed97b54 8d7bfb4a891d606d52e1a99cf7231b4417b935dc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Dec 7 08:04:08 2010 -0800

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
    
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] css: fix rsid evaluation for 2nd crw
      [S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus

commit 2a7b1a00206895cfa444fd83477dca67a88a9d25
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Tue Dec 7 15:32:38 2010 +0000

    ASoC: Correct WM8962 interrupt mask register read
    
    Fix mismerge from the out of tree BSP where this support was developed.
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 6b464321d276e448d478c99202c19d83f2bd25f4
Author: Jassi Brar <jassi.brar at samsung.com>
Date:   Tue Dec 7 19:23:07 2010 +0900

    ASoC: WM8580: Debug BCLK and sample size
    
    In case of SNDRV_PCM_FORMAT_S32_LE, we need to set WM8580_AIF_LENGTH_32,
    rather than WM8580_AIF_LENGTH_24.
    Also, the BCLK has to be 64fs, for sample size of 20, 24 and 32 bits.
    
    Signed-off-by: Jassi Brar <jassi.brar at samsung.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit de47de7404e29df8de82f5822b4fde1a6ed97b54
Author: Ian Kent <raven at themaw.net>
Date:   Tue Dec 7 13:04:00 2010 +0800

    autofs4 - remove ioctl mutex (bz23142)
    
    With the recent changes to remove the BKL a mutex was added to the
    ioctl entry point for calls to the old ioctl interface. This mutex
    needs to be removed because of the need for the expire ioctl to call
    back to the daemon to perform a umount and receive a completion
    status (via another ioctl).
    
    This should be fine as the new ioctl interface uses much of the same
    code and it has been used without a mutex for around a year without
    issue, as was the original intention.
    
    Ref: Bugzilla bug 23142
    
    Signed-off-by: Ian Kent <raven at themaw.net>
    Acked-by: Arnd Bergmann <arnd at arndb.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 681e36924788aeea2717c07cc42a21c9c86d7559
Author: Axel Lin <axel.lin at gmail.com>
Date:   Tue Dec 7 20:56:30 2010 +0800

    ASoC: Fix resource leak if soc_register_ac97_dai_link failed
    
    Properly free the resources in the case of soc_register_ac97_dai_link failure.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 7a1948768c2998f5bddb2327696cbe3161f468ed
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Dec 7 10:38:40 2010 +0000

    drm/i915: Emit a request to clear a flushed and idle ring for unbusy bo
    
    In order for bos to retire eventually, a request must be sent down the
    ring. This is expected, for example, by occlusion queries for which mesa
    will wait upon (whilst running glean) before issuing more batches and so
    the normal activity upon the ring is suspended and we need to emit a
    request to clear the idle ring.
    
    Reported-by: Jinjin, Wang <jinjin.wang at intel.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30380
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit cf7d7e5a1980d1116ee152d25dac382b112b9c17
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Dec 6 20:09:04 2010 -0800

    Linux 2.6.37-rc5

commit 086b17046c068ef3fa6e69c03c786b39ca617a0a
Merge: da8f2e246183ae109f87694ee3f06e8fcca2931b 226291aa4641fa13cb5dec3bcb3379faa83009e2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Dec 6 20:08:25 2010 -0800

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2_connection_find() returns pointer to bad structure
      ocfs2: char is not always signed
      Ocfs2: Stop tracking a negative dentry after dentry_iput().
      ocfs2: fix memory leak
      fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock

commit da8f2e246183ae109f87694ee3f06e8fcca2931b
Author: Olof Johansson <olof at lixom.net>
Date:   Mon Dec 6 19:36:32 2010 -0600

    ARM: tegra: fix regression from addruart rewrite
    
    Commit 0ea129300982 ("arm: return both physical and virtual addresses
    from addruart") took out the test for MMU on/off but didn't switch the
    ldr instructions to no longer be conditionals based on said test.
    
    Fix that.
    
    Signed-off-by: Olof Johansson <olof at lixom.net>
    Acked-by: Colin Cross <ccross at android.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0e7d0c860a0dee49dacb7bbb248d1eba637075ad
Author: Gabor Juhos <juhosg at openwrt.org>
Date:   Mon Dec 6 17:14:47 2010 -0800

    Input: add input driver for polled GPIO buttons
    
    The existing gpio-keys driver can be usable only for GPIO lines with
    interrupt support. Several devices have buttons connected to a GPIO
    line which is not capable to generate interrupts. This patch adds a
    new input driver using the generic GPIO layer and the input-polldev
    to support such buttons.
    
    [Ben Gardiner <bengardiner at nanometrics.ca: fold code to use more
     of the original gpio_keys infrastructure; cleanups and other
     improvements.]
    
    Signed-off-by: Gabor Juhos <juhosg at openwrt.org>
    Signed-off-by: Ben Gardiner <bengardiner at nanometrics.ca>
    Tested-by: Ben Gardiner <bengardiner at nanometrics.ca>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit cb9675f3282f5565cc9e3698cc847355c1194871
Author: Vasiliy Kulikov <segoon at openwall.com>
Date:   Fri Nov 26 17:06:02 2010 +0000

    arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check
    
    clk_get() returns ERR_PTR() on error, not NULL.
    
    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
    Acked-by: Kevin Hilman <khilman at deeprootsystems.com>
    [tony at atomide.com: updated to include err.h to compile on omap1]
    Signed-off-by: Tony Lindgren <tony at atomide.com>

commit 859158bfab7e72af440622fb9731bcaef4e7d6dc
Author: Sukumar Ghorai <s-ghorai at ti.com>
Date:   Fri Nov 19 14:45:26 2010 +0000

    omap: nand: remove hardware ECC as default
    
    Commit 2c01946c6b9ebaa5a89710bc42ca224a7f52f227 (omap3 nand: cleanup
    virtual address usages) wrongly enabled CONFIG_MTD_NAND_OMAP_HWECC
    which breaks boards like beagle and pandora that use software ECC
    for write.
    
    Boards like beagle and pandora uses sw ecc for write (e.g. binary flushed
    from u-boot) and read from kernel.
    
    Signed-off-by: Sukumar Ghorai <s-ghorai at ti.com>
    Acked-by: David Woodhouse <David.Woodhouse at intel.com>
    [tony at atomide.com: updated comments]
    Signed-off-by: Tony Lindgren <tony at atomide.com>

commit f811036476d7c8a9b594ebcdcf481bdbe497eb13
Author: Ohad Ben-Cohen <ohad at wizery.com>
Date:   Fri Nov 26 23:59:24 2010 +0000

    omap: zoom: wl1271 slot is MMC_CAP_POWER_OFF_CARD
    
    This patch complements ed919b0 "mmc: sdio: fix runtime PM anomalies by
    introducing MMC_CAP_POWER_OFF_CARD" by declaring MMC_CAP_POWER_OFF_CARD
    on the ZOOM's wl1271 mmc slot.
    
    This is required in order not to break runtime PM support for the wl1271
    sdio driver.
    
    Signed-off-by: Ohad Ben-Cohen <ohad at wizery.com>
    Signed-off-by: Chris Ball <cjb at laptop.org>
    Signed-off-by: Tony Lindgren <tony at atomide.com>

commit 7787d2c2f440cc7854bed3d039bf4cc59d9e7897
Merge: 60658f8a293750b59a8a844bf5c387139af9500a c9e664f1fdf34aa8cede047b206deaa8f1945af0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Dec 6 15:51:14 2010 -0800

    Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM / Hibernate: Fix memory corruption related to swap
      PM / Hibernate: Use async I/O when reading compressed hibernation image

commit c9e664f1fdf34aa8cede047b206deaa8f1945af0
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date:   Fri Dec 3 22:57:45 2010 +0100

    PM / Hibernate: Fix memory corruption related to swap
    
    There is a problem that swap pages allocated before the creation of
    a hibernation image can be released and used for storing the contents
    of different memory pages while the image is being saved.  Since the
    kernel stored in the image doesn't know of that, it causes memory
    corruption to occur after resume from hibernation, especially on
    systems with relatively small RAM that need to swap often.
    
    This issue can be addressed by keeping the GFP_IOFS bits clear
    in gfp_allowed_mask during the entire hibernation, including the
    saving of the image, until the system is finally turned off or
    the hibernation is aborted.  Unfortunately, for this purpose
    it's necessary to rework the way in which the hibernate and
    suspend code manipulates gfp_allowed_mask.
    
    This change is based on an earlier patch from Hugh Dickins.
    
    Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
    Reported-by: Ondrej Zary <linux at rainbow-software.org>
    Acked-by: Hugh Dickins <hughd at google.com>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Cc: stable at kernel.org

commit 60658f8a293750b59a8a844bf5c387139af9500a
Merge: 771f8bc71c31c6bd103cdec283012253f352ab1c f444a57ca10fa7c199f1daf1cebd1fd329004992
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Dec 6 14:49:51 2010 -0800

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6524/1: GIC irq desciptor bug fix
      ARM: 6523/1: iop: ensure sched_clock() is notrace
      ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.
      ARM: 6519/1: kuser: Fix incorrect cmpxchg syscall in kuser helpers
      ARM: 6505/1: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selected
      ARM: 6508/1: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
      ARM: 6507/1: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
      ARM: 6504/1: Thumb-2: Fix long-distance conditional branches in head.S for Thumb-2.
      ARM: 6503/1: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL
      ARM: 6502/1: Thumb-2: Fix CONFIG_THUMB2_KERNEL breakage in compressed/head.S
      ARM: 6501/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in mm/proc-v7.S
      ARM: 6500/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in kernel/head.S
      ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S
      ARM: 6498/1: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL
      ARM: 6497/1: kexec: Correct data alignment for CONFIG_THUMB2_KERNEL
      ARM: 6496/1: GIC: Do not try to register more then NR_IRQS interrupts
      ARM: cns3xxx: Fix build with CONFIG_PCI=y

commit 884639996814585ef7079daa9e03a1eb562e235c
Author: Jeff Layton <jlayton at poochiereds.net>
Date:   Mon Nov 22 15:31:03 2010 -0500

    cifs: remove Local_System_Name
    
    ...this string is zeroed out and nothing ever changes it.
    
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit 9f339caf8454f0c21983111350ede93983db4340
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Thu Nov 25 23:41:39 2010 +0100

    PM / Hibernate: Use async I/O when reading compressed hibernation image
    
    This is a fix for reading LZO compressed image using async I/O.
    Essentially, instead of having just one page into which we keep
    reading blocks from swap, we allocate enough of them to cover the
    largest compressed size and then let block I/O pick them all up. Once
    we have them all (and here we wait), we decompress them, as usual.
    Obviously, the very first block we still pick up synchronously,
    because we need to know the size of the lot before we pick up the
    rest.
    
    Also fixed the copyright line, which I've forgotten before.
    
    Signed-off-by: Bojan Smojver <bojan at rexursive.com>
    Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>

commit 8b14d7b22c61f17ccb869e0047d9df6dd9f50a9f
Author: Thadeu Lima de Souza Cascardo <cascardo at holoscopio.com>
Date:   Sun Nov 28 19:46:50 2010 -0200

    wmi: use memcmp instead of strncmp to compare GUIDs
    
    While looking for the duplicates in /sys/class/wmi/, I couldn't find
    them. The code that looks for duplicates uses strncmp in a binary GUID,
    which may contain zero bytes. The right function is memcmp, which is
    also used in another section of wmi code.
    
    It was finding 49142400-C6A3-40FA-BADB-8A2652834100 as a duplicate of
    39142400-C6A3-40FA-BADB-8A2652834100. Since the first byte is the fourth
    printed, they were found as equal by strncmp.
    
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at holoscopio.com>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>
    Cc: stable at kernel.org

commit b8eb3a1046f68a5b8f284830d971c62688cd606b
Author: Don Skidmore <donald.c.skidmore at intel.com>
Date:   Wed Dec 1 20:54:53 2010 +0000

    ixgbe: fix possible NULL pointer deference in shutdown path
    
    After freeing the rings we were not zeroing out the ring count values.
    This patch now clears these counts correctly.
    
    Reported-by: Yinghai Lu <yinghai at kernel.org>
    Signed-off-by: Don Skidmore <donald.c.skidmore at intel.com>
    Tested-by: Stephen Ko <stephen.s.ko at intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 79df1baeec29022e4181f2964187b88661ef5517
Author: Jeff Layton <jlayton at redhat.com>
Date:   Mon Dec 6 12:52:08 2010 -0500

    cifs: fix use of CONFIG_CIFS_ACL
    
    Some of the code under CONFIG_CIFS_ACL is dependent upon code under
    CONFIG_CIFS_EXPERIMENTAL, but the Kconfig options don't reflect that
    dependency. Move more of the ACL code out from under
    CONFIG_CIFS_EXPERIMENTAL and under CONFIG_CIFS_ACL.
    
    Also move find_readable_file out from other any sort of Kconfig
    option and make it a function normally compiled in.
    
    Reported-and-Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit 1cd275f609ba46c8cae3ee77e499c54a0d13a983
Author: Sage Weil <sage at newdream.net>
Date:   Mon Dec 6 09:45:22 2010 -0800

    ceph: fix ioctl magic
    
    The ioctl magic was inadvertently changed in 571dba52.
    
    Signed-off-by: Sage Weil <sage at newdream.net>

commit 46bcf14f44d8f31ecfdc8b6708ec15a3b33316d9
Author: Eric Dumazet <eric.dumazet at gmail.com>
Date:   Mon Dec 6 09:29:43 2010 -0800

    filter: fix sk_filter rcu handling
    
    Pavel Emelyanov tried to fix a race between sk_filter_(de|at)tach and
    sk_clone() in commit 47e958eac280c263397
    
    Problem is we can have several clones sharing a common sk_filter, and
    these clones might want to sk_filter_attach() their own filters at the
    same time, and can overwrite old_filter->rcu, corrupting RCU queues.
    
    We can not use filter->rcu without being sure no other thread could do
    the same thing.
    
    Switch code to a more conventional ref-counting technique : Do the
    atomic decrement immediately and queue one rcu call back when last
    reference is released.
    
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 18483b81ee7e70ee68d4b18be618be5cfcc0b290
Author: Arnaldo Carvalho de Melo <acme at redhat.com>
Date:   Mon Dec 6 15:13:38 2010 -0200

    perf record: Fix eternal wait for stillborn child
    
    When execvp fails to find the specified command on the path we won't get
    SIGCHLD, so send a SIGUSR1 and exit right away.
    
    Current situation would require a SIGINT performed by the user and would
    produce meaningless summary.
    
    Now:
    
    [acme at emilia linux]$ ./foo
    -bash: ./foo: No such file or directory
    [acme at emilia linux]$ perf record ./foo
    ./foo: No such file or directory
    [acme at emilia linux]$
    
    Acked-by: Thomas Gleixner <tglx at linutronix.de>
    Cc: Frederic Weisbecker <fweisbec at gmail.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Mike Galbraith <efault at gmx.de>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Peter Zijlstra <peterz at infradead.org>
    Cc: Stephane Eranian <eranian at google.com>
    Cc: Tom Zanussi <tzanussi at gmail.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>

commit f444a57ca10fa7c199f1daf1cebd1fd329004992
Merge: 87507500b7fc3620e467abb617a3452f0cccc72d 44266416f786514ec43a0d15ad951c34566b99c9
Author: Russell King <rmk+kernel at arm.linux.org.uk>
Date:   Mon Dec 6 15:39:23 2010 +0000

    Merge branch 'for-rmk-fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx

commit 1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7
Author: Axel Lin <axel.lin at gmail.com>
Date:   Mon Dec 6 16:48:03 2010 +0800

    ASoC: Hold client_mutex while calling snd_soc_instantiate_cards()
    
    As the comments of snd_soc_instantiate_cards() said,
    snd_soc_instantiate_cards() must be called with client_mutex.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit ed8cc471d75365f8590c76f580def899d58028c0
Author: Uk Kim <w0806.kim at samsung.com>
Date:   Sun Dec 5 17:26:07 2010 +0900

    ASoC: Fix swap of left and right channels for WM8993/4 speaker boost gain
    
    SPKOUTL_BOOST start from third bit, SPKOUTLR_BOOST start from 0 bit.
    
    Signed-off-by: Uk Kim <w0806.kim at samsung.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Cc: stable at kernel.org

commit 3fcc0afbb9c93f3599ba03273e59915670b6c2c2
Author: Uk Kim <w0806.kim at samsung.com>
Date:   Sun Dec 5 17:32:16 2010 +0900

    ASoC: Fix off by one error in WM8994 EQ register bank size
    
    Signed-off-by: Uk Kim <w0806.kim at samsung.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Cc: stable at kernel.org

commit 87507500b7fc3620e467abb617a3452f0cccc72d
Author: Chao Xie <xiechao.linux at gmail.com>
Date:   Mon Dec 6 07:01:10 2010 +0100

    ARM: 6524/1: GIC irq desciptor bug fix
    
    gic_set_cpu will directly use irq_desc[]. If CONFIG_SPARSE_IRQ is
    enabled, there is no irq_desc[]. So we need use irq_to_desc(irq) to
    get the descriptor for irq.
    
    Signed-off-by: Chao Xie <chao.xie at marvell.com>
    Acked-by: Kyungmin Park <kyungmin.park at samsung.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit dd5a089edfa51a74692604b4b427953d8e16bc35
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Sun Dec 5 08:43:14 2010 -0500

    ALSA: hda: Use position_fix=1 for Acer Aspire 5538 to enable capture on internal mic
    
    BugLink: https://launchpad.net/bugs/685161
    
    The reporter of the bug states that he must use position_fix=1 to enable
    capture for the internal microphone, so set it for his machine's PCI
    SSID.  Verified using 2.6.35 and the 2010-12-04 alsa-driver build.
    
    Reported-and-tested-by: Ralph Wabel <rwabel at gmx.net>
    Cc: <stable at kernel.org>
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 771f8bc71c31c6bd103cdec283012253f352ab1c
Merge: 31c67c755363c7e7821221e72f8594ab8995764d 37d57443d5d810c6ef49e93586b046e7d4774818
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Dec 5 16:45:02 2010 -0800

    Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
    
    * 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      slub: Fix a crash during slabinfo -v

commit 31c67c755363c7e7821221e72f8594ab8995764d
Merge: 47ad504c56235c7c7c0020e631651420a55c74e7 307991055b0ce65d53dc1eb501c456c10eb36360
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Dec 5 16:41:13 2010 -0800

    Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
    
    * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      initramfs: Really fix build break on symbol-prefixed archs
      [media] Fix Kconfig errors due to two visible menus
      i2c/algos: convert Kconfig to use the menu's `visible' keyword
      media/video: convert Kconfig to use the menu's `visible' keyword
      Revert "i2c: Fix Kconfig dependencies"
      kconfig: regen parser
      kconfig: add an option to determine a menu's visibility

commit 47ad504c56235c7c7c0020e631651420a55c74e7
Merge: 7b2a69ba7055da9a04eb96aa7b38c8e3280aaaa5 7bfbeae9c78fb9404ccbd62a25c82f5860432ac9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Dec 5 16:40:31 2010 -0800

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
      parisc: Fix GSC PS/2 driver name for keyboard and mouse
      parisc: KittyHawk LCD fix
      parisc: convert the rest of the irq handlers to simple/percpu
      parisc: fix dino/gsc interrupts
      parisc: remove redundant initialization in sigsegv path of sys_rt_sigreturn

commit 7b2a69ba7055da9a04eb96aa7b38c8e3280aaaa5
Author: Eric W. Biederman <ebiederm at xmission.com>
Date:   Sun Dec 5 15:51:21 2010 -0800

    Revert "vfs: show unreachable paths in getcwd and proc"
    
    Because it caused a chroot ttyname regression in 2.6.36.
    
    As of 2.6.36 ttyname does not work in a chroot.  It has already been
    reported that screen breaks, and for me this breaks an automated
    distribution testsuite, that I need to preserve the ability to run the
    existing binaries on for several more years.  glibc 2.11.3 which has a
    fix for this is not an option.
    
    The root cause of this breakage is:
    
        commit 8df9d1a4142311c084ffeeacb67cd34d190eff74
        Author: Miklos Szeredi <mszeredi at suse.cz>
        Date:   Tue Aug 10 11:41:41 2010 +0200
    
        vfs: show unreachable paths in getcwd and proc
    
        Prepend "(unreachable)" to path strings if the path is not reachable
        from the current root.
    
        Two places updated are
         - the return string from getcwd()
         - and symlinks under /proc/$PID.
    
        Other uses of d_path() are left unchanged (we know that some old
        software crashes if /proc/mounts is changed).
    
        Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
        Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    
    So remove the nice sounding, but ultimately ill advised change to how
    /proc/fd symlinks work.
    
    Signed-off-by: "Eric W. Biederman" <ebiederm at xmission.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2a1292fd4cf1558b4a60781227d503c9111d9075
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Dec 5 19:21:18 2010 +0000

    drm/i915/lvds: Always restore panel-fitter when enabling the LVDS
    
    Linus Torvalds pointed out that our code was unbalanced when powering on
    the panel with respect to the power off sequence in that we were failing
    to restore the panel-fitter. The consequence of this would be that
    across a simple DPMS off/on for a non-native mode, without an intervening
    modeset, the panel fitter would remain disabled and the output would shift
    on the panel.
    
    Reported-by: Linus Torvalds <torvalds at linux-foundation.org>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit 6fd0d56e3bc1abfb237b8824261b613e21e77bc8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Dec 5 20:42:33 2010 +0000

    drm/i915/ringbuffer: Only print an error on the second attempt to reset head
    
    There's not much we can do here but hope for the best. However the first
    failure happens quite frequently and if often remedied by the second
    attempt to reset HEAD. So only print the error if that attempt also
    fails.
    
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=19802
    Reported-by: Thomas Meyer <thomas at m3y3r.de>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: stable at kernel.org

commit bbf0c6b3620b3872929ef7d3c392ce436889110f
Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Sun Dec 5 11:30:40 2010 +0100

    drm/i915: announce to userspace that the bsd ring is coherent
    
    Otherwise we can't really fix the abi-braindeadness of forcing
    libva to manually wait for rendering when switching rings. Which
    in turn makes implementing hw semaphores a pointless exercise
    (at least for ironlake).
    
    [Also added the relaxed fencing param to explain the jump in
    numbering - relaxed fencing is in -next.]
    
    Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit 136711be41ec97f7f1a9c3a5e8535eb7da5fea59
Author: Takashi Iwai <tiwai at suse.de>
Date:   Sat Dec 4 16:13:06 2010 +0100

    agp/intel: Fix wrong kunmap in i830_cleanup()
    
    Add a missing NULL check and fix the wrong address passed to kunmap()
    in i830_cleanup().
    
    Cc: stable at kernel.org
    Signed-off-by: Takashi Iwai <tiwai at suse.de>
    [danvet: added cc stable]
    Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit cf2f9c59807f173b1c6a537fde7c83c8da876e56
Author: Dan Williams <dan.j.williams at intel.com>
Date:   Sat Dec 4 14:53:32 2010 -0800

    intel_mid_dma: fix section mismatch warnings
    
    Rename intel_mid_dma_pci to intel_mid_dma_pci_driver to pick up the
    applied annotations of that suffix.
    
    Reported-by: <major_Lee at wistron.com>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit d2f5c276ea4b7b7e1b953926bac9d0b148fcce4e
Author: Anatolij Gustschin <agust at denx.de>
Date:   Mon Nov 22 18:35:18 2010 +0100

    dmaengine: imx-sdma: fix bug in buffer descriptor initialization
    
    Currently while submitting scatterlists with more than one SG
    entry the DMA buffer address from the first SG entry is inserted
    into all initialized DMA buffer descriptors. This is due to the
    typo in the for_each_sg() loop where the scatterlist pointer is
    used for obtaining the DMA buffer address and _not_ the SG list
    iterator.
    
    As a result all received data will be written only into the first
    DMA buffer while reading. While writing the data from the first
    DMA buffer is send to the device multiple times. This caused
    the filesystem destruction on the MMC card when using DMA in
    mxcmmc driver.
    
    Signed-off-by: Anatolij Gustschin <agust at denx.de>
    Acked-by: Sascha Hauer <s.hauer at pengutronix.de>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit a584bff5efae8c1d026e3a930e3d13a90264fafc
Author: Joe Perches <joe at perches.com>
Date:   Fri Nov 12 13:37:54 2010 -0800

    drivers/dma/ppc4xx: Use printf extension %pR for struct resource
    
    Using %pR standardizes the struct resource output.
    
    Signed-off-by: Joe Perches <joe at perches.com>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit bca364d30d63825f36a03dcacf390943d4c2cb74
Author: Tracey Dent <tdent48227 at gmail.com>
Date:   Sat Nov 6 17:01:37 2010 -0400

    drivers/dma/ioat: Use the ccflag-y instead of EXTRA_CFLAGS
    
    Changed Makefile to use <modules>-y instead of <modules>-objs. Following
    (documentation/kbuild/makefiles.txt).
    
    Signed-off-by: Tracey Dent <tdent48227 at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit 7bfbeae9c78fb9404ccbd62a25c82f5860432ac9
Author: Guy Martin <gmsoft at tuxicoman.be>
Date:   Tue Nov 2 15:23:08 2010 +0000

    parisc: Fix GSC PS/2 driver name for keyboard and mouse
    
    Fix kernel warnings caused by the driver name of GSC PS/2 containing '/'.
    
    The following warnings are observed on a K410 system :
    
    [   10.700000] name 'GSC PS/2 keyboard'
    [   10.732000] ------------[ cut here ]------------
    [   10.772000] WARNING: at fs/proc/generic.c:323
    [   10.828000] Modules linked in:
    [   10.916000]
    [   10.916000]      YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI
    [   10.936000] PSW: 00000000000001000000000000001111 Not tainted
    [   10.992000] r00-03  0004000f 104fe3e0 10201ea0 00000000
    [   11.060000] r04-07  4fc405c8 00000006 4fc405c8 4fc40694
    [   11.124000] r08-11  4fc40708 10438aa0 00000001 1043bfc8
    [   11.184000] r12-15  104ff2a0 104ff2a0 4fc38634 104ff2a0
    [   11.248000] r16-19  f0001570 10479af0 f000006c 1044fe50
    [   11.308000] r20-23  00000000 00000028 104cd858 00000000
    [   11.372000] r24-27  ffffffff 0000000e 1044fe10 1043bbe0
    [   11.436000] r28-31  0000002b 00000078 4fc40800 0000000d
    [   11.496000] sr00-03  00000000 00000000 00000000 00000000
    [   11.560000] sr04-07  00000000 00000000 00000000 00000000
    [   11.624000]
    [   11.688000] IASQ: 00000000 00000000 IAOQ: 10201ea0 10201ea4
    [   11.704000]  IIR: 03ffe01f    ISR: 00000000  IOR: 0000000d
    [   11.772000]  CPU:        0   CR30: 4fc40000 CR31: f01043b0
    [   11.836000]  ORIG_R28: 4fc40940
    [   11.904000]  IAOQ[0]: __xlate_proc_name+0x90/0xd0
    [   11.940000]  IAOQ[1]: __xlate_proc_name+0x94/0xd0
    [   11.996000]  RP(r2): __xlate_proc_name+0x90/0xd0
    [   12.052000] Backtrace:
    [   12.108000]  [<10257790>] vsnprintf+0x290/0x4f4
    [   12.136000]
    [   12.188000] ---[ end trace 91bf6ece17e322dd ]---
    [   12.208000] serio: GSC PS/2 keyboard port at 0x0001c000 irq 19 @ 10:12:7
    [   12.264000] name 'GSC PS/2 mouse'
    [   12.344000] ------------[ cut here ]------------
    [   12.384000] WARNING: at fs/proc/generic.c:323
    [   12.436000] Modules linked in:
    [   12.524000]
    [   12.528000]      YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI
    [   12.544000] PSW: 00000000000001000000000000001111 Tainted: G        W
    [   12.600000] r00-03  0004000f 104fe3e0 10201ea0 00000000
    [   12.680000] r04-07  4fc405c8 00000006 4fc405c8 4fc40694
    [   12.740000] r08-11  4fc40708 10438aa0 00000001 1043bfc8
    [   12.804000] r12-15  104ff2a0 104ff2a0 4fc38634 104ff2a0
    [   12.868000] r16-19  f0001570 10479af0 f000006c 1044fe50
    [   12.928000] r20-23  00000000 00000025 104cd858 00000000
    [   12.992000] r24-27  ffffffff 0000000e 1044fe10 1043bbe0
    [   13.056000] r28-31  00000028 00000078 4fc40800 0000000d
    [   13.116000] sr00-03  00000000 00000000 00000000 00000000
    [   13.180000] sr04-07  00000000 00000000 00000000 00000000
    [   13.244000]
    [   13.308000] IASQ: 00000000 00000000 IAOQ: 10201ea0 10201ea4
    [   13.324000]  IIR: 03ffe01f    ISR: 00000000  IOR: 0000000d
    [   13.392000]  CPU:        0   CR30: 4fc40000 CR31: f01043b0
    [   13.456000]  ORIG_R28: 4fc40940
    [   13.524000]  IAOQ[0]: __xlate_proc_name+0x90/0xd0
    [   13.560000]  IAOQ[1]: __xlate_proc_name+0x94/0xd0
    [   13.616000]  RP(r2): __xlate_proc_name+0x90/0xd0
    [   13.672000] Backtrace:
    [   13.728000]  [<10257790>] vsnprintf+0x290/0x4f4
    [   13.756000]
    [   13.808000] ---[ end trace 91bf6ece17e322de ]---
    [   13.828000] serio: GSC PS/2 mouse port at 0x00020100 irq 19 @ 10:12:8
    
    Signed-off-by: Guy Martin <gmsoft at tuxicoman.be>
    Acked-by: Helge Deller <deller at gmx.de>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit 79a04296231171157031d0bd8cd4038317e13cf2
Author: Guy Martin <gmsoft at tuxicoman.be>
Date:   Sat Nov 6 16:24:29 2010 +0000

    parisc: KittyHawk LCD fix
    
    K class aka KittyHawk don't have LED support on their LCD. Installing
    HP-UX confirmed this. The current led_wq fills the LCD with black
    characters each time it runs.
    
    The patch prevents the led_wq workqueue and its proc entry to be
    created for KittyHawk machines.
    
    It also increase min_cmd_delay as currently, one character out of two
    is lost when a string is sent to the LCD.
    
    Signed-off-by: Guy Martin <gmsoft at tuxicoman.be>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.c>

commit 51890613f2bfa70453a5cc22c91c63946dd311cd
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date:   Fri Dec 3 02:01:05 2010 +0000

    parisc: convert the rest of the irq handlers to simple/percpu
    
    The generic conversion eliminates the spurious no_ack and no_end
    routines, converts all the cascaded handlers to handle_simple_irq() and
    makes iosapic use a modified handle_percpu_irq() to become the same as
    the CPU irq's.  This isn't an essential change, but it eliminates the
    mask/unmask overhead of handle_level_irq().
    
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>
    Tested-by: Helge Deller <deller at gmx.de>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit d16cd297d288e48482c3c261db434a2e13bd9f20
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date:   Thu Dec 2 23:36:47 2010 +0000

    parisc: fix dino/gsc interrupts
    
    The essential problem we're currently having is that dino (and gsc) is a
    cascaded CPU interrupt.  Under the old __do_IRQ() handler, our CPU
    interrupts basically did an ack followed by an end.  In the new scheme,
    we replaced them with level handlers which do a mask, an ack and then an
    unmask (but no end).  Instead, with the renaming of end to eoi, we
    actually want to call the percpu flow handlers, because they actually
    have all the characteristics we want.
    
    This patch does the conversion and gets my C360 booting again.
    
    Signed-off-by: James Bottomley <James.Bottomley at suse.de>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit 49078f7d108f132582e5af46304c317b55f83948
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Dec 4 07:45:57 2010 +0000

    drm/i915: Factor in pixel-repeat in FDI M/N calculation
    
    Fixes the modesetting on the secondary panel of the Libretto W100 and
    presumably many more Ironlake laptops with SDVO LVDS displays.
    
    Reported-and-tested-by: Matthew Willoughby <mattfredwill at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: stable at kernel.org

commit a5542a0f9aca5588a0afd0489c26d858405bfecb
Author: Rabin Vincent <rabin at rab.in>
Date:   Sat Dec 4 06:20:52 2010 +0100

    ARM: 6523/1: iop: ensure sched_clock() is notrace
    
    Include sched.h to ensure sched_clock() has the notrace
    annotation, and mark any functions it calls as notrace
    too.
    Include sched.h to ensure sched_clock() has the notrace
    annotation, and mark any functions it calls as notrace
    too.
    
    Acked-by: Dan Williams <dan.j.williams at intel.com>
    Signed-off-by: Rabin Vincent <rabin at rab.in>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit b9f515e3e3861abbaa093359f7c6f31283695228
Author: Marcelo Roberto Jimenez <mroberto at cpti.cetuc.puc-rio.br>
Date:   Mon Oct 18 22:38:08 2010 +0100

    ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.
    
    This patch fixes a compilation issue when compiling PCMCIA SA1100
    support as a module with PCMCIA_DEBUG enabled. The symbol
    soc_pcmcia_debug was not beeing exported.
    ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module.
    
    This patch fixes a compilation issue when compiling PCMCIA SA1100
    support as a module with PCMCIA_DEBUG enabled. The symbol
    soc_pcmcia_debug was not beeing exported.
    
    Cc: <stable at kernel.org>
    Signed-off-by: Marcelo Roberto Jimenez <mroberto at cpti.cetuc.puc-rio.br>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 55afd264cdd5d5848753e90884ed596e11bce0ff
Author: Dave Martin <dave.martin at linaro.org>
Date:   Wed Dec 1 18:12:43 2010 +0100

    ARM: 6519/1: kuser: Fix incorrect cmpxchg syscall in kuser helpers
    
    The existing code invokes the syscall with rubbish in r7,
    due to what looks like an incorrect literal load idiom.
    
    Reviewed-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit ef61d4e6d88da80dc2b417cf8ad3c77aa94f0c8f
Author: Manoj Iyer <manoj.iyer at canonical.com>
Date:   Fri Dec 3 18:43:55 2010 -0600

    ALSA: hda - Enable jack sense for Thinkpad Edge 13
    
    Added a quirk to cxt5066_cfg_tbl to enable jack sense for ThinkPad Edge 13.
    
    Reference: http://launchpad.net/bugs/685015
    
    Signed-off-by: Manoj Iyer <manoj.iyer at canonical.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 37d57443d5d810c6ef49e93586b046e7d4774818
Author: Tero Roponen <tero.roponen at gmail.com>
Date:   Wed Dec 1 20:04:20 2010 +0200

    slub: Fix a crash during slabinfo -v
    
    Commit f7cb1933621bce66a77f690776a16fe3ebbc4d58 ("SLUB: Pass active
    and inactive redzone flags instead of boolean to debug functions")
    missed two instances of check_object(). This caused a lot of warnings
    during 'slabinfo -v' finally leading to a crash:
    
      BUG ext4_xattr: Freepointer corrupt
      ...
      BUG buffer_head: Freepointer corrupt
      ...
      BUG ext4_alloc_context: Freepointer corrupt
      ...
      ...
      BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
      IP: [<ffffffff810a291f>] file_sb_list_del+0x1c/0x35
      PGD 79d78067 PUD 79e67067 PMD 0
      Oops: 0002 [#1] SMP
      last sysfs file: /sys/kernel/slab/:t-0000192/validate
    
    This patch fixes the problem by converting the two missed instances.
    
    Acked-by: Christoph Lameter <cl at linux.com>
    Signed-off-by: Tero Roponen <tero.roponen at gmail.com>
    Signed-off-by: Pekka Enberg <penberg at kernel.org>

commit 22ed1113a9adda6e193c329119a384362da01289
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Dec 4 01:01:29 2010 +0000

    drm/i915: Death to the unnecessary 64bit divide
    
    Use the hardware DDA to calculate the ratio with as much accuracy as is
    possible.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: stable at kernel.org

commit 11e8896474495dec7ce19a542f67def847ec208f
Merge: 8338fded137681bc3c1e99a69ac937a4fb016fe4 512b109ec9620d037d6d2f6bd1bae9ce34dd6779
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Dec 3 11:30:57 2010 -0800

    Merge branch '2.6.37-rc4-pvhvm-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm
    
    * '2.6.37-rc4-pvhvm-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
      xen: unplug the emulated devices at resume time
      xen: fix save/restore for PV on HVM guests with pirq remapping
      xen: resume the pv console for hvm guests too
      xen: fix MSI setup and teardown for PV on HVM guests
      xen: use PHYSDEVOP_get_free_pirq to implement find_unbound_pirq

commit 2e18edf75d586d9044c1f1e6b1bc8e7c26c4149f
Author: Ben Dooks <ben-linux at fluff.org>
Date:   Fri Dec 3 18:00:06 2010 +0000

    ARM: mini2440: Fix Kconfig to allow kernel to build
    
    The MACH_MINI2440 entry requires the backlight LED driver, but this
    subsystem has not been enabled and the select of LEDS_TRIGGER_BACKLIGHT
    alone is insufficient to enable the necessary bits of the LED driver.
    
    Add NEW_LEDS, LEDS_CLASS and LEDS_TRIGGER to the select to allow the
    kernel to link.
    
    This fixes the following error:
    
    drivers/built-in.o: In function `led_trigger_set':
    /home/ben/linux.git/drivers/leds/led-triggers.c:116: undefined reference to `led_brightness_set'
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>

commit 8338fded137681bc3c1e99a69ac937a4fb016fe4
Merge: 9cd6315357eccb768d9062cb43e3dc741e922020 29dcbc5c25d6d8140337e96bf503c8475092c586 805e3f495057aa5307ad4e3d6dc7073d4733c691
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Dec 3 10:08:52 2010 -0800

    Merge branches 'upstream/core' and 'upstream/bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
    
    * 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
      xen: allocate irq descs on any NUMA node
      xen: prevent crashes with non-HIGHMEM 32-bit kernels with largeish memory
      xen: use default_idle
      xen: clean up "extra" memory handling some more
    
    * 'upstream/bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
      xen: x86/32: perform initial startup on initial_page_table
      xen: don't bother to stop other cpus on shutdown/reboot

commit 47f1c6c9ffdec0c0e5a2c2709bd63c7380b325c4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Dec 3 15:37:31 2010 +0000

    drm/i915: Clean conflicting modesetting registers upon init
    
    If we leave the registers in a conflicting state then when we attempt
    to teardown the active mode, we will not disable the pipes and planes
    in the correct order -- leaving a plane reading from a disabled pipe and
    possibly leading to undefined behaviour.
    
    Reported-and-tested-by: Andy Whitcroft <apw at canonical.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32078
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: stable at kernel.org

commit 9cd6315357eccb768d9062cb43e3dc741e922020
Merge: 88063dd69b124721e18a59535d4f35266fcb867f 2ff38c9fbaa86264ad819117ab137361067ab5f1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Dec 3 09:20:41 2010 -0800

    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:
      ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency
      ALSA: hda: Use "alienware" model quirk for another SSID
      ASoC: WM8731: Fix incorrect mask for bypass path disable
      s6105-ipcam: fix compilation
      s6000-pcm: fix compilation
      s6000-i2s: fix compilation
      ASoC: Fix missing spin_unlock_irqrestore
      ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation
      ASoC: Add missing dev_set_drvdata in p1022_ds_probe
      ASoC: Add missing dev_set_drvdata in mpc8610_hpcd_probe
      ASoC: Remove unneeded !! operations while checking return value of nuc900_checkready
      ASoC: Fix compile error for nuc900-pcm.c
      ASoC: Fix prototype for nuc900_ac97_probe and nuc900_ac97_remove
      ASoC: Fix compile error for nuc900-ac97.c
      ALSA: hda: Use BIOS auto-parsing instead of existing model quirk for MEDION MD2

commit 88063dd69b124721e18a59535d4f35266fcb867f
Merge: df9d38ebda762e54ed0b142c2c47b2f57a145ab2 7ac760c2f78ddd8e1bd633767b01becfbbf96720
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Dec 3 09:20:21 2010 -0800

    Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
    
    * 'linux-next' of git://git.infradead.org/ubi-2.6:
      UBI: fix corrupted PEB detection for NOR flash

commit df9d38ebda762e54ed0b142c2c47b2f57a145ab2
Merge: 47337ad65f823358609865c5dff77404744bc38e a9fc749224bfb69686322643678f89e00303ee21
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Dec 3 09:19:54 2010 -0800

    Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: se/7724: Remove FSI/B of GPIO init code
      sh: se/7724: Update clock framework of FSI clock to non-legacy
      sh: Assume new page cache pages have dirty dcache lines.
      sh: boards: mach-se: use IS_ERR() instead of NULL check
      sh: Add div6_reparent_clks to clock framework for FSI
      dma: shdma: add a MODULE_ALIAS() to allow module autoloading

commit 47337ad65f823358609865c5dff77404744bc38e
Merge: a9df42e1175d30545ffa1e17a3df1b39c107d33a 16cdd4336fdca9b50f991b591005b5f6416f82c4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Dec 3 09:19:31 2010 -0800

    Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
    
    * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
      lxfb: Maintain video processor palette through suspend/resume
      video: da8xx: Register IRQ as last thing in driver probing.
      framebuffer: fix fbcmap.c kernel-doc warning

commit a9df42e1175d30545ffa1e17a3df1b39c107d33a
Author: David Howells <dhowells at redhat.com>
Date:   Fri Dec 3 15:59:50 2010 +0000

    MN10300: Implement asm/syscall.h
    
    Implement asm/syscall.h for the MN10300 arch.
    
    Signed-off-by: David Howells <dhowells at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7ac760c2f78ddd8e1bd633767b01becfbbf96720
Author: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Date:   Thu Dec 2 06:34:01 2010 +0200

    UBI: fix corrupted PEB detection for NOR flash
    
    My new shiny code for corrupted PEB detection has NOR specific bug.
    We tread PEB as corrupted and preserve it, if
    
    1. EC header is OK.
    2. VID header is corrupted.
    3. data area is not "all 0xFFs"
    
    In case of NOR we have 'nor_erase_prepare()' quirk, which invalidates
    the headers before erasing the PEB. And we invalidate first the VID
    header, and then the EC header. So if a power cut happens after we have
    invalidated the VID header, but before we have invalidated the EC
    header, we end up with a PEB which satisfies the above 3 conditions,
    and the scanning code will treat it as corrupted, and will print
    scary warnings, wrongly.
    
    This patch fixes the issue by firt invalidating the EC header, then
    invalidating the VID header. In case of power cut inbetween, we still
    just lose the EC header, and UBI can deal with this situation gracefully.
    
    Thanks to Anatolij Gustschin <agust at denx.de> for tracking this down.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Reported-by: Anatolij Gustschin <agust at denx.de>
    Tested-by: Anatolij Gustschin <agust at denx.de>

commit 3a253445e327d0295bbe51bcbec5f44f86b54a8c
Author: John Baboval <john.baboval at virtualcomputer.com>
Date:   Thu Dec 2 11:21:31 2010 -0500

    ALSA: hda - Fix ThinkPad T410[s] docking station line-out
    
    On the docking station for the Lenovo T410 and T410s, the line-out
    doesn't work. The trouble seems to be that it generates a plug event,
    but then doesn't report that the jack is connected. So automute mutes
    the jack when you plug something into it. The following patch (next
    message) fixes it.
    
    Signed-off-by: John Baboval <john.baboval at virtualcomputer.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 77c4d5cdb81d25a45fbdfb84dd3348121219a072
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Thu Dec 2 22:45:45 2010 -0500

    ALSA: hda: Use model=lg quirk for LG P1 Express to enable playback and capture
    
    BugLink: https://launchpad.net/bugs/595482
    
    The original reporter states that audible playback from the internal
    speaker is inaudible despite the hardware being properly detected.  To
    work around this symptom, he uses the model=lg quirk to properly enable
    both playback, capture, and jack sense.  Another user corroborates this
    workaround on separate hardware.  Add this PCI SSID to the quirk table
    to enable it for further LG P1 Expresses.
    
    Reported-and-tested-by: Philip Peitsch <philip.peitsch at gmail.com>
    Tested-by: nikhov
    Cc: <stable at kernel.org> [2.6.32+]
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 87e51107323a84e26a5004337217fc954e8d9545
Author: Tracey Dent <tdent48227 at gmail.com>
Date:   Sat Nov 6 17:01:36 2010 -0400

    drivers/dma/: Use the ccflag-y instead of EXTRA_CFLAGS
    
    Use the ccflag-y flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
    deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).
    
    Signed-off-by: Tracey Dent <tdent48227 at gmail.com>
    Acked-by: Linus Walleij <linus.walleij at stericsson.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit 51a1efe2e84493439db32c07471e835c752a7923
Author: Axel Lin <axel.lin at gmail.com>
Date:   Tue Nov 2 09:52:17 2010 +0800

    dma: intel_mid_dma: fix double free on mid_setup_dma error path
    
    We should not call kfree(dma) in mid_setup_dma error path because
    the memory is allocated in intel_mid_dma_probe and will be freed
    in intel_mid_dma_probe error path if mid_setup_dma return error.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit cbeae41888bddb2d8c23db281de5f38f4be6a9bb
Author: Axel Lin <axel.lin at gmail.com>
Date:   Tue Nov 2 09:12:57 2010 +0800

    dma: imx-dma: fix imxdma_probe error path
    
    otherwise, i will be -1 inside the latest iteration of the while loop.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Sascha Hauer <s.hauer at pengutronix.de>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>

commit a9fc749224bfb69686322643678f89e00303ee21
Merge: fa3c9f3de2504bb09f8ad512f89837751a3eb741 c44352c5357210172b3c30df61e0bc603ffc700e
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Fri Dec 3 14:42:29 2010 +0900

    Merge branch 'sh/urgent' into sh-fixes-for-linus

commit c44352c5357210172b3c30df61e0bc603ffc700e
Author: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj at renesas.com>
Date:   Fri Dec 3 05:37:54 2010 +0000

    sh: se/7724: Remove FSI/B of GPIO init code
    
    se7724 board does not have FSI/B.
    
    Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit e17ca5cf3c5b2a769bcde2c37cf0d96f08c8cb17
Author: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj at renesas.com>
Date:   Fri Dec 3 05:37:53 2010 +0000

    sh: se/7724: Update clock framework of FSI clock to non-legacy
    
    Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit ebb27386ffd2fcd0fad141e0eee97b8070f94ee2
Merge: 6d20e8406f0942228a73000663c2b33f488103ea 59e57c622c3502346e8f930421ebc482d639520c
Author: Steve French <sfrench at us.ibm.com>
Date:   Fri Dec 3 03:52:43 2010 +0000

    Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

commit 59e57c622c3502346e8f930421ebc482d639520c
Merge: 33dd94ae1ccbfb7bf0fb6c692bc3d1c4269e6177 83ed79c561da20019cb24944f535530d73b2d615
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 17:40:04 2010 -0800

    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: length resolution should be reported units/mm
      HID: add support for F430 Force Feedback Wheel
      HID: egalax: Use kzalloc
      HID: Remove KERN_DEBUG from dbg_hid use
    
    Manually fixed trivial conflict in drivers/hid/hid-input.c (due to
    removal of KERN_DEBUG from dbg_hid use clashing with new keycode
    interface switch)

commit 9f5ead76d402f591ab810e71eae59ec28bf39eb9
Author: Kevin Hilman <khilman at deeprootsystems.com>
Date:   Wed Dec 1 10:55:46 2010 +0000

    omap: PM debug: fix wake-on-timer debugfs dependency
    
    Wakeup-on-timer code does not have/need debugfs dependency.  Move
    the function out of debugfs ifdef.
    
    Fixes compile error when CONFIG_DEBUG_FS is disabled but PM debug is
    enabled.
    
    Reported-by: Tony Lindgren <tony at atomide.com>
    Signed-off-by: Kevin Hilman <khilman at deeprootsystems.com>
    Signed-off-by: Tony Lindgren <tony at atomide.com>

commit 29dcbc5c25d6d8140337e96bf503c8475092c586
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Thu Dec 2 16:14:27 2010 -0800

    xen: allocate irq descs on any NUMA node
    
    Allocate irq descs on any NUMA node (we don't care) rather than
    specifically node 0, which may not exist.
    
    (At the moment NUMA is meaningless within a domain, so any info
    the kernel has is just from an SRAT table we haven't suppressed/disabled.)
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit 2a4c92fa24e1853d0e21f9e6e45859b832240f94
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Thu Dec 2 15:30:06 2010 -0800

    xen: prevent crashes with non-HIGHMEM 32-bit kernels with largeish memory
    
    If this is a non-HIGHMEM 32-bit kernel, then the page structures only go
    up to the limit of addressable memory, even if more memory is physically
    present.  Don't try to add that extra memory to the balloon.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit 33dd94ae1ccbfb7bf0fb6c692bc3d1c4269e6177
Author: Nelson Elhage <nelhage at ksplice.com>
Date:   Thu Dec 2 14:31:21 2010 -0800

    do_exit(): make sure that we run with get_fs() == USER_DS
    
    If a user manages to trigger an oops with fs set to KERNEL_DS, fs is not
    otherwise reset before do_exit().  do_exit may later (via mm_release in
    fork.c) do a put_user to a user-controlled address, potentially allowing
    a user to leverage an oops into a controlled write into kernel memory.
    
    This is only triggerable in the presence of another bug, but this
    potentially turns a lot of DoS bugs into privilege escalations, so it's
    worth fixing.  I have proof-of-concept code which uses this bug along
    with CVE-2010-3849 to write a zero to an arbitrary kernel address, so
    I've tested that this is not theoretical.
    
    A more logical place to put this fix might be when we know an oops has
    occurred, before we call do_exit(), but that would involve changing
    every architecture, in multiple places.
    
    Let's just stick it in do_exit instead.
    
    [akpm at linux-foundation.org: update code comment]
    Signed-off-by: Nelson Elhage <nelhage at ksplice.com>
    Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a0b0f58cdd32ab363a600a294ddaa90f0c32de8c
Author: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Date:   Thu Dec 2 14:31:20 2010 -0800

    ksm: annotate ksm_thread_mutex is no deadlock source
    
    commit 62b61f611e ("ksm: memory hotremove migration only") caused the
    following new lockdep warning.
    
      =======================================================
      [ INFO: possible circular locking dependency detected ]
      -------------------------------------------------------
      bash/1621 is trying to acquire lock:
       ((memory_chain).rwsem){.+.+.+}, at: [<ffffffff81079339>]
      __blocking_notifier_call_chain+0x69/0xc0
    
      but task is already holding lock:
       (ksm_thread_mutex){+.+.+.}, at: [<ffffffff8113a3aa>]
      ksm_memory_callback+0x3a/0xc0
    
      which lock already depends on the new lock.
    
      the existing dependency chain (in reverse order) is:
    
      -> #1 (ksm_thread_mutex){+.+.+.}:
           [<ffffffff8108b70a>] lock_acquire+0xaa/0x140
           [<ffffffff81505d74>] __mutex_lock_common+0x44/0x3f0
           [<ffffffff81506228>] mutex_lock_nested+0x48/0x60
           [<ffffffff8113a3aa>] ksm_memory_callback+0x3a/0xc0
           [<ffffffff8150c21c>] notifier_call_chain+0x8c/0xe0
           [<ffffffff8107934e>] __blocking_notifier_call_chain+0x7e/0xc0
           [<ffffffff810793a6>] blocking_notifier_call_chain+0x16/0x20
           [<ffffffff813afbfb>] memory_notify+0x1b/0x20
           [<ffffffff81141b7c>] remove_memory+0x1cc/0x5f0
           [<ffffffff813af53d>] memory_block_change_state+0xfd/0x1a0
           [<ffffffff813afd62>] store_mem_state+0xe2/0xf0
           [<ffffffff813a0bb0>] sysdev_store+0x20/0x30
           [<ffffffff811bc116>] sysfs_write_file+0xe6/0x170
           [<ffffffff8114f398>] vfs_write+0xc8/0x190
           [<ffffffff8114fc14>] sys_write+0x54/0x90
           [<ffffffff810028b2>] system_call_fastpath+0x16/0x1b
    
      -> #0 ((memory_chain).rwsem){.+.+.+}:
           [<ffffffff8108b5ba>] __lock_acquire+0x155a/0x1600
           [<ffffffff8108b70a>] lock_acquire+0xaa/0x140
           [<ffffffff81506601>] down_read+0x51/0xa0
           [<ffffffff81079339>] __blocking_notifier_call_chain+0x69/0xc0
           [<ffffffff810793a6>] blocking_notifier_call_chain+0x16/0x20
           [<ffffffff813afbfb>] memory_notify+0x1b/0x20
           [<ffffffff81141f1e>] remove_memory+0x56e/0x5f0
           [<ffffffff813af53d>] memory_block_change_state+0xfd/0x1a0
           [<ffffffff813afd62>] store_mem_state+0xe2/0xf0
           [<ffffffff813a0bb0>] sysdev_store+0x20/0x30
           [<ffffffff811bc116>] sysfs_write_file+0xe6/0x170
           [<ffffffff8114f398>] vfs_write+0xc8/0x190
           [<ffffffff8114fc14>] sys_write+0x54/0x90
           [<ffffffff810028b2>] system_call_fastpath+0x16/0x1b
    
    But it's a false positive.  Both memory_chain.rwsem and ksm_thread_mutex
    have an outer lock (mem_hotplug_mutex).  So they cannot deadlock.
    
    Thus, This patch annotate ksm_thread_mutex is not deadlock source.
    
    [akpm at linux-foundation.org: update comment, from Hugh]
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Acked-by: Hugh Dickins <hughd at google.com>
    Cc: Andrea Arcangeli <aarcange at redhat.com>
    Cc: Andi Kleen <andi at firstfloor.org>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 20d6c96b5f1cad5c5da4641945ec17a1d9a1afc8
Author: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Date:   Thu Dec 2 14:31:19 2010 -0800

    mem-hotplug: introduce {un}lock_memory_hotplug()
    
    Presently hwpoison is using lock_system_sleep() to prevent a race with
    memory hotplug.  However lock_system_sleep() is a no-op if
    CONFIG_HIBERNATION=n.  Therefore we need a new lock.
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Cc: Andi Kleen <andi at firstfloor.org>
    Cc: Kamezawa Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Suggested-by: Hugh Dickins <hughd at google.com>
    Acked-by: Hugh Dickins <hughd at google.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4fe65cab844e6d3d7d310e66a501d5e7242ecb54
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Thu Dec 2 14:31:19 2010 -0800

    Documentation/filesystems/vfs.txt: fix ->repeasepage() description
    
    ->releasepage() does not remove the page from the mapping.
    
    Acked-by: Neil Brown <neilb at suse.de>
    Cc: Trond Myklebust <Trond.Myklebust at netapp.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 64141da587241301ce8638cc945f8b67853156ec
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date:   Thu Dec 2 14:31:18 2010 -0800

    vmalloc: eagerly clear ptes on vunmap
    
    On stock 2.6.37-rc4, running:
    
      # mount lilith:/export /mnt/lilith
      # find  /mnt/lilith/ -type f -print0 | xargs -0 file
    
    crashes the machine fairly quickly under Xen.  Often it results in oops
    messages, but the couple of times I tried just now, it just hung quietly
    and made Xen print some rude messages:
    
        (XEN) mm.c:2389:d80 Bad type (saw 7400000000000001 != exp
        3000000000000000) for mfn 1d7058 (pfn 18fa7)
        (XEN) mm.c:964:d80 Attempt to create linear p.t. with write perms
        (XEN) mm.c:2389:d80 Bad type (saw 7400000000000010 != exp
        1000000000000000) for mfn 1d2e04 (pfn 1d1fb)
        (XEN) mm.c:2965:d80 Error while pinning mfn 1d2e04
    
    Which means the domain tried to map a pagetable page RW, which would
    allow it to map arbitrary memory, so Xen stopped it.  This is because
    vm_unmap_ram() left some pages mapped in the vmalloc area after NFS had
    finished with them, and those pages got recycled as pagetable pages
    while still having these RW aliases.
    
    Removing those mappings immediately removes the Xen-visible aliases, and
    so it has no problem with those pages being reused as pagetable pages.
    Deferring the TLB flush doesn't upset Xen because it can flush the TLB
    itself as needed to maintain its invariants.
    
    When unmapping a region in the vmalloc space, clear the ptes
    immediately.  There's no point in deferring this because there's no
    amortization benefit.
    
    The TLBs are left dirty, and they are flushed lazily to amortize the
    cost of the IPIs.
    
    This specific motivation for this patch is an oops-causing regression
    since 2.6.36 when using NFS under Xen, triggered by the NFS client's use
    of vm_map_ram() introduced in 56e4ebf877b60 ("NFS: readdir with vmapped
    pages") .  XFS also uses vm_map_ram() and could cause similar problems.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
    Cc: Nick Piggin <npiggin at kernel.dk>
    Cc: Bryan Schumaker <bjschuma at netapp.com>
    Cc: Trond Myklebust <Trond.Myklebust at netapp.com>
    Cc: Alex Elder <aelder at sgi.com>
    Cc: Dave Chinner <david at fromorbit.com>
    Cc: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 853ff88324a248a9f5da6e110850223db353ec07
Author: Andres Salomon <dilinger at queued.net>
Date:   Thu Dec 2 14:31:17 2010 -0800

    cs5535-gpio: apply CS5536 errata workaround for GPIOs
    
    The AMD Geode CS5536 Companion Device Silicon Revision B1 Specification
    Update mentions the follow as issue #36:
    
     "Atomic write transactions to the atomic GPIO High Bank Feature Bit
      registers should only affect the bits selected [...]"
    
     "after Suspend, an atomic write transaction [...] will clear all
      non-selected bits of the accessed register."
    
    In other words, writing to the high bank for a single GPIO bit will
    clear every other GPIO bit (but only sometimes after a suspend).
    
    The workaround described is obvious and simple; do a read-modify-write.
    This patch does that, and documents why we're doing it.
    
    Signed-off-by: Andres Salomon <dilinger at queued.net>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 238af8751f64a75f8b638193353b1c31ea32e738
Author: Frederic Weisbecker <fweisbec at gmail.com>
Date:   Thu Dec 2 14:31:16 2010 -0800

    reiserfs: don't acquire lock recursively in reiserfs_acl_chmod
    
    reiserfs_acl_chmod() can be called by reiserfs_set_attr() and then take
    the reiserfs lock a second time.  Thereafter it may call journal_begin()
    that definitely requires the lock not to be nested in order to release
    it before taking the journal mutex because the reiserfs lock depends on
    the journal mutex already.
    
    So, aviod nesting the lock in reiserfs_acl_chmod().
    
    Reported-by: Pawel Zawora <pzawora at gmail.com>
    Signed-off-by: Frederic Weisbecker <fweisbec at gmail.com>
    Tested-by: Pawel Zawora <pzawora at gmail.com>
    Cc: Jeff Mahoney <jeffm at suse.com>
    Cc: <stable at kernel.org>		[2.6.32.x+]
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0bae35e14b68f5e7075bc96e5ea608b42bdf8f59
Author: Johannes Berg <johannes.berg at intel.com>
Date:   Thu Dec 2 14:31:14 2010 -0800

    leds: fix up dependencies
    
    It's not useful to build LED triggers when there's no LEDs that can be
    triggered by them.  Therefore, fix up the dependencies so that this
    cannot happen, and fix a few users that select triggers to depend on
    LEDS_CLASS as well (there is also one user that also selects LEDS_CLASS,
    which is OK).
    
    Signed-off-by: Johannes Berg <johannes.berg at intel.com>
    Reported-by: Randy Dunlap <randy.dunlap at oracle.com>
    Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
    Tested-by: Ingo Molnar <mingo at elte.hu>
    Cc: Arnd Hannemann <arnd at arndnet.de>
    Cc: Michal Hocko <mhocko at suse.cz>
    Cc: Richard Purdie <rpurdie at linux.intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e172662d113ceb22db727a979bb35b9c02f703b5
Author: Wu Fengguang <fengguang.wu at intel.com>
Date:   Thu Dec 2 14:31:13 2010 -0800

    vmstat: fix dirty threshold ordering
    
    The nr_dirty_[background_]threshold fields are misplaced before the
    numa_* fields, and users will read strange values.
    
    This is the right order.  Before patch, nr_dirty_background_threshold
    will read as 0 (the value from numa_miss).
    
    	numa_hit 128501
    	numa_miss 0
    	numa_foreign 0
    	numa_interleave 7388
    	numa_local 128501
    	numa_other 0
    	nr_dirty_threshold 144291
    	nr_dirty_background_threshold 72145
    
    Signed-off-by: Wu Fengguang <fengguang.wu at intel.com>
    Cc: Michael Rubin <mrubin at google.com>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Reviewed-by: Minchan Kim <minchan.kim at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 55cfaa3cbdd29c4919ecb5fb8965c310f357e48c
Author: Zeng Zhaoming <zengzm.kernel at gmail.com>
Date:   Thu Dec 2 14:31:13 2010 -0800

    mm/mempolicy.c: add rcu read lock to protect pid structure
    
    find_task_by_vpid() should be protected by rcu_read_lock(), to prevent
    free_pid() reclaiming pid.
    
    Signed-off-by: Zeng Zhaoming <zengzm.kernel at gmail.com>
    Cc: "Paul E. McKenney" <paulmck at us.ibm.com>
    Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Cc: Christoph Lameter <cl at linux-foundation.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1f64d69c7ad2e48e697493e45590679f7a69b7b2
Author: Dean Nelson <dnelson at redhat.com>
Date:   Thu Dec 2 14:31:12 2010 -0800

    mm/hugetlb.c: avoid double unlock_page() in hugetlb_fault()
    
    Have hugetlb_fault() call unlock_page(page) only if it had previously
    called lock_page(page).
    
    Setting CONFIG_DEBUG_VM=y and then running the libhugetlbfs test suite,
    resulted in the tripping of VM_BUG_ON(!PageLocked(page)) in
    unlock_page() having been called by hugetlb_fault() when page ==
    pagecache_page.  This patch remedied the problem.
    
    Signed-off-by: Dean Nelson <dnelson at redhat.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5bddd17fec58f253cddd0bc9eab2cd9eb1bbab4a
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Nov 18 09:32:59 2010 +0800

    drm/i915: Apply a workaround for transitioning from DP on pipe B to HDMI.
    
    This workaround only applies to Ironlake.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: stable at kernel.org

commit 220cad3cbf553f893432919b458da36489373fc6
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Nov 18 09:32:58 2010 +0800

    drm/i915: Always set the DP transcoder config to 8BPC.
    
    The pipe is always set to 8BPC, but here we were leaving whatever
    previous bits were set by the BIOS in place.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Tested-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: stable at kernel.org

commit e7dfc8dbdf9a7fa1ef04c63100a71f4102b82ed3
Author: Alexander V. Lukyanov <lav at netis.ru>
Date:   Tue Nov 30 03:57:39 2010 +0000

    tulip: fix hang in dmfe driver on sending of big packet
    
    This patch fixes hang in dmfe driver on attempt of sending a big packet.
    Without this patch the code stops the queue and never wakes it again.
    
    Signed-off-by: Alexander V. Lukyanov <lav at netis.ru>
    Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit f8e9616108c7003e6499c162459258f11c9dc85e
Author: Vlad Lungu <vlad.lungu at windriver.com>
Date:   Mon Nov 29 22:52:52 2010 +0000

    stmmac: priv->lock can be used uninitialized
    
    To reproduce: if connman (http://connman.net/) is started,
    inserting the stmmac module triggers a "BUG: spinlock bad magic on CPU#0".
    
    Registering the device in stmmac_probe() sends a notification to connman
    which brings the interface up before the lock is initialized.
    
    Signed-off-by: Vlad Lungu <vlad.lungu at windriver.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 94c35de9a918665d9354efe2bafc29ba4b37497a
Merge: 8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b 251d380034c6c34efe75ffb89d863558ba68ec6a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 12:59:11 2010 -0800

    Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
    
    * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (27 commits)
      Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN
      staging: easycap needs smp_lock.h, fixes build error
      Staging: batman-adv: ensure that eth_type_trans gets linear memory
      Staging: batman-adv: Don't remove interface with spinlock held
      staging: brcm80211: updated maintainers contact information
      staging: fix winbond build, needs delay.h
      Staging: line6: fix up my fixup for some sysfs attribute permissions
      Staging: zram: fix up my fixup for some sysfs attribute permissions
      Staging: udlfb: fix up my fixup for some sysfs attribute permissions
      Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions
      Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions
      Staging: frontier: fix up my fixup for some sysfs attribute permissions
      Staging: asus_oled: fix up my fixup for some sysfs attribute permissions
      staging: spectra: fix build error
      Staging: intel_sst: fix memory leak
      Staging: rtl8712: signedness bug in init
      staging: rtl8187se: Change panic to warn when RF switch turned off
      staging: comedi: fix memory leak
      Staging: quickstart: free after input_unregister_device()
      Staging: speakup: free after input_unregister_device()
      ...

commit 8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b
Merge: eed5ee1a3ab3020168cd67fdde2500452b0628c9 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 12:58:36 2010 -0800

    Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
    
    * 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
      uio: Change mail address of Hans J. Koch
      driver core: prune docs about device_interface
      driver core: the development tree has switched to git

commit eed5ee1a3ab3020168cd67fdde2500452b0628c9
Merge: 435a5aebf609624bdf7c5a9a7705c260d0076195 a5880a9e5bb40fbae55de60051d69a29091053c3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 12:58:16 2010 -0800

    Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
    
    * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
      serial: mfd: adjust the baud rate setting
      TTY: open/hangup race fixup
      TTY: don't allow reopen when ldisc is changing
      NET: wan/x25, fix ldisc->open retval
      TTY: ldisc, fix open flag handling
      serial8250: Mark console as CON_ANYTIME

commit 435a5aebf609624bdf7c5a9a7705c260d0076195
Merge: 2e5c26de1d9a8e824b6c098ee393edac1b6050f9 b7a5100bc29c2cc252bf6f1e247ae14fd733fbb8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 12:57:35 2010 -0800

    Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
    
    * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
      USB: fix autosuspend bug in usb-serial
      USB: ehci: disable LPM and PPCD for nVidia MCP89 chips
      USB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added
      USB: yurex: add .llseek fop to file_operations
      USB: ftdi_sio: Add ID for RT Systems USB-29B radio cable
      usb: musb: do not use dma for control transfers
      usb: musb: gadget: fix compilation warning
      usb: musb: clear RXCSR_AUTOCLEAR before PIO read
      usb: musb: unmap dma buffer when switching to PIO
      xhci: Don't let the USB core disable SuperSpeed ports.
      xhci: Setup array of USB 2.0 and USB 3.0 ports.
      xhci: Fix reset-device and configure-endpoint commands

commit 2e5c26de1d9a8e824b6c098ee393edac1b6050f9
Merge: 75318ec3277d1fc46ecc129d7ef880b269fd9ee0 4fc3680894ff5739e7474b6633e962bfbdf0d3d8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 12:11:31 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      watchdog: it8712f_wdt: add note to Kconfig
      watchdog: gef_wdt: include fs.h
      watchdog: bcm63xx_wdt: improve platform part.
      watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg PCH

commit 75318ec3277d1fc46ecc129d7ef880b269fd9ee0
Merge: 8cb280c90f9cfaab3ba3afbace0b1711dee80d0c 7adce751ce79bcb6d0a591e6b94d76631c9a232c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 12:10:56 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB: Fix information leak in marshalling code
      IB/pack: Remove some unused code added by the IBoE patches
      IB/mlx4: Fix IBoE link state
      IB/mlx4: Fix IBoE reported link rate
      mlx4_core: Workaround firmware bug in query dev cap
      IB/mlx4: Fix memory ordering of VLAN insertion control bits
      MAINTAINERS: Update NetEffect entry

commit 6d20e8406f0942228a73000663c2b33f488103ea
Author: Suresh Jayaraman <sjayaraman at suse.de>
Date:   Wed Dec 1 14:42:28 2010 +0530

    cifs: add attribute cache timeout (actimeo) tunable
    
    Currently, the attribute cache timeout for CIFS is hardcoded to 1 second. This
    means that the client might have to issue a QPATHINFO/QFILEINFO call every 1
    second to verify if something has changes, which seems too expensive. On the
    other hand, if the timeout is hardcoded to a higher value, workloads that
    expect strict cache coherency might see unexpected results.
    
    Making attribute cache timeout as a tunable will allow us to make a tradeoff
    between performance and cache metadata correctness depending on the
    application/workload needs.
    
    Add 'actimeo' tunable that can be used to tune the attribute cache timeout.
    The default timeout is set to 1 second. Also, display actimeo option value in
    /proc/mounts.
    
    It appears to me that 'actimeo' and the proposed (but not yet merged)
    'strictcache' option cannot coexist, so care must be taken that we reset the
    other option if one of them is set.
    
    Changes since last post:
       - fix option parsing and handle possible values correcly
    
    Reviewed-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Suresh Jayaraman <sjayaraman at suse.de>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c
Author: John W. Linville <linville at tuxdriver.com>
Date:   Thu Dec 2 14:10:58 2010 -0500

    Revert "ath9k: Fix STA disconnect issue due to received MIC failed bcast frames"
    
    This reverts commit 916448e77f6bcaaa7f13c3de0c3851783ae2bfd0.
    
    "As far as I can tell, either of these patches breaks multiple VIF
    scenarios.  I'm not sure exactly why, but I had to revert this to
    get any of my interfaces to associate."
      -- Ben Greear <greearb at candelatech.com>
    
    http://marc.info/?l=linux-wireless&m=129123368719339&w=2
    
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit f67e07eb3decd7840b621fba37fd600adfdf99f8
Author: Felix Fietkau <nbd at openwrt.org>
Date:   Wed Dec 1 19:07:47 2010 +0100

    ath9k_hw: fix more bitfield related endian issues
    
    A few LNA control related flags were also specified as a bitfields, however
    for some strange reason they were written in big-endian order this time.
    Fix this by using flags instead.
    
    Signed-off-by: Felix Fietkau <nbd at openwrt.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit e702ba18f25887c76d26c8a85cc1706463c62e9a
Author: Felix Fietkau <nbd at openwrt.org>
Date:   Wed Dec 1 19:07:46 2010 +0100

    ath9k_hw: fix endian issues with CTLs on AR9003
    
    Parsing data using bitfields is messy, because it makes endian handling
    much harder. AR9002 and earlier got it right, AR9003 got it wrong.
    This might lead to either using too high or too low tx power values,
    depending on frequency and eeprom settings.
    Fix it by getting rid of the CTL related bitfields entirely and use
    masks instead.
    
    Signed-off-by: Felix Fietkau <nbd at openwrt.org>
    Cc: stable at kernel.org
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 9306990a656d9cfd8bf3586938012729c1f2ea50
Author: Vasanthakumar Thiagarajan <vasanth at atheros.com>
Date:   Tue Nov 30 23:24:09 2010 -0800

    ath9k: Fix bug in reading input gpio state for ar9003
    
    The register which gives input gpio state is 0x404c for ar9003,
    currently 0x4048 is wrongly used. This will disable RF and make
    it unusable on some of AR9003.
    
    Cc:stable at kernel.org
    Signed-off-by: Vasanthakumar Thiagarajan <vasanth at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 1937721f5637b53c794124cf4fd9edad0eb315ef
Merge: 916448e77f6bcaaa7f13c3de0c3851783ae2bfd0 be93112accb42c5586a459683d71975cc70673ca
Author: John W. Linville <linville at tuxdriver.com>
Date:   Thu Dec 2 14:00:51 2010 -0500

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

commit 8cb280c90f9cfaab3ba3afbace0b1711dee80d0c
Merge: 8fed709f343346a77888c2eef8f2d41bc637bef6 c76febef574fd86566bbdf1a73a547a439115c25
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 09:13:36 2010 -0800

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
    
    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: only run xfs_error_test if error injection is active
      xfs: avoid moving stale inodes in the AIL
      xfs: delayed alloc blocks beyond EOF are valid after writeback
      xfs: push stale, pinned buffers on trylock failures
      xfs: fix failed write truncation handling.

commit 2ff38c9fbaa86264ad819117ab137361067ab5f1
Merge: c949e3d685b661412bfcd93d9c5956f125c1e060 af745bd724e304cc94a88a2fb43d53baffbd63a5
Author: Takashi Iwai <tiwai at suse.de>
Date:   Thu Dec 2 17:33:53 2010 +0100

    Merge branch 'fix/asoc' into for-linus

commit af745bd724e304cc94a88a2fb43d53baffbd63a5
Merge: 2062ea522bb58bb2aeee86d051b37136491ccd65 0ffd22b694b739b3dc3f80bc93726b581e8e8af5
Author: Takashi Iwai <tiwai at suse.de>
Date:   Thu Dec 2 17:31:18 2010 +0100

    Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc

commit c949e3d685b661412bfcd93d9c5956f125c1e060
Merge: 37fa84d8e647e584bf1b71bdff0330049e34f5ef 0defe09ca70daccdc83abd9c3c24cd89ae6a1141
Author: Takashi Iwai <tiwai at suse.de>
Date:   Thu Dec 2 17:14:50 2010 +0100

    Merge branch 'fix/hda' into for-linus

commit 8fed709f343346a77888c2eef8f2d41bc637bef6
Merge: 53f517a1f61ce69bf67898891d5b14ffaada0003 06c63f9396133f312c5a49c2285c2c8015e80934
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 08:06:16 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
      regulator: fix kernel-doc for set_consumer_device_supply
      regulator: enable supply regulator only when use count is zero
      regulator: twl-regulator - fix twlreg_set_mode
      regulator: lock supply in regulator enable
      regulator: Return proper error for regulator_register()
      regulator: Ensure enough delay time for enabling regulator
      regulator: Remove a redundant device_remove_file call in create_regulator
      regulator: Staticise mc13783_powermisc_rmw()
      regulator: regulator disable supply fix

commit 53f517a1f61ce69bf67898891d5b14ffaada0003
Merge: 04ed0978d5ca5a3460a6f1f7443f8147a183669f 9a1f8b34aa539000da17a06235e4bec254d0bfb5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 08:05:56 2010 -0800

    Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
    
    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      [media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions
      [media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)

commit 04ed0978d5ca5a3460a6f1f7443f8147a183669f
Merge: 8520eeaa1235ee78d32558b6a57e02b236c9e588 dfc5606dc51381186de765243bab340c8e021868
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 08:05:22 2010 -0800

    Merge branch 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
    
    * 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      rbd: replace the rbd sysfs interface

commit 8520eeaa1235ee78d32558b6a57e02b236c9e588
Merge: fb82155d5c401a5cf2bc2f555cb807f0bed035bb ba03864872691c0bb580a7fb47388da337ef4aa2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Dec 2 08:04:21 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: fix parsing of hostname in dfs referrals
      cifs: display fsc in /proc/mounts
      cifs: enable fscache iff fsc mount option is used explicitly
      cifs: allow fsc mount option only if CONFIG_CIFS_FSCACHE is set
      cifs: Handle extended attribute name cifs_acl to generate cifs acl blob (try #4)
      cifs: Misc. cleanup in cifsacl handling [try #4]
      cifs: trivial comment fix for cifs_invalidate_mapping
      [CIFS] fs/cifs/Kconfig: CIFS depends on CRYPTO_HMAC
      cifs: don't take extra tlink reference in initiate_cifs_search
      cifs: Percolate error up to the caller during get/set acls [try #4]
      cifs: fix another memleak, in cifs_root_iget
      cifs: fix potential use-after-free in cifs_oplock_break_put

commit 11de3b11e08cac26d59e88efaf4e316701883552
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Wed Dec 1 14:17:06 2010 -0500

    NFS: Fix a memory leak in nfs_readdir
    
    We need to ensure that the entries in the nfs_cache_array get cleared
    when the page is removed from the page cache. To do so, we use the
    freepage address_space operation.
    
    Change nfs_readdir_clear_array to use kmap_atomic(), so that the
    function can be safely called from all contexts.
    
    Finally, modify the cache_page_release helper to call
    nfs_readdir_clear_array directly, when dealing with an anonymous
    page from 'uncached_readdir'.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 6072d13c429373c5d63b69dadbbef40a9b035552
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Dec 1 13:35:19 2010 -0500

    Call the filesystem back whenever a page is removed from the page cache
    
    NFS needs to be able to release objects that are stored in the page
    cache once the page itself is no longer visible from the page cache.
    
    This patch adds a callback to the address space operations that allows
    filesystems to perform page cleanups once the page has been removed
    from the page cache.
    
    Original patch by: Linus Torvalds <torvalds at linux-foundation.org>
    [trondmy: cover the cases of invalidate_inode_pages2() and
              truncate_inode_pages()]
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 512b109ec9620d037d6d2f6bd1bae9ce34dd6779
Author: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date:   Wed Dec 1 14:51:44 2010 +0000

    xen: unplug the emulated devices at resume time
    
    Early after being resumed we need to unplug again the emulated devices.
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>

commit 9a069c33c53c2e72ec1b76106be73df044af0195
Author: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date:   Wed Dec 1 14:51:44 2010 +0000

    xen: fix save/restore for PV on HVM guests with pirq remapping
    
    Re-map and re-bind all the pirqs at resume time.
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>

commit 6411fe69b8c4fd7811339c88c1843d562099fa2b
Author: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date:   Wed Dec 1 14:51:44 2010 +0000

    xen: resume the pv console for hvm guests too
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>

commit af42b8d12f8adec6711cb824549a0edac6a4ae8f
Author: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date:   Wed Dec 1 14:51:44 2010 +0000

    xen: fix MSI setup and teardown for PV on HVM guests
    
    When remapping MSIs into pirqs for PV on HVM guests, qemu is responsible
    for doing the actual mapping and unmapping.
    We only give qemu the desired pirq number when we ask to do the mapping
    the first time, after that we should be reading back the pirq number
    from qemu every time we want to re-enable the MSI.
    
    This fixes a bug in xen_hvm_setup_msi_irqs that manifests itself when
    trying to enable the same MSI for the second time: the old MSI to pirq
    mapping is still valid at this point but xen_hvm_setup_msi_irqs would
    try to assign a new pirq anyway.
    A simple way to reproduce this bug is to assign an MSI capable network
    card to a PV on HVM guest, if the user brings down the corresponding
    ethernet interface and up again, Linux would fail to enable MSIs on the
    device.
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>

commit e5fc7345412d5e4758fcef55a74354c5cbefd61e
Author: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date:   Wed Dec 1 14:51:44 2010 +0000

    xen: use PHYSDEVOP_get_free_pirq to implement find_unbound_pirq
    
    Use the new hypercall PHYSDEVOP_get_free_pirq to ask Xen to allocate a
    pirq. Remove the unsupported PHYSDEVOP_get_nr_pirqs hypercall to get the
    amount of pirq available.
    
    This fixes find_unbound_pirq that otherwise would return a number
    starting from nr_irqs that might very well be out of range in Xen.
    
    The symptom of this bug is that when you passthrough an MSI capable pci
    device to a PV on HVM guest, Linux would fail to enable MSIs on the
    device.
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>

commit 4fc3680894ff5739e7474b6633e962bfbdf0d3d8
Author: Wim Van Sebroeck <wim at iguana.be>
Date:   Thu Dec 2 14:03:29 2010 +0000

    watchdog: it8712f_wdt: add note to Kconfig
    
    On some motherboards the it8712f watchdog does not work unless
    the game port was enabled. see Bug 13140. We therefor add a note
    to Kconfig.
    
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit f6e0722fc3a35ff818c86ffbc414f7592a8119cf
Author: Wolfram Sang & Martyn Welch <w.sang at pengutronix.de, martyn.welch at ge.com>
Date:   Thu Dec 2 00:11:16 2010 +0100

    watchdog: gef_wdt: include fs.h
    
    Add missing include "linux/fs.h".
    This fixes compile failure.
    
    Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
    Signed-off-by: Martyn Welch <martyn.welch at ge.com>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit e6c3b699b2f6fcba7036c079b6f16bf9556c7f0d
Author: Wim Van Sebroeck <wim at iguana.be>
Date:   Sat Oct 23 20:59:42 2010 +0000

    watchdog: bcm63xx_wdt: improve platform part.
    
    * fix devinit and devexit sections
    * fix platform removal code so that the iounmap happens after the removal of the timer.
    * changes the reboot_notifier by a platform shutdown method.
    
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit c54fb811745967732bc9e31d837e0c9925e12b4b
Author: Seth Heasley <seth.heasley at intel.com>
Date:   Wed Nov 17 12:15:08 2010 -0700

    watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg PCH
    
    This patch adds an additional LPC Controller DeviceID for the Intel Patsburg PCH for TCO Watchdog.
    
    Signed-off-by: Seth Heasley <seth.heasley at intel.com>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit 0ffd22b694b739b3dc3f80bc93726b581e8e8af5
Author: Jarkko Nikula <jhnikula at gmail.com>
Date:   Wed Dec 1 11:01:20 2010 +0200

    ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency
    
    Not all omap boards use kernel based pin multiplexing so
    CONFIG_SND_OMAP_SOC_N810 should not select it by default as it can make
    harm to other boards in multi-board kernels.
    
    Therefore put CONFIG_OMAP_MUX as a dependency to N810 ASoC machine driver.
    
    Thanks to Tony Lindgren <tony at atomide.com> for noticing.
    
    Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
    Cc: Tony Lindgren <tony at atomide.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Acked-by: Tony Lindgren <tony at atomide.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit 83ed79c561da20019cb24944f535530d73b2d615
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date:   Thu Dec 2 11:49:06 2010 +0100

    HID: length resolution should be reported units/mm
    
    Input ABI requires reporting resolution on main axes in units per
    millimeter, not units per inch, so we need to convert accordingly.
    
    Tested-by: Nikolai Kondrashov <spbnick at gmail.com>
    Acked-by: Nikolai Kondrashov <spbnick at gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
    Signed-off-by: Jiri Kosina <jkosina at suse.cz>

commit 0defe09ca70daccdc83abd9c3c24cd89ae6a1141
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Wed Dec 1 19:16:07 2010 -0500

    ALSA: hda: Use "alienware" model quirk for another SSID
    
    BugLink: https://launchpad.net/bugs/683695
    
    The original reporter states that headphone jacks do not appear to
    work.  Upon inspecting his codec dump, and upon further testing, it is
    confirmed that the "alienware" model quirk is correct.
    
    Reported-and-tested-by: Cody Thierauf
    Cc: <stable at kernel.org> [2.6.32+]
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 56b9aea3b740be7665be100872a913da9bdc653b
Author: Len Brown <len.brown at intel.com>
Date:   Thu Dec 2 01:19:32 2010 -0500

    intel_idle: recognize ARAT on WSM-EX
    
    We erroneously ignored the Always Running APIC Timer on WSM-EX.
    Move the check for ARAT down so that it can apply to any/all models.
    
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 7adce751ce79bcb6d0a591e6b94d76631c9a232c
Merge: 91a4d157d0c18bd18fd95f90b67cb10d11701cca 21d606090ec1aacc998276f5af34c43a88f01218 e3d33cb13202cd51378c8d61e92a96183cc0e6fd
Author: Roland Dreier <rolandd at cisco.com>
Date:   Wed Dec 1 16:33:47 2010 -0800

    Merge branches 'misc', 'mlx4' and 'nes' into for-next

commit 91a4d157d0c18bd18fd95f90b67cb10d11701cca
Author: Vasiliy Kulikov <segoon at openwall.com>
Date:   Sun Nov 14 09:22:52 2010 +0000

    IB: Fix information leak in marshalling code
    
    ib_ucm_init_qp_attr() and ucma_init_qp_attr() pass struct ib_uverbs_qp_attr
    with reserved, qp_state, {ah_attr,alt_ah_attr}{reserved,->grh.reserved}
    fields uninitialized to copy_to_user().  This leads to leaking of
    contents of kernel stack memory to userspace.
    
    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit f55864a4f435e47ad413be7016f38877b096bb5b
Author: Or Gerlitz <ogerlitz at voltaire.com>
Date:   Mon Nov 29 07:20:50 2010 +0000

    IB/pack: Remove some unused code added by the IBoE patches
    
    Remove unused functions added by commit ff7f5aab354d ("IB/pack: IBoE UD
    packet packing support").
    
    Signed-off-by: Or Gerlitz <ogerlitz at voltaire.com>

commit 21d606090ec1aacc998276f5af34c43a88f01218
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date:   Thu Nov 11 21:05:58 2010 +0000

    IB/mlx4: Fix IBoE link state
    
    Use netif_running() and netif_carrier_ok() to report link state,
    exactly as is done to report Ethernet link state in sysfs.
    
    Signed-off-by: Eli Cohen <eli at mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 328266c561153a0c19084088d5dacd40632dc7ae
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date:   Mon Nov 15 14:04:39 2010 +0000

    IB/mlx4: Fix IBoE reported link rate
    
    The link rate is the product of the link speed in the link width. For
    Etherent ports the rate is 10G, so we use 1 for the width and 4 for
    speed to get the correct rate.
    
    Signed-off-by: Eli Cohen <eli at mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 58d74bb1d9f79bb56b2ea51d2ca06a28fa0fce02
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date:   Wed Nov 10 12:52:37 2010 +0000

    mlx4_core: Workaround firmware bug in query dev cap
    
    ConnectX firmware is supposed to report the number blue flame
    registers per page as log2 of the value.  However, due to a firmware
    bug, it reports actual number.  This patch works around this by
    checking if the number of registers calculated fits within a page.  If
    it does not, we use 8 registers per page.
    
    Signed-off-by: Eli Cohen <eli at mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit dfc5606dc51381186de765243bab340c8e021868
Author: Yehuda Sadeh <yehuda at hq.newdream.net>
Date:   Fri Nov 19 14:51:04 2010 -0800

    rbd: replace the rbd sysfs interface
    
    The new interface creates directories per mapped image
    and under each it creates a subdir per available snapshot.
    This allows keeping a cleaner interface within the sysfs
    guidelines. The ABI documentation was updated too.
    
    Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
    Signed-off-by: Yehuda Sadeh <yehuda at hq.newdream.net>
    Signed-off-by: Sage Weil <sage at newdream.net>

commit a5b10629edfa521071ccdb3b1e0e7fb350a044db
Author: Herb Shiu <herb_shiu at tcloudcomputing.com>
Date:   Tue Nov 23 13:58:29 2010 -0800

    ceph: Behave better when handling file lock replies.
    
    Fill in the local lock with response data if appropriate,
    and don't call posix_lock_file when reading locks.
    
    Signed-off-by: Herb Shiu <herb_shiu at tcloudcomputing.com>
    Acked-by: Greg Farnum <gregf at hq.newdream.net>
    Signed-off-by: Sage Weil <sage at newdream.net>

commit 637ae8d547390df75bad42a7e9cb65e625119767
Author: Herb Shiu <herb_shiu at tcloudcomputing.com>
Date:   Tue Nov 23 13:42:23 2010 -0800

    ceph: pass lock information by struct file_lock instead of as individual params.
    
    Signed-off-by: Herb Shiu <herb_shiu at tcloudcomputing.com>
    Acked-by: Greg Farnum <gregf at hq.newdream.net>
    Signed-off-by: Sage Weil <sage at newdream.net>

commit 25933abdd8c562182ca6dc9f8c4c2cc8265c3a80
Author: Herb Shiu <herb_shiu at tcloudcomputing.com>
Date:   Wed Dec 1 14:14:38 2010 -0800

    ceph: Handle file locks in replies from the MDS.
    
    Previously the kernel client incorrectly assumed everything was a directory.
    
    Signed-off-by: Herb Shiu <herb_shiu at tcloudcomputing.com>
    Acked-by: Greg Farnum <gregf at hq.newdream.net>
    Signed-off-by: Sage Weil <sage at newdream.net>

commit 884ea892763d4dfba509743f65961c782c0442db
Author: Sage Weil <sage at newdream.net>
Date:   Mon Nov 22 22:58:06 2010 -0800

    ceph: avoid possible null deref in readdir after dir llseek
    
    last may be NULL, but we dereference it in the else branch without
    checking.  Normally it doesn't trigger because last == NULL when fpos == 2,
    but it could happen on a newly opened dir if the user seeks forward.
    
    Reported-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: Sage Weil <sage at newdream.net>

commit 12b3b5afed67e08aa641d30e57df20dab2e33432
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date:   Thu Nov 25 00:03:32 2010 +0100

    ACPI / PM: Do not refcount power resources that can't be turned on
    
    If turning on a power resource fails, do not reference count it,
    since it cannot be in use in that case.
    
    Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 212967c69afd348342548272aedbe4d46a9325d6
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date:   Thu Nov 25 00:02:36 2010 +0100

    ACPI / PM: Check device state before refcounting power resources
    
    Commit 3e384ee6c687cb397581ee8f9440fc8220cfac80 (ACPI / PM: Fix
    reference counting of power resources) introduced a regression by
    causing fan power resources to be turned on and reference counted
    unnecessarily during resume, so on some boxes fans are always on
    after resume.
    
    Fix the problem by checking if the current device state is different
    from the new state before reference counting and turning on power
    resources in acpi_power_transition().
    
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=22932 .
    
    Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
    Reported-and-tested-by: Maciej Rutecki <maciej.rutecki at gmail.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 6dcdd1b3694a4fa2b85167a9c860c7613a7553c7
Author: David McCullough <david_mccullough at mcafee.com>
Date:   Mon Nov 29 19:32:34 2010 +0000

    net/ipv6/sit.c: return unhandled skb to tunnel4_rcv
    
    I found a problem using an IPv6 over IPv4 tunnel.  When CONFIG_IPV6_SIT
    was enabled, the packets would be rejected as net/ipv6/sit.c was catching
    all IPPROTO_IPV6 packets and returning an ICMP port unreachable error.
    
    I think this patch fixes the problem cleanly.  I believe the code in
    net/ipv4/tunnel4.c:tunnel4_rcv takes care of it properly if none of the
    handlers claim the skb.
    
    Signed-off-by: David McCullough <david_mccullough at mcafee.com>
    Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit d13a2cb63d06fe2e3067c7d40f9a5946abd614c8
Author: David Strand <dpstrand at gmail.com>
Date:   Wed Dec 1 11:43:08 2010 -0800

    bonding: check for assigned mac before adopting the slaves mac address
    
    Restore the check for an unassigned mac address before adopting the
    first slaves as it's own. The change in behavior was introduced by:
    
    commit c20811a79e671a6a1fe86a8c1afe04aca8a7f085
    Author: Jiri Pirko <jpirko at redhat.com>
    
        bonding: move dev_addr cpy to bond_enslave
    
    
    Signed-off-by: David Strand <dpstrand at gmail.com>
    Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 6c08af030212d1a34593397bb01f262ff31c3629
Author: Hauke Mehrtens <hauke at hauke-m.de>
Date:   Sat Nov 27 06:47:43 2010 +0000

    b44: fix workarround for wap54g10
    
    The code for the b44_wap54g10_workaround was never included, because
    the config option was wrong. The nvram_get function was never in
    mainline kernel, only in external OpenWrt patches.
    
    The code should be compiled in when CONFIG_BCM47XX is selected and not
    when CONFIG_SSB_DRIVER_MIPS is selected, because nvram_getenv is only
    available on bcm47xx platforms and now in the mainline kernel code.
    Using an include is better than a second function declaration, to fix
    this when the function signature changes.
    
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e27535b9c6e071d461be33b75a33047c9bb4c0ce
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date:   Wed Nov 17 13:39:43 2010 +0000

    IB/mlx4: Fix memory ordering of VLAN insertion control bits
    
    We must fully update the control segment before marking it as valid,
    so that hardware doesn't start executing it before we're ready.
    
    Signed-off-by: Eli Cohen <eli at mellanox.co.il>
    
    [ Move VLAN control bit setting to before wmb().  - Roland ]
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit e3d33cb13202cd51378c8d61e92a96183cc0e6fd
Author: Chien Tung <chien.tin.tung at intel.com>
Date:   Tue Nov 2 16:29:54 2010 +0000

    MAINTAINERS: Update NetEffect entry
    
    Correct web link as www.neteffect.com is no longer valid.  Remove
    Chien Tung as maintainer.  I am moving on to other responsibilities at
    Intel.  Thanks for all the fish.
    
    Signed-off-by: Chien Tung <chien.tin.tung at intel.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 381601e5bbae78d7c18d946fe874a63957edea13
Author: Anders Franzen <Anders.Franzen at ericsson.com>
Date:   Wed Nov 24 05:47:18 2010 +0000

    Make the ip6_tunnel reflect the true mtu.
    
    The ip6_tunnel always assumes it consumes 40 bytes (ip6 hdr) of the mtu of the
    underlaying device. So for a normal ethernet bearer, the mtu of the ip6_tunnel is
    1460.
    However, when creating a tunnel the encap limit option is enabled by default, and it
    consumes 8 bytes more, so the true mtu shall be 1452.
    
    I dont really know if this breaks some statement in some RFC, so this is a request for
    comments.
    
    Signed-off-by: Anders Franzen <anders.franzen at ericsson.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit be93112accb42c5586a459683d71975cc70673ca
Author: Bala Shanmugam <sbalashanmugam at atheros.com>
Date:   Fri Nov 26 17:35:46 2010 +0530

    Bluetooth: Add new PID for Atheros 3011
    
    Atheros 3011 has small sflash firmware and needs to be
    blacklisted in transport driver to load actual firmware
    in DFU driver.
    
    Signed-off-by: Bala Shanmugam <sbalashanmugam at atheros.com>
    Acked-by: Marcel Holtmann <marcel at holtmann.org>
    Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>

commit 61faddf661a65a179751dc9fd209cb694d9a28af
Author: Stefan Seyfried <seife+kernel at b1-systems.com>
Date:   Tue Nov 30 21:49:08 2010 +0100

    Bluetooth: Fix log spamming in btusb due to autosuspend
    
    If a device is autosuspended an inability to resubmit URBs is
    to be expected. Check the error code and only log real errors.
    (Now that autosuspend is default enabled for btusb, those log
    messages were happening all the time e.g. with a BT mouse)
    
    Signed-off-by: Stefan Seyfried <seife+kernel at b1-systems.com>
    Signed-off-by: Oliver Neukum <oneukum at suse.de>
    Acked-by: Marcel Holtmann <marcel at holtmann.org>
    Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>

commit 8ed9e0e1b602a0bcdc3bef52ec05fdab5b484341
Author: Namhyung Kim <namhyung at gmail.com>
Date:   Wed Dec 1 09:19:45 2010 -0800

    Input: turbografx - fix reference counting
    
    The ref-count of parport gained from parport_find_number()
    was not released in normal path.
    
    Signed-off-by: Namhyung Kim <namhyung at gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit c76febef574fd86566bbdf1a73a547a439115c25
Author: Dave Chinner <dchinner at redhat.com>
Date:   Tue Nov 30 15:15:31 2010 +1100

    xfs: only run xfs_error_test if error injection is active
    
    Recent tests writing lots of small files showed the flusher thread
    being CPU bound and taking a long time to do allocations on a debug
    kernel. perf showed this as the prime reason:
    
                 samples  pcnt function                    DSO
                 _______ _____ ___________________________ _________________
    
               224648.00 36.8% xfs_error_test              [kernel.kallsyms]
                86045.00 14.1% xfs_btree_check_sblock      [kernel.kallsyms]
                39778.00  6.5% prandom32                   [kernel.kallsyms]
                37436.00  6.1% xfs_btree_increment         [kernel.kallsyms]
                29278.00  4.8% xfs_btree_get_rec           [kernel.kallsyms]
                27717.00  4.5% random32                    [kernel.kallsyms]
    
    Walking btree blocks during allocation checking them requires each
    block (a cache hit, so no I/O) call xfs_error_test(), which then
    does a random32() call as the first operation.  IOWs, ~50% of the
    CPU is being consumed just testing whether we need to inject an
    error, even though error injection is not active.
    
    Kill this overhead when error injection is not active by adding a
    global counter of active error traps and only calling into
    xfs_error_test when fault injection is active.
    
    Signed-off-by: Dave Chinner <dchinner at redhat.com>
    Reviewed-by: Christoph Hellwig <hch at lst.de>

commit de25c1818c44f580ff556cb9e0f7a1c687ed870b
Author: Dave Chinner <dchinner at redhat.com>
Date:   Tue Nov 30 15:15:46 2010 +1100

    xfs: avoid moving stale inodes in the AIL
    
    When an inode has been marked stale because the cluster is being
    freed, we don't want to (re-)insert this inode into the AIL. There
    is a race condition where the cluster buffer may be unpinned before
    the inode is inserted into the AIL during transaction committed
    processing. If the buffer is unpinned before the inode item has been
    committed and inserted, then it is possible for the buffer to be
    released and hence processthe stale inode callbacks before the inode
    is inserted into the AIL.
    
    In this case, we then insert a clean, stale inode into the AIL which
    will never get removed by an IO completion. It will, however, get
    reclaimed and that triggers an assert in xfs_inode_free()
    complaining about freeing an inode still in the AIL.
    
    This race can be avoided by not moving stale inodes forward in the AIL
    during transaction commit completion processing. This closes the
    race condition by ensuring we never insert clean stale inodes into
    the AIL. It is safe to do this because a dirty stale inode, by
    definition, must already be in the AIL.
    
    Signed-off-by: Dave Chinner <dchinner at redhat.com>
    Reviewed-by: Christoph Hellwig <hch at lst.de>

commit 309c848002052edbec650075a1eb098b17c17f35
Author: Dave Chinner <dchinner at redhat.com>
Date:   Tue Nov 30 15:16:02 2010 +1100

    xfs: delayed alloc blocks beyond EOF are valid after writeback
    
    There is an assumption in the parts of XFS that flushing a dirty
    file will make all the delayed allocation blocks disappear from an
    inode. That is, that after calling xfs_flush_pages() then
    ip->i_delayed_blks will be zero.
    
    This is an invalid assumption as we may have specualtive
    preallocation beyond EOF and they are recorded in
    ip->i_delayed_blks. A flush of the dirty pages of an inode will not
    change the state of these blocks beyond EOF, so a non-zero
    deeelalloc block count after a flush is valid.
    
    The bmap code has an invalid ASSERT() that needs to be removed, and
    the swapext code has a bug in that while it swaps the data forks
    around, it fails to swap the i_delayed_blks counter associated with
    the fork and hence can get the block accounting wrong.
    
    Signed-off-by: Dave Chinner <dchinner at redhat.com>
    Reviewed-by: Christoph Hellwig <hch at lst.de>

commit 90810b9e82a36c3c57c1aeb8b2918b242a130b26
Author: Dave Chinner <dchinner at redhat.com>
Date:   Tue Nov 30 15:16:16 2010 +1100

    xfs: push stale, pinned buffers on trylock failures
    
    As reported by Nick Piggin, XFS is suffering from long pauses under
    highly concurrent workloads when hosted on ramdisks. The problem is
    that an inode buffer is stuck in the pinned state in memory and as a
    result either the inode buffer or one of the inodes within the
    buffer is stopping the tail of the log from being moved forward.
    
    The system remains in this state until a periodic log force issued
    by xfssyncd causes the buffer to be unpinned. The main problem is
    that these are stale buffers, and are hence held locked until the
    transaction/checkpoint that marked them state has been committed to
    disk. When the filesystem gets into this state, only the xfssyncd
    can cause the async transactions to be committed to disk and hence
    unpin the inode buffer.
    
    This problem was encountered when scaling the busy extent list, but
    only the blocking lock interface was fixed to solve the problem.
    Extend the same fix to the buffer trylock operations - if we fail to
    lock a pinned, stale buffer, then force the log immediately so that
    when the next attempt to lock it comes around, it will have been
    unpinned.
    
    Signed-off-by: Dave Chinner <dchinner at redhat.com>
    Reviewed-by: Christoph Hellwig <hch at lst.de>

commit c726de4409a8d3a03877b1ef4342bfe8a15f5e5e
Author: Dave Chinner <dchinner at redhat.com>
Date:   Tue Nov 30 15:14:39 2010 +1100

    xfs: fix failed write truncation handling.
    
    Since the move to the new truncate sequence we call xfs_setattr to
    truncate down excessively instanciated blocks.  As shown by the testcase
    in kernel.org BZ #22452 that doesn't work too well.  Due to the confusion
    of the internal inode size, and the VFS inode i_size it zeroes data that
    it shouldn't.
    
    But full blown truncate seems like overkill here.  We only instanciate
    delayed allocations in the write path, and given that we never released
    the iolock we can't have converted them to real allocations yet either.
    
    The only nasty case is pre-existing preallocation which we need to skip.
    We already do this for page discard during writeback, so make the delayed
    allocation block punching a generic function and call it from the failed
    write path as well as xfs_aops_discard_page. The callers are
    responsible for ensuring that partial blocks are not truncated away,
    and that they hold the ilock.
    
    Based on a fix originally from Christoph Hellwig. This version used
    filesystem blocks as the range unit.
    
    Signed-off-by: Dave Chinner <dchinner at redhat.com>
    Reviewed-by: Christoph Hellwig <hch at lst.de>

commit 0aded708d125a3ff7e5abaea9c2d9c6d7ebbfdcd
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Tue Nov 30 21:56:32 2010 -0500

    NFS: Ensure we use the correct cookie in nfs_readdir_xdr_filler
    
    We need to use the cookie from the previous array entry, not the
    actual cookie that we are searching for (except for the case of
    uncached_readdir).
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 307991055b0ce65d53dc1eb501c456c10eb36360
Merge: 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 9b4320b77bab4031649c484da1c595f39c2e43cd
Author: Michal Marek <mmarek at suse.cz>
Date:   Wed Dec 1 13:13:56 2010 +0100

    Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes

commit 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575
Author: Hendrik Brueckner <brueckner at linux.vnet.ibm.com>
Date:   Mon Nov 29 14:38:50 2010 -0800

    initramfs: Really fix build break on symbol-prefixed archs
    
    Define the __initramfs_size variable using VMLINUX_SYMBOL() to take care
    of symbol-prefixed architectures, for example, blackfin.
    
    Signed-off-by: Hendrik Brueckner <brueckner at linux.vnet.ibm.com>
    Cc: Mike Frysinger <vapier.adi at gmail.com>
    Cc: Hendrik Brueckner <brueckner at linux.vnet.ibm.com>,
    Cc: Michal Marek <mmarek at suse.cz>
    Cc: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    [mmarek: leave out Makefile change, since d63f6d1 already takes care of the
     SYMBOL_PREFIX define]
    Signed-off-by: Michal Marek <mmarek at suse.cz>

commit 2062ea522bb58bb2aeee86d051b37136491ccd65
Author: Dimitris Papastamos <dp at opensource.wolfsonmicro.com>
Date:   Wed Dec 1 09:38:55 2010 +0000

    ASoC: WM8731: Fix incorrect mask for bypass path disable
    
    According to the datasheet the bypass path enable/disable is
    bit 3 therefore we need 0x8 and not 0x4.
    
    Signed-off-by: Dimitris Papastamos <dp at opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 16cdd4336fdca9b50f991b591005b5f6416f82c4
Author: Daniel Drake <dsd at laptop.org>
Date:   Tue Nov 30 20:34:52 2010 +0000

    lxfb: Maintain video processor palette through suspend/resume
    
    The Geode X driver uses both of the LX's palettes, one for gamma
    correction and one for colormaps.
    
    The kernel driver currently only backs up the one used for colormaps
    during suspend/resume. If you mess with gamma settings and do a
    suspend/resume, colors go funny.
    
    Fix this by backing up the video proc palette during suspend/resume,
    alongside the display controller one which is already handled.
    
    Signed-off-by: Daniel Drake <dsd at laptop.org>
    Acked-by: Andres Salomon <dilinger at queued.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 93c176f39fedaeff854ccb7681d626d65bdffe52
Author: Caglar Akyuz <caglar at bilkon-kontrol.com.tr>
Date:   Tue Nov 30 20:04:14 2010 +0000

    video: da8xx: Register IRQ as last thing in driver probing.
    
    Following commit exposed a bug in driver:
    
    	"fbdev: da8xx/omap-l1xx: implement double buffering"
    
    Bug is, if interrupt handler is called before initialization is
    finished, raster controller is enabled and following register
    modifications causes hardware to stay in a broken state.
    
    By looking at this one may say that proper locking is missing in
    this driver, and a more proper fix should be prepared. However,
    aformentioned commit causes a regression in the driver and some
    fix to current one should be applied first.
    
    Signed-off-by: Caglar Akyuz <caglar at bilkon-kontrol.com.tr>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 8d7bfb4a891d606d52e1a99cf7231b4417b935dc
Author: Sebastian Ott <sebott at linux.vnet.ibm.com>
Date:   Wed Dec 1 10:08:02 2010 +0100

    [S390] css: fix rsid evaluation for 2nd crw
    
    Use correct bit positions of rsid field.
    
    Signed-off-by: Sebastian Ott <sebott at linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 398812159e328478ae49b4bd01f0d71efea96c39
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Dec 1 10:08:01 2010 +0100

    [S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus
    
    This fixes the same problem as described in the patch "nohz: fix
    printk_needs_cpu() return value on offline cpus" for the arch_needs_cpu()
    primitive:
    
    arch_needs_cpu() may return 1 if called on offline cpus. When a cpu gets
    offlined it schedules the idle process which, before killing its own cpu,
    will call tick_nohz_stop_sched_tick().
    That function in turn will call arch_needs_cpu() in order to check if the
    local tick can be disabled. On offline cpus this function should naturally
    return 0 since regardless if the tick gets disabled or not the cpu will be
    dead short after. That is besides the fact that __cpu_disable() should already
    have made sure that no interrupts on the offlined cpu will be delivered anyway.
    
    In this case it prevents tick_nohz_stop_sched_tick() to call
    select_nohz_load_balancer(). No idea if that really is a problem. However what
    made me debug this is that on 2.6.32 the function get_nohz_load_balancer() is
    used within __mod_timer() to select a cpu on which a timer gets enqueued.
    If arch_needs_cpu() returns 1 then the nohz_load_balancer cpu doesn't get
    updated when a cpu gets offlined. It may contain the cpu number of an offline
    cpu. In turn timers get enqueued on an offline cpu and not very surprisingly
    they never expire and cause system hangs.
    
    This has been observed 2.6.32 kernels. On current kernels __mod_timer() uses
    get_nohz_timer_target() which doesn't have that problem. However there might
    be other problems because of the too early exit tick_nohz_stop_sched_tick()
    in case a cpu goes offline.
    
    This specific bug was indrocuded with 3c5d92a0 "nohz: Introduce
    arch_needs_cpu".
    
    In this case a cpu hotplug notifier is used to fix the issue in order to keep
    the normal/fast path small. All we need to do is to clear the condition that
    makes arch_needs_cpu() return 1 since it is just a performance improvement
    which is supposed to keep the local tick running for a short period if a cpu
    goes idle. Nothing special needs to be done except for clearing the condition.
    
    Cc: stable at kernel.org
    Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 3bfa321e662edf90fb8123a02c987c2965fa50bb
Author: Yan Li <yan.i.li at intel.com>
Date:   Tue Nov 30 23:51:03 2010 -0800

    Input: synaptics - fix handling of 2-button ClickPads
    
    Lenovo S10-3t's ClickPad is a 2-button ClickPad that reports BTN_LEFT
    and BTN_RIGHT as normal touchpad, unlike the 1-button ClickPad used in
    HP mini 210 that reports solely BTN_MIDDLE.
    
    In 0xc0-cap response, the 1-button ClickPad has the 20-bit set while
    2-button ClickPad has the 8-bit set.
    
    This patch makes the kernel only handle 1-button ClickPad specially,
    and treat 2-button ClickPad in the same fashion as regular touchpads.
    
    This fixes kernel bug #18122 and MeeGo bug #4807.
    
    Signed-off-by: Yan Li <yan.i.li at intel.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit a318e6b1a04c9d8882712508eb9c8a061796c06b
Author: David Foley <favux.is at gmail.com>
Date:   Tue Nov 30 23:45:46 2010 -0800

    Input: wacom - add IDs for two new Bamboo PTs
    
    Add two new Bamboo Pen & Touch models:
    
    Bamboo Comic Medium			(CTH661/S1; Product ID = 0xd8)
    Bamboo P & T Special Edition Small	(CTH461/L;  Product ID = 0xdA)
    
    Tested-by: IRIE Shinsuke <irieshinsuke at yahoo.co.jp>
    Tested-by: Andrea Cadeddu <mrernia at gmail.com>
    Signed-off-by: David Foley <favux.is at gmail.com>
    Reviewed-by: Ping Cheng <pingc at wacom.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 25c9170ed64a6551beefe9315882f754e14486f4
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date:   Tue Nov 30 17:36:08 2010 +0900

    genirq: Fix incorrect proc spurious output
    
    Since commit a1afb637(switch /proc/irq/*/spurious to seq_file) all
    /proc/irq/XX/spurious files show the information of irq 0.
    
    Current irq_spurious_proc_open() passes on NULL as the 3rd argument,
    which is used as an IRQ number in irq_spurious_proc_show(), to the
    single_open(). Because of this, all the /proc/irq/XX/spurious file
    shows IRQ 0 information regardless of the IRQ number.
    
    To fix the problem, irq_spurious_proc_open() must pass on the
    appropreate data (IRQ number) to single_open().
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
    Reviewed-by: Yong Zhang <yong.zhang0 at gmail.com>
    LKML-Reference: <4CF4B778.90604 at jp.fujitsu.com>
    Cc: stable at kernel.org [2.6.33+]
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit fa3c9f3de2504bb09f8ad512f89837751a3eb741
Merge: 193006f7e3b1abd42d7a3677b54fa2996461a842 55661fc1f105ed75852e937bf8ea408270eb0cca
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Wed Dec 1 16:39:08 2010 +0900

    Merge branch 'sh/cachetlb' into sh-fixes-for-linus

commit 86b17f76f462db460d6d916e105a4c44cb353e36
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date:   Mon Nov 29 23:33:04 2010 -0800

    Input: document struct input_absinfo
    
    Add documentation for struct input_absinfo that is used in EVIOCGABS
    and EVIOCSABS ioctl and specify units of measure used for reporting
    resolution for an axis.
    
    Acked-by: Henrik Rydberg <rydberg at euromail.se>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 0417596f66dd6621f4fd46563c7c56a95311dbe8
Author: Bastien Nocera <hadess at hadess.net>
Date:   Mon Nov 29 23:33:05 2010 -0800

    Input: add keycodes for touchpad on/off keys
    
    Some laptops will have a "touchpad toggle" soft button, which expects
    user-space to turn off the touchpad themselves, some other devices will
    do this in hardware, but send key events telling us that the touchpad
    has been turned off/on.
    
    KEY_TOUCHPAD_ON/KEY_TOUCHPAD_OFF will be used by user-space to show a
    popup with the status of the touchpad.
    
    Signed-off-by: Bastien Nocera <hadess at hadess.net>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 55661fc1f105ed75852e937bf8ea408270eb0cca
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Wed Dec 1 15:39:51 2010 +0900

    sh: Assume new page cache pages have dirty dcache lines.
    
    This follows the ARM change c01778001a4f5ad9c62d882776235f3f31922fdd
    ("ARM: 6379/1: Assume new page cache pages have dirty D-cache") for the
    same rationale:
    
        There are places in Linux where writes to newly allocated page
        cache pages happen without a subsequent call to flush_dcache_page()
        (several PIO drivers including USB HCD). This patch changes the
        meaning of PG_arch_1 to be PG_dcache_clean and always flush the
        D-cache for a newly mapped page in update_mmu_cache().
    
    This addresses issues seen with executing binaries from MMC, in
    addition to some of the other HCDs that don't explicitly do cache
    management for their pipe-in buffers.
    
    Requested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 595a251c0740785fd3c0d2156d78578c7479811e
Author: David S. Miller <davem at davemloft.net>
Date:   Tue Nov 30 20:15:58 2010 -0800

    sparc: Write to prom console using indirect buffer.
    
    sparc64 systems have a restriction in that passing in buffer
    addressses above 4GB to prom calls is not reliable.
    
    We end up violating this when we do prom console writes, because we
    use an on-stack buffer to translate '\n' into '\r\n'.
    
    So instead, do this translation into an intermediate buffer, which is
    in the kernel image and thus below 4GB, then pass that to the PROM
    console write calls.
    
    On the 32-bit side we don't have to deal with any of these issues, so
    the new prom_console_write_buf() uses the existing prom_nbputchar()
    implementation.  However we can now mark those routines static.
    
    Since the 64-bit side completely uses new code we can delete the
    putchar bits as they are now completely unused.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit fb82155d5c401a5cf2bc2f555cb807f0bed035bb
Merge: 22a5b566c8c442b0b35b3b106795e2f2b3578096 3074adc8b6d9bf28b574a58241b958057a69a7a0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Nov 30 20:13:35 2010 -0800

    Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: add workaround for dce3 ddc line vbios bug
      drm/radeon/kms: fix interlaced and doublescan handling
      drm/radeon/kms: fix typos in disabled vbios code
      Revert "drm/i915/dp: use VBT provided eDP params if available"
      drm/i915: Clear pfit registers when not used by any outputs
      drm: record monitor status in output_poll_execute
      drm: Set connector DPMS status to ON in drm_crtc_helper_set_config
      drm/i915: fix regression due to ba3d8d749b01548b9
      Revert "drm/radeon/kms: fix typo in r600 cs checker"
      drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
      MAINTAINERS: INTEL DRM DRIVERS list (intel-gfx) is subscribers-only
      drm/i915/sdvo: Always fallback to querying the shared DDC line
      drm/i915: Handle pagefaults in execbuffer user relocations
      drm/i915/sdvo: Only enable HDMI encodings only if the commandset is supported
      drm/radeon/kms: fix resume regression for some r5xx laptops
      drm/radeon/kms: fix regression in rs4xx i2c setup
      drm/i915: Only save/restore cursor regs if !KMS
      drm/i915: Prevent integer overflow when validating the execbuffer

commit 3074adc8b6d9bf28b574a58241b958057a69a7a0
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 30 00:15:10 2010 -0500

    drm/radeon/kms: add workaround for dce3 ddc line vbios bug
    
    fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=23752
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc:stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit c49948f4bd39e27dd06a1cdb0c3743ca2a734f5e
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 30 15:46:47 2010 -0500

    drm/radeon/kms: fix interlaced and doublescan handling
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 0ec80d645661dda50acd417bdfcb33df2e5dd31e
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 30 19:11:45 2010 -0500

    drm/radeon/kms: fix typos in disabled vbios code
    
    6xx/7xx was hitting the wrong BUS_CNTL reg and bits.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 150f8815bbd15c1a91f74033c048fadcd5f3c715
Merge: c5027dec02c96964847fa68d512318ee5f6f7a19 3cf2efb1a7c68d55d60dcb2ed9609e1a2fc25952
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 1 12:10:34 2010 +1000

    Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
    
    * 'intel/drm-intel-fixes' of /ssd/git/drm-next:
      Revert "drm/i915/dp: use VBT provided eDP params if available"
      drm/i915: Clear pfit registers when not used by any outputs
      drm/i915: fix regression due to ba3d8d749b01548b9

commit 22a5b566c8c442b0b35b3b106795e2f2b3578096
Merge: 114279be2120a916e8a04feeb2ac976a10016f2f 3b24f0950bc55ca604a9f0da3ca894f9315cb573
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Nov 30 17:57:57 2010 -0800

    Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91
    
    * 'for_linus' of git://github.com/at91linux/linux-2.6-at91:
      at91/board-yl-9200: fix typo in video support
      atmel_spi: fix warning In function 'atmel_spi_dma_map_xfer'
      at91/picotux200: remove commenting usb device and dataflash support
      at91: rename rm9200ek and rm9200dk board file name
      at91rm9200ek: fix warning: 'ek_mmc_data' defined but not used
      at91rm9200dk: fix warning: 'dk_mmc_data' defined but not used
      at91: Convert remaining boards to new-style UART initialization
      at91: merge all at91rm9200 defconfig in one single file

commit 114279be2120a916e8a04feeb2ac976a10016f2f
Author: Oleg Nesterov <oleg at redhat.com>
Date:   Tue Nov 30 20:56:02 2010 +0100

    exec: copy-and-paste the fixes into compat_do_execve() paths
    
    Note: this patch targets 2.6.37 and tries to be as simple as possible.
    That is why it adds more copy-and-paste horror into fs/compat.c and
    uglifies fs/exec.c, this will be cleanuped later.
    
    compat_copy_strings() plays with bprm->vma/mm directly and thus has
    two problems: it lacks the RLIMIT_STACK check and argv/envp memory
    is not visible to oom killer.
    
    Export acct_arg_size() and get_arg_page(), change compat_copy_strings()
    to use get_arg_page(), change compat_do_execve() to do acct_arg_size(0)
    as do_execve() does.
    
    Add the fatal_signal_pending/cond_resched checks into compat_count() and
    compat_copy_strings(), this matches the code in fs/exec.c and certainly
    makes sense.
    
    Signed-off-by: Oleg Nesterov <oleg at redhat.com>
    Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Cc: stable at kernel.org
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3c77f845722158206a7209c45ccddc264d19319c
Author: Oleg Nesterov <oleg at redhat.com>
Date:   Tue Nov 30 20:55:34 2010 +0100

    exec: make argv/envp memory visible to oom-killer
    
    Brad Spengler published a local memory-allocation DoS that
    evades the OOM-killer (though not the virtual memory RLIMIT):
    http://www.grsecurity.net/~spender/64bit_dos.c
    
    execve()->copy_strings() can allocate a lot of memory, but
    this is not visible to oom-killer, nobody can see the nascent
    bprm->mm and take it into account.
    
    With this patch get_arg_page() increments current's MM_ANONPAGES
    counter every time we allocate the new page for argv/envp. When
    do_execve() succeds or fails, we change this counter back.
    
    Technically this is not 100% correct, we can't know if the new
    page is swapped out and turn MM_ANONPAGES into MM_SWAPENTS, but
    I don't think this really matters and everything becomes correct
    once exec changes ->mm or fails.
    
    Reported-by: Brad Spengler <spender at grsecurity.net>
    Reviewed-and-discussed-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Signed-off-by: Oleg Nesterov <oleg at redhat.com>
    Cc: stable at kernel.org
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a5880a9e5bb40fbae55de60051d69a29091053c3
Author: Feng Tang <feng.tang at intel.com>
Date:   Fri Nov 19 11:01:48 2010 +0800

    serial: mfd: adjust the baud rate setting
    
    Previous baud rate setting code only has been tested with 3.5M/9600/
    115200/230400/460800 bps, and recently we got a 3M bps device to test,
    which needs to modify current MUL register setting, and with this
    patch 2.5M/2M/1.5M/1M/0.5M should also work as they just use a MUL
    value scale down from 3M's.
    
    Also got some reference register setting from silicon guys for
    different baud rates, which tries to keep the pre-scalar register value
    to 16.
    
    Signed-off-by: Feng Tang <feng.tang at intel.com>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit b7a5100bc29c2cc252bf6f1e247ae14fd733fbb8
Merge: 8244272341f00cab845cabc445dbd3665fc01f87 07a8cdd2bb17a4da68136d963b8bc71959bd31a5
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Tue Nov 30 15:52:04 2010 -0800

    Merge branch 'for-greg' of git://gitorious.org/usb/usb into work

commit 8244272341f00cab845cabc445dbd3665fc01f87
Merge: abf03184a31a3286fc0ab30f838ddee8ba9f9b7b 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Tue Nov 30 15:38:41 2010 -0800

    Merge branch 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into work

commit 12c7a35ee6a1c605e740733f2cbd5b5079f09f0f
Author: David S. Miller <davem at davemloft.net>
Date:   Tue Nov 30 14:53:05 2010 -0800

    sparc: Delete prom_*getchar().
    
    Completely unused.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e62cac1fd035b4cde707285008499dbe71955a86
Author: David S. Miller <davem at davemloft.net>
Date:   Tue Nov 30 14:33:29 2010 -0800

    sparc: Pass buffer pointer all the way down to prom_{get,put}char().
    
    This gets us closer to being able to eliminate the use
    of dynamic and stack based buffers, so that we can adhere
    to the "no buffer addresses above 4GB" rule for PROM calls.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ba03864872691c0bb580a7fb47388da337ef4aa2
Author: Jeff Layton <jlayton at redhat.com>
Date:   Tue Nov 30 15:14:48 2010 -0500

    cifs: fix parsing of hostname in dfs referrals
    
    The DFS referral parsing code does a memchr() call to find the '\\'
    delimiter that separates the hostname in the referral UNC from the
    sharename. It then uses that value to set the length of the hostname via
    pointer subtraction.  Instead of subtracting the start of the hostname
    however, it subtracts the start of the UNC, which causes the code to
    pass in a hostname length that is 2 bytes too long.
    
    Regression introduced in commit 1a4240f4.
    
    Reported-and-Tested-by: Robbert Kouprie <robbert at exx.nl>
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Cc: Wang Lei <wang840925 at gmail.com>
    Cc: David Howells <dhowells at redhat.com>
    Cc: stable at kernel.org
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit 916448e77f6bcaaa7f13c3de0c3851783ae2bfd0
Author: Senthil Balasubramanian <senthilkumar at atheros.com>
Date:   Tue Nov 30 20:15:39 2010 +0530

    ath9k: Fix STA disconnect issue due to received MIC failed bcast frames
    
    AR_RxKeyIdxValid will not be set for bcast/mcast frames and so relying
    this status for MIC failed frames is buggy.
    
    Due to this, MIC failure events for broadcast frames are not sent to
    supplicant resulted in AP disconnecting the STA.
    
    Able to pass Wifi Test case 5.2.18 with this fix.
    
    Cc: Stable <stable at kernel.org> (2.6.36+)
    Signed-off-by: Senthil Balasubramanian <senthilkumar at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 8e26d5ad2f9c038609d42eebc676cd1107709eef
Author: Senthil Balasubramanian <senthilkumar at atheros.com>
Date:   Tue Nov 30 20:15:38 2010 +0530

    mac80211: Fix STA disconnect due to MIC failure
    
    Th commit titled "mac80211: clean up rx handling wrt. found_sta"
    removed found_sta variable which caused a MIC failure event
    to be reported twice for a single failure to supplicant resulted
    in STA disconnect.
    
    This should fix WPA specific countermeasures WiFi test case (5.2.17)
    issues with mac80211 based drivers which report MIC failure events in
    rx status.
    
    Cc: Stable <stable at kernel.org> (2.6.37)
    Signed-off-by: Senthil Balasubramanian <senthilkumar at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit abf03184a31a3286fc0ab30f838ddee8ba9f9b7b
Author: Alan Stern <stern at rowland.harvard.edu>
Date:   Mon Nov 29 10:17:22 2010 -0500

    USB: fix autosuspend bug in usb-serial
    
    This patch (as1437) fixes a bug in the usb-serial autosuspend
    handling.  Since the usb-serial core now has autosuspend support, it
    must set the .supports_autosuspend member in every serial driver it
    registers.  Otherwise the usb_autopm_get_interface() call won't work.
    
    This fixes Bugzilla #23012.
    
    Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
    CC: stable at kernel.org
    Reported-by: Kevin Smith <thirdwiggin at gmail.com>
    Reported-and-tested-by: Simon Gerber <gesimu at gmail.com>
    Reported-and-tested-by: Matteo Croce <matteo at openwrt.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit a85b4e7f4481c5a1ca89fa63c9c871151965075e
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Sun Nov 21 21:15:52 2010 -0800

    USB: ehci: disable LPM and PPCD for nVidia MCP89 chips
    
    Tested on MacBookAir3,1.  Without this, we get EPROTO errors when
    fetching device config descriptors.
    
    Signed-off-by: Brian Tarricone <brian at tarricone.org>
    Reported-by: Benoit Gschwind <gschwind at gnu-log.net>
    Tested-by: Edgar Hucek <gimli at dark-green.com>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 6fdbad8021151a9e93af8159a6232c8f26415c09
Author: Jacques Viviers <jacques.viviers at gmail.com>
Date:   Wed Nov 24 11:56:38 2010 +0200

    USB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added
    
    Add the PID for the Vardaan Enterprises VEUSB422R3 USB to RS422/485
    converter. It uses the same chip as the FTDI_8U232AM_PID 0x6001.
    
    This should also work with the stable branches for:
    2.6.31, 2.6.32, 2.6.33, 2.6.34, 2.6.35, 2.6.36
    
    Signed-off-by: Jacques Viviers <jacques.viviers at gmail.com>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 27f485b5b27926878ffc8f528bdefeb25e6bd3d3
Author: Tomoki Sekiyama <tomoki.sekiyama at gmail.com>
Date:   Mon Nov 22 19:29:23 2010 +0900

    USB: yurex: add .llseek fop to file_operations
    
    Default llseek operation behavior was changed by the patch named
    "vfs: make no_llseek the default" after the yurex driver had been merged,
    so the llseek to yurex is now ignored.
    
    This patch add llseek fop with default_llseek to yurex driver
    to catch up to the change.
    
    Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama at gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 28942bb6a9dd4e2ed793675e515cfb8297ed355b
Author: Michael Stuermer <ms at mallorn.de>
Date:   Thu Nov 18 00:45:43 2010 +0100

    USB: ftdi_sio: Add ID for RT Systems USB-29B radio cable
    
    Another variant of the RT Systems programming cable for ham radios.
    
    Signed-off-by: Michael Stuermer <ms at mallorn.de>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 2c31333a8fde7e26936a9f5371d02ff12c490993
Author: Christian Lamparter <chunkeey at googlemail.com>
Date:   Mon Nov 29 20:53:23 2010 +0100

    mac80211: ignore non-bcast mcast deauth/disassoc franes
    
    This patch fixes an curious issue due to insufficient
    rx frame filtering.
    
    Saqeb Akhter reported frequent disconnects while streaming
    videos over samba: <http://marc.info/?m=128600031109136>
    > [ 1166.512087] wlan1: deauthenticated from 30:46:9a:10:49:f7 (Reason: 7)
    > [ 1526.059997] wlan1: deauthenticated from 30:46:9a:10:49:f7 (Reason: 7)
    > [ 2125.324356] wlan1: deauthenticated from 30:46:9a:10:49:f7 (Reason: 7)
    > [...]
    
    The reason is that the device generates frames with slightly
    bogus SA/TA addresses.
    
    e.g.:
     [ 2314.402316] Ignore 9f:1f:31:f8:64:ff
     [ 2314.402321] Ignore 9f:1f:31:f8:64:ff
     [ 2352.453804] Ignore 0d:1f:31:f8:64:ff
     [ 2352.453808] Ignore 0d:1f:31:f8:64:ff
     					   ^^ the group-address flag is set!
     (the correct SA/TA would be: 00:1f:31:f8:64:ff)
    
    Since the AP does not know from where the frames come, it
    generates a DEAUTH response for the (invalid) mcast address.
    This mcast deauth frame then passes through all filters and
    tricks the stack into thinking that the AP brutally kicked
    us!
    
    This patch fixes the problem by simply ignoring
    non-broadcast, group-addressed deauth/disassoc frames.
    
    Cc: Jouni Malinen <j at w1.fi>
    Cc: Johannes Berg <johannes at sipsolutions.net>
    Reported-by: Saqeb Akhter <saqeb.akhter at gmail.com>
    Signed-off-by: Christian Lamparter <chunkeey at googlemail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit cf63495d0dbe435b475a44672f5dee150da6471b
Author: David Kilroy <kilroyd at gmail.com>
Date:   Wed Nov 24 20:33:02 2010 +0000

    orinoco: abort scan on interface down
    
    This fixes the problem causing the following trace:
    
    ------------[ cut here ]------------
    WARNING: at linux-2.6.34/net/wireless/core.c:633 wdev_cleanup_work+0xb7/0xe0 [cfg80211]()
    Hardware name: Latitude C840
    Pid: 707, comm: cfg80211 Not tainted 2.6.34.7-0.5-desktop #1
    Call Trace:
     [<c02065c3>] try_stack_unwind+0x173/0x190
     [<c02051cf>] dump_trace+0x3f/0xe0
     [<c020662b>] show_trace_log_lvl+0x4b/0x60
     [<c0206658>] show_trace+0x18/0x20
     [<c064e0b3>] dump_stack+0x6d/0x72
     [<c02443ae>] warn_slowpath_common+0x6e/0xb0
     [<c0244403>] warn_slowpath_null+0x13/0x20
     [<e2db5497>] wdev_cleanup_work+0xb7/0xe0 [cfg80211]
     [<c025cfa9>] run_workqueue+0x79/0x170
     [<c025d123>] worker_thread+0x83/0xe0
     [<c025fef4>] kthread+0x74/0x80
     [<c0203826>] kernel_thread_helper+0x6/0x10
    ---[ end trace 3f0348b3b0c6f4ff ]---
    
    Reported by: Giacomo Comes <comes at naic.edu>
    Signed-off-by: David Kilroy <kilroyd at googlemail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 37a09f07459753e7c98d4e21f1c61e8756923f81
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Tue Nov 30 12:42:34 2010 -0500

    NFS: Fix a readdirplus bug
    
    When comparing filehandles in the helper nfs_same_file(), we should not be
    using 'strncmp()': filehandles are not null terminated strings.
    
    Instead, we should just use the existing helper nfs_compare_fh().
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 60e677373be9c0bf7c9a22937601d5a40e51c042
Author: Franck Bui-Huu <fbuihuu at gmail.com>
Date:   Tue Nov 30 12:50:14 2010 +0100

    perf header: Don't assume there's no attr info if no sample ids is provided
    
    This primarily fixes perf-report, which didn't report the correct type
    of event if perf-record was called to record one event different from
    'cycles':
    
      $ perf record -e instructions true
        [ perf record: Woken up 1 times to write data ]
        [ perf record: Captured and wrote 0.007 MB perf.data (~295 samples) ]
    
      $ perf report | head -n1
        # Events: 7  cycles
    
    LPU-Reference: <m3mxor6nex.fsf at gmail.com>
    Signed-off-by: Franck Bui-Huu <fbuihuu at gmail.com>

commit d214afbd81405d4da2c5745fe867e6b313fd4178
Author: Ming Lei <tom.leiming at gmail.com>
Date:   Thu Nov 25 19:27:25 2010 +0800

    perf symbols: Figure out start address of kernel map from kallsyms
    
    On ARM, module symbol start address is ahead of kernel symbol start address, so
    we can't suppose that the start address of kernel map always is zero, otherwise
    may cause incorrect .start and .end of kernel map (caused by fixup) when there
    are modules loaded, then map_groups__find may return incorrect map for symbol
    query.
    
    This patch always figures out the start address of kernel map from
    /proc/kallsyms if the file is available, so fix the issues on ARM for module
    loaded case.
    
    This patch fixes the following issues on ARM when modules are loaded:
    
    	- vmlinux symbol can't be found by kallsyms maps doing 'perf test'
    	- module symbols are parsed mistakenlly when doing 'perf top'/'perf report'
    
    Cc: Ian Munsie <imunsie at au1.ibm.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Tom Zanussi <tzanussi at gmail.com>
    LKML-Reference: <20101125192725.62d31b42 at tom-lei>
    Signed-off-by: Ming Lei <tom.leiming at gmail.com>
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>

commit 8a9533123f43f2cdb3eb601c17ff2ad336882eff
Author: Arnaldo Carvalho de Melo <acme at redhat.com>
Date:   Mon Nov 29 12:44:15 2010 -0200

    perf symbols: Fix kallsyms kernel/module map splitting
    
    On ARM, module addresss space is ahead of kernel space, so the module
    symbols are handled before kernel symbol in dso__split_kallsyms, then
    was causing one map to be created for each kernel symbol.
    
    Reported-by: Ming Lei <tom.leiming at gmail.com>
    Tested-by: Ming Lei <tom.leiming at gmail.com>
    Cc: Frederic Weisbecker <fweisbec at gmail.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Mike Galbraith <efault at gmx.de>
    Cc: Ming Lei <tom.leiming at gmail.com>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Peter Zijlstra <peterz at infradead.org>
    Cc: Stephane Eranian <eranian at google.com>
    Cc: Tom Zanussi <tzanussi at gmail.com>
    LKML-Reference: <20101124144540.GB15875 at ghostprotocols.net>
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>

commit 3b24f0950bc55ca604a9f0da3ca894f9315cb573
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Date:   Sun Nov 21 11:24:07 2010 +0800

    at91/board-yl-9200: fix typo in video support
    
    for the epson frambuffer support it's CONFIG_FB_S1D13XXX
    not CONFIG_FB_S1D135XX
    
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
    Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>

commit 214b574ab81236e7740243985d63a1d6a61231a2
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Date:   Sat Nov 20 14:52:53 2010 +0800

    atmel_spi: fix warning In function 'atmel_spi_dma_map_xfer'
    
    passing argument 2 of 'dma_map_single' discards qualifiers from pointer target type
    
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
    Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>

commit 82d5b5c8da769184a9bc2cc2adc90555f4aa90b0
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Date:   Sun Nov 21 10:31:19 2010 +0800

    at91/picotux200: remove commenting usb device and dataflash support
    
    as based on http://www.picotux.com/pt200/picotux200.pdf
    these board does not have such I/O
    
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
    Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>

commit 985f554d8f0c2cf5bda5720921cb48654420d6b1
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Date:   Fri Nov 19 22:34:38 2010 +0800

    at91: rename rm9200ek and rm9200dk board file name
    
    to be a few more concistant with the other boards
    
    as ek is for evaluation kit and dk for development kit
    
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
    Signed-off-by: Andrew Victor <linux at maxim.org.za>

commit 55d83b0a6eb61d159a4a6d269745ee019f9f5f91
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Date:   Fri Nov 19 22:31:35 2010 +0800

    at91rm9200ek: fix warning: 'ek_mmc_data' defined but not used
    
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
    Signed-off-by: Andrew Victor <linux at maxim.org.za>

commit 8e79d2d4e7147eb6dfd075d7cb200c666566a9e0
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Date:   Fri Nov 19 22:31:03 2010 +0800

    at91rm9200dk: fix warning: 'dk_mmc_data' defined but not used
    
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
    Signed-off-by: Andrew Victor <linux at maxim.org.za>

commit 8ae8cd978bc773e916e0b51a76fe3f096fa31069
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Date:   Fri Nov 19 22:23:28 2010 +0800

    at91: Convert remaining boards to new-style UART initialization
    
    Convert the following AT91RM9200-based boards to the new-style UART
    initialization:
      - Ajeco 1ARM Single Board Computer
      - Sperry-Sun KAFA board
      - picotux 200
    
    Remove the deprecated at91_init_serial
    
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
    Signed-off-by: Andrew Victor <linux at maxim.org.za>

commit 7572777eef78ebdee1ecb7c258c0ef94d35bad16
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Tue Nov 30 16:39:27 2010 +0100

    fuse: verify ioctl retries
    
    Verify that the total length of the iovec returned in FUSE_IOCTL_RETRY
    doesn't overflow iov_length().
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    CC: Tejun Heo <tj at kernel.org>
    CC: <stable at kernel.org>         [2.6.31+]

commit d9d318d39dd5cb686660504a3565aac453709ccc
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Tue Nov 30 16:39:27 2010 +0100

    fuse: fix ioctl when server is 32bit
    
    If a 32bit CUSE server is run on 64bit this results in EIO being
    returned to the caller.
    
    The reason is that FUSE_IOCTL_RETRY reply was defined to use 'struct
    iovec', which is different on 32bit and 64bit archs.
    
    Work around this by looking at the size of the reply to determine
    which struct was used.  This is only needed if CONFIG_COMPAT is
    defined.
    
    A more permanent fix for the interface will be to use the same struct
    on both 32bit and 64bit.
    
    Reported-by: "ccmail111" <ccmail111 at yahoo.com>
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    CC: Tejun Heo <tj at kernel.org>
    CC: <stable at kernel.org>         [2.6.31+]

commit 06c63f9396133f312c5a49c2285c2c8015e80934
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Thu Nov 18 15:02:26 2010 -0800

    regulator: fix kernel-doc for set_consumer_device_supply
    
    Fix kernel-doc warning for set_consumer_device_supply():
    
    Warning(drivers/regulator/core.c:912): missing initial short description on line:
     * set_consumer_device_supply: Bind a regulator to a symbolic supply
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Cc:	Liam Girdwood <lrg at slimlogic.co.uk>
    Cc:	Mark Brown <broonie at opensource.wolfsonmicro.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit f3c18a87f3ddcfd31b16f689d01eb6adcc99de74
Author: Bengt Jonsson <bengt.g.jonsson at stericsson.com>
Date:   Wed Nov 10 11:06:22 2010 +0100

    regulator: enable supply regulator only when use count is zero
    
    Supply regulators are disabled only when the last
    reference count is removed on the child regulator
    (the use count goes from 1 to 0). This patch changes
    the behaviour of enable so the supply regulator is
    enabled only when the use count of the child
    regulator goes from 0 to 1.
    
    Signed-off-by: Bengt Jonsson <bengt.g.jonsson at stericsson.com>
    Acked-by: Linus Walleij <linus.walleij at stericsson.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit b9e26bc804e611d879353cd953cb17db1c52d307
Author: Axel Lin <axel.lin at gmail.com>
Date:   Fri Oct 22 16:38:22 2010 +0800

    regulator: twl-regulator - fix twlreg_set_mode
    
    The Singular Message is 16 bits:
            DEV_GRP[15:13] MT[12]  RES_ID[11:4]  RES_STATE[3:0]
    
    Current implementation return immedially after sucessfuly write MSB part.
    To properly set mode, we need to write the complete message ( MSB and LSB ).
    
    In twl.h, now we have defines for PM Master module register offsets,
    use it instead of hard coded 0x15/0x16.
    
    Use "message & 0xff" to ensure we send correct value for LSB.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Tested-by: Lesly Arackal Manuel <leslyam at ti.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit 3aa713e76e8f562c0d28faf18873c4f1836b17c9
Author: Mattias Wallin <mattias.wallin at stericsson.com>
Date:   Thu Nov 4 11:01:31 2010 +0100

    regulator: lock supply in regulator enable
    
    This patch add locks around regulator supply enable.
    
    Signed-off-by: Mattias Wallin <mattias.wallin at stericsson.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit 7727da22e820a96ab394db2fc0ab58f7f7ecb323
Author: Axel Lin <axel.lin at gmail.com>
Date:   Fri Nov 5 15:27:17 2010 +0800

    regulator: Return proper error for regulator_register()
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit e36c1df8e18183ba2c691fe766a52c94020cdc5e
Author: Axel Lin <axel.lin at gmail.com>
Date:   Fri Nov 5 21:51:32 2010 +0800

    regulator: Ensure enough delay time for enabling regulator
    
    Integer division will truncate the result, this patch ensures we have
    enough delay time for enabling regulator.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit aa7a74040a989eeb7a9265550a2538863e842a93
Author: Axel Lin <axel.lin at gmail.com>
Date:   Fri Nov 5 15:25:12 2010 +0800

    regulator: Remove a redundant device_remove_file call in create_regulator
    
    We already have device_remove_file() in error path,
    no need to call it before goto link_name_err.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit 59c700cf20a6eefb68187df3468ffa0b11d5e9a4
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Wed Nov 3 00:08:04 2010 -0400

    regulator: Staticise mc13783_powermisc_rmw()
    
    It is not used outside this driver so no need to make the symbol global.
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Acked-by: Alberto Panizzo <maramaopercheseimorto at gmail.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit b12a1e29af595d05612153bcb85258193bbf9382
Author: Mattias Wallin <mattias.wallin at stericsson.com>
Date:   Tue Nov 2 14:55:34 2010 +0100

    regulator: regulator disable supply fix
    
    This patch fixes a disable failure when regulator supply is used.
    A while loop in regulator disable checks for supply pointer != NULL
    but the pointer is not always updated, resulting in the while loop
    running too many times causing a disable failure.
    
    Signed-off-by: Mattias Wallin <mattias.wallin at stericsson.com>
    Acked-by: Linus Walleij <linus.walleij at stericsson.com>
    Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit ed7c84d54837b182c5f56f821ef213c8ca817a91
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Nov 29 19:43:29 2010 +0100

    ARM: 6505/1: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selected
    
    Currently, the kprobes implementation for ARM only supports the ARM
    instruction set, so it only works if CONFIG_THUMB2_KERNEL is not
    enabled.
    
    Until kprobes is updated to work with Thumb-2, turning it on will
    cause horrible things to happen, so this patch disables it for now.
    
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Nicolas Pitre <nicolas.pitre at linaro.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 618d9c8f9e554b5eaaca3f8e55a28e1a928a8571
Author: Dave Martin <dave.martin at linaro.org>
Date:   Tue Nov 30 13:05:10 2010 +0100

    ARM: 6508/1: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
    
    Directives such as .long and .word do not magically cause the
    assembler location counter to become aligned in gas.  As a
    result, using these directives in code sections can result in
    misaligned data words when building a Thumb-2 kernel
    (CONFIG_THUMB2_KERNEL).
    
    This is a Bad Thing, since the ABI permits the compiler to
    assume that fundamental types of word size or above are word-
    aligned when accessing them from C.  If the data is not really
    word-aligned, this can cause impaired performance and stray
    alignment faults in some circumstances.
    
    In general, the following rules should be applied when using
    data word declaration directives inside code sections:
    
        * .quad and .double:
             .align 3
    
        * .long, .word, .single, .float:
             .align (or .align 2)
    
        * .short:
            No explicit alignment required, since Thumb-2
            instructions are always 2 or 4 bytes in size.
            immediately after an instruction.
    
    Reviewed-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 725ca4adaea07460accd4622d44bcc7eaa34da09
Author: Dave Martin <dave.martin at linaro.org>
Date:   Tue Nov 30 13:04:36 2010 +0100

    ARM: 6507/1: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
    
    Directives such as .long and .word do not magically cause the
    assembler location counter to become aligned in gas.  As a result,
    using these directives in code sections can result in misaligned data
    words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
    
    This is a Bad Thing, since the ABI permits the compiler to assume that
    fundamental types of word size or above are word- aligned when
    accessing them from C.  If the data is not really word-aligned, this
    can cause impaired performance and stray alignment faults in some
    circumstances.
    
    In general, the following rules should be applied when using data word
    declaration directives inside code sections:
    
        * .quad and .double:
             .align 3
    
        * .long, .word, .single, .float:
             .align (or .align 2)
    
        * .short:
            No explicit alignment required, since Thumb-2
            instructions are always 2 or 4 bytes in size.
            immediately after an instruction.
    
    Reviewed-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit a75e5248c51af1eaeed936be6bd3497b93f09685
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Nov 29 19:43:28 2010 +0100

    ARM: 6504/1: Thumb-2: Fix long-distance conditional branches in head.S for Thumb-2.
    
    The 32-bit conditional branches in Thumb-2 have a shorter range
    (+/-512K) than their ARM counterparts (+/-32MB).  The linker does
    not currently generate trampolines to extend the range of these
    Thumb-2 conditional branches, resulting in link errors when vmlinux
    is sufficiently large, e.g.:
    
    head.o:(.text+0x464): relocation truncated to fit: R_ARM_THM_JUMP19
    
    This patch forces the longer-range, unconditional branch encoding
    by use of an explicit IT instruction.  The resulting branches are
    triggered on the same conditions as before.
    
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 26e5ca93dda9425f8ff78ccb2f9b193328087e45
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Nov 29 19:43:27 2010 +0100

    ARM: 6503/1: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL
    
    The code which makes up the zImage header intends to leave a
    32-byte gap followed by a branch to the real entry point, a magic
    number, and a word containing the absolute entry point address.
    
    This gets messed up with with CONFIG_THUMB2_KERNEL, because the
    size of the initial padding NOPs changes.
    
    Instead, the header can be made fully compatible by restoring it to
    ARM.
    
    In the Thumb-2 case, we can replace the initial NOPs with a
    sequence which switches to Thumb and jumps to the real entry point.
    
    As a consequence, the zImage entry point is now always ARM, so no
    special magic is needed any more for the uImage rules in the
    Thumb-2 case.
    
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Acked-by: Nicolas Pitre <nicolas.pitre at linaro.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit bfa64c4ab1235b732542f11f4e0005e1774f779a
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Nov 29 19:43:26 2010 +0100

    ARM: 6502/1: Thumb-2: Fix CONFIG_THUMB2_KERNEL breakage in compressed/head.S
    
    Some instruction operand combinations are used here which are nor
    permitted in Thumb-2.
    
    In particular, most uses of pc as an operand are disallowed in
    Thumb-2, and deprecated in ARM from ARMv7 onwards.
    
    The modified code introduced by this patch should be compatible
    with all architecture versions >= v3, with or without
    CONFIG_THUMB2_KERNEL.
    
    Reviewed-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Acked-by: Nicolas Pitre <nicolas.pitre at linaro.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 6323875db20fd8ca8c8fbbd608bc377f2d4c8cf5
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Nov 29 19:43:25 2010 +0100

    ARM: 6501/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in mm/proc-v7.S
    
    Directives such as .long and .word do not magically cause the
    assembler location counter to become aligned in gas.  As a result,
    using these directives in code sections can result in misaligned
    data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
    
    This is a Bad Thing, since the ABI permits the compiler to assume
    that fundamental types of word size or above are word- aligned when
    accessing them from C.  If the data is not really word-aligned,
    this can cause impaired performance and stray alignment faults in
    some circumstances.
    
    In general, the following rules should be applied when using data
    word declaration directives inside code sections:
    
        * .quad and .double:
             .align 3
    
        * .long, .word, .single, .float:
             .align (or .align 2)
    
        * .short:
            No explicit alignment required, since Thumb-2
            instructions are always 2 or 4 bytes in size.
            immediately after an instruction.
    
    In this specific case, we can achieve the desired alignment by
    forcing a 32-bit branch instruction using the W() macro, since the
    assembler location counter is already 32-bit aligned in this case.
    
    Reviewed-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 4f79a5dd7c3e316e2230dc0ee665c40a39023a81
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Nov 29 19:43:24 2010 +0100

    ARM: 6500/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in kernel/head.S
    
    Directives such as .long and .word do not magically cause the
    assembler location counter to become aligned in gas.  As a result,
    using these directives in code sections can result in misaligned
    data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
    
    This is a Bad Thing, since the ABI permits the compiler to assume
    that fundamental types of word size or above are word- aligned when
    accessing them from C.  If the data is not really word-aligned,
    this can cause impaired performance and stray alignment faults in
    some circumstances.
    
    In general, the following rules should be applied when using data
    word declaration directives inside code sections:
    
        * .quad and .double:
             .align 3
    
        * .long, .word, .single, .float:
             .align (or .align 2)
    
        * .short:
            No explicit alignment required, since Thumb-2
            instructions are always 2 or 4 bytes in size.
            immediately after an instruction.
    
    Reviewed-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 077248fcce5edabb1b77ba3269e6c72341769d94
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Nov 29 19:43:23 2010 +0100

    ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S
    
    Directives such as .long and .word do not magically cause the
    assembler location counter to become aligned in gas.  As a result,
    using these directives in code sections can result in misaligned
    data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
    
    This is a Bad Thing, since the ABI permits the compiler to assume
    that fundamental types of word size or above are word- aligned when
    accessing them from C.  If the data is not really word-aligned,
    this can cause impaired performance and stray alignment faults in
    some circumstances.
    
    In general, the following rules should be applied when using data
    word declaration directives inside code sections:
    
        * .quad and .double:
             .align 3
    
        * .long, .word, .single, .float:
             .align (or .align 2)
    
        * .short:
            No explicit alignment required, since Thumb-2
            instructions are always 2 or 4 bytes in size.
            immediately after an instruction.
    
    Reviewed-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 7eb25ebee894ba2f8a591a83e45accc091ced19f
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Nov 29 19:43:22 2010 +0100

    ARM: 6498/1: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL
    
    Directives such as .long and .word do not magically cause the
    assembler location counter to become aligned in gas.  As a result,
    using these directives in code sections can result in misaligned
    data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
    
    This is a Bad Thing, since the ABI permits the compiler to assume
    that fundamental types of word size or above are word- aligned when
    accessing them from C.  If the data is not really word-aligned,
    this can cause impaired performance and stray alignment faults in
    some circumstances.
    
    In general, the following rules should be applied when using data
    word declaration directives inside code sections:
    
        * .quad and .double:
             .align 3
    
        * .long, .word, .single, .float:
             .align (or .align 2)
    
        * .short:
            No explicit alignment required, since Thumb-2
            instructions are always 2 or 4 bytes in size.
            immediately after an instruction.
    
    Reviewed-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit bc8b57f08c53344d13e3b5e644c56c0355899b47
Author: Dave Martin <dave.martin at linaro.org>
Date:   Mon Nov 29 19:43:21 2010 +0100

    ARM: 6497/1: kexec: Correct data alignment for CONFIG_THUMB2_KERNEL
    
    Directives such as .long and .word do not magically cause the
    assembler location counter to become aligned in gas.  As a result,
    using these directives in code sections can result in misaligned
    data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
    
    This is a Bad Thing, since the ABI permits the compiler to assume
    that fundamental types of word size or above are word- aligned when
    accessing them from C.  If the data is not really word-aligned,
    this can cause impaired performance and stray alignment faults in
    some circumstances.
    
    In general, the following rules should be applied when using data
    word declaration directives inside code sections:
    
        * .quad and .double:
             .align 3
    
        * .long, .word, .single, .float:
             .align (or .align 2)
    
        * .short:
            No explicit alignment required, since Thumb-2
            instructions are always 2 or 4 bytes in size.
            immediately after an instruction.
    
    Reviewed-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Dave Martin <dave.martin at linaro.org>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit e6afec9b6808eff6dc392ac07c1552e87aebcdf7
Author: Pawel Moll <pawel.moll at arm.com>
Date:   Fri Nov 26 13:45:43 2010 +0100

    ARM: 6496/1: GIC: Do not try to register more then NR_IRQS interrupts
    
    This change limits number of GIC-originating interrupts to the
    platform maximum (defined by NR_IRQS) while still initialising
    all distributor registers.
    
    Signed-off-by: Pawel Moll <pawel.moll at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 9f1ee150fc7039eb65039ab17d9a95dfa6250133
Author: Marek Vasut <marek.vasut at gmail.com>
Date:   Sat Nov 6 23:34:03 2010 +0100

    ARM: pxa/palm: fix ifdef around gen_nand driver registration
    
    Reported-by: Rafael Gandolfi <kaillasse91 at hotmail.fr>
    Signed-off-by: Marek Vasut <marek.vasut at gmail.com>
    Signed-off-by: Eric Miao <eric.y.miao at gmail.com>

commit f9d1bf755315a66353a7f42319cff471b36fffb3
Author: Marek Vasut <marek.vasut at gmail.com>
Date:   Sun Oct 10 00:34:28 2010 +0200

    ARM: pxa: fix pxa2xx-flash section mismatch
    
    Signed-off-by: Marek Vasut <marek.vasut at gmail.com>
    Acked-by: Haojian Zhuang <haojian.zhuang at gmail.com>
    Signed-off-by: Eric Miao <eric.y.miao at gmail.com>

commit 1db550118c46d96f371de5b3d0bd51edb148bd54
Author: Jason Chagas <jason.chagas at marvell.com>
Date:   Mon Nov 15 09:50:12 2010 +0800

    ARM: mmp2: remove not used clk_rtc
    
    RTC clock will remain at 32KHz and powered on, there is no need for it
    at this moment.
    
    Signed-off-by: Jason Chagas <jason.chagas at marvell.com>
    Signed-off-by: Eric Miao <eric.y.miao at gmail.com>

commit b76fb39d49f67a484a6adc8f041d9ad833f6860e
Author: Daniel Glöckner <daniel-gl at gmx.net>
Date:   Tue Nov 30 01:00:18 2010 +0100

    s6105-ipcam: fix compilation
    
    When the s6105-ipcam ASoC driver had been converted to the
    multi-component API, a single reference to a former structure
    element remained, blocking successful compilation.
    
    Signed-off-by: Daniel Glöckner <daniel-gl at gmx.net>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 9e4ea718d3c53f9f2a65ddddf95ffd7743be458e
Author: Daniel Glöckner <daniel-gl at gmx.net>
Date:   Tue Nov 30 01:00:17 2010 +0100

    s6000-pcm: fix compilation
    
    s6000_soc_platform has lost its forward declaration and there no
    longer is a name element in it, so use a string constant when
    calling request_irq.
    
    Signed-off-by: Daniel Glöckner <daniel-gl at gmx.net>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit b1d36b1c3573fd5adecbd313d30a8bdc8d7fbc5e
Author: Daniel Glöckner <daniel-gl at gmx.net>
Date:   Tue Nov 30 01:00:16 2010 +0100

    s6000-i2s: fix compilation
    
    A semicolon was missing.
    
    Signed-off-by: Daniel Glöckner <daniel-gl at gmx.net>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 3f1af9d26fb02a99a60a045b8ae93ccc6fe50b97
Author: Axel Lin <axel.lin at gmail.com>
Date:   Mon Nov 29 17:42:47 2010 +0800

    ASoC: Fix missing spin_unlock_irqrestore
    
    In nuc900_dma_hw_params(), if snd_pcm_lib_malloc_pages failed
    it returns without calling spin_unlock_irqrestore().
    
    Since snd_pcm_lib_malloc_pages() does not touch struct nuc900_audio,
    we don't need to hold the lock while calling snd_pcm_lib_malloc_pages().
    Fix it by moving spin_lock_irqsave() down to after snd_pcm_lib_malloc_pages().
    
    In nuc900_dma_prepare(), spin_unlock_irqrestore() is missing in the error path.
    Fix it by removing the return in default case.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Wan ZongShun <mcuos.com at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit b94ca0792d49f5856570ba66f53acd69cd0917fc
Author: Eric Benard <eric at eukrea.com>
Date:   Fri Oct 15 11:27:17 2010 +0200

    at91: merge all at91rm9200 defconfig in one single file
    
    About all options present in each file are activated
    in the single file.
    
    Signed-off-by: Eric Benard <eric at eukrea.com>
    Tested-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
    Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>

commit 3cf2efb1a7c68d55d60dcb2ed9609e1a2fc25952
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Nov 29 10:09:55 2010 +0000

    Revert "drm/i915/dp: use VBT provided eDP params if available"
    
    This reverts commit 869184a675662bddcdf76c5b95665272facff2b8.
    
    This is required for the Sony Vaio Jesse was working on at the time, but
    breaks most other eDP machines - machines that were working in earlier
    kernels.
    
    Reported-and-tested-by: Dave Airlie <airlied at redhat.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31188
    Tested-by: Zhao Jian <jian.j.zhao at intel.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit 4acf89fb3bbb01ba9de4a7cc102e46095a12c94e
Author: Yauhen Kharuzhy <jekhor at gmail.com>
Date:   Sun Nov 28 20:30:27 2010 +0200

    ARM: S3C2412: Fix typo in CONFIG_CPU_S3C2412_ONLY definition
    
    Dependency on (CPU_S3C2416 is not selected) was defined as "!CPU_2416",
    instead of "!CPU_S3C2416". Fix it.
    
    Signed-off-by: Yauhen Kharuzhy <jekhor at gmail.com>
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>

commit 71f608ef56c987c5325c3aaf9c3fadd4ddc77f64
Author: Yauhen Kharuzhy <yauhen.kharuzhy at promwad.com>
Date:   Sun Nov 28 20:30:23 2010 +0200

    ARM: S3C2443: Select properly ARM core type
    
    Select ARM920T core when compiling kernel for s3c2443.
    
    Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy at promwad.com>
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>

commit 4249f8acf993046948dc1f2e74244fe484c8cb8f
Author: Yauhen Kharuzhy <jekhor at gmail.com>
Date:   Sun Nov 28 20:30:19 2010 +0200

    ARM: SMDK2416: Select MACH_SMDK, S3C_DEV_NAND, S3C_DEV_USB_HOST
    
    Enable compilation of platform devices and initialization code used in
    SMDK2416 board file.
    
    Signed-off-by: Yauhen Kharuzhy <jekhor at gmail.com>
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>

commit 60686aa0086a14f8b15c83a09f3df1eebe3aab3c
Author: Takashi Iwai <tiwai at suse.de>
Date:   Tue Nov 30 08:14:21 2010 +0100

    ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation
    
    In OSS emulation, SNDCTL_DSP_RESET ioctl needs the reset of the internal
    buffer state in addition to drop of the running streams.  Otherwise the
    succeeding access becomes inconsistent.
    
    Tested-by: Amit Nagal <helloin.amit at gmail.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 476428f8c3bb6679f8f52bf2b935ac40bc9c7358
Author: Suresh Jayaraman <sjayaraman at suse.de>
Date:   Wed Nov 24 17:49:07 2010 +0530

    cifs: display fsc in /proc/mounts
    
    Reviewed-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Suresh Jayaraman <sjayaraman at suse.de>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit b81209de2455c6051cf67f2acd8ec26ccb8caf83
Author: Suresh Jayaraman <sjayaraman at suse.de>
Date:   Wed Nov 24 17:49:06 2010 +0530

    cifs: enable fscache iff fsc mount option is used explicitly
    
    Currently, if CONFIG_CIFS_FSCACHE is set, fscache is enabled on files opened
    as read-only irrespective of the 'fsc' mount option. Fix this by enabling
    fscache only if 'fsc' mount option is specified explicitly.
    
    Remove an extraneous cFYI debug message and fix a typo while at it.
    
    Reported-by: Jeff Layton <jlayton at redhat.com>
    Acked-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Suresh Jayaraman <sjayaraman at suse.de>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit 607a569da4cf289fd8eb3887080ed3b212e3112d
Author: Suresh Jayaraman <sjayaraman at suse.de>
Date:   Wed Nov 24 17:49:05 2010 +0530

    cifs: allow fsc mount option only if CONFIG_CIFS_FSCACHE is set
    
    Currently, it is possible to specify 'fsc' mount option even if
    CONFIG_CIFS_FSCACHE has not been set. The option is being ignored silently
    while the user fscache functionality to work. Fix this by raising error when
    the CONFIG option is not set.
    
    Reported-by: Jeff Layton <jlayton at redhat.com>
    Reviewed-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Suresh Jayaraman <sjayaraman at suse.de>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit fbeba8bb16d7c50362e28f3f91a79fb414903199
Author: Shirish Pargaonkar <shirishpargaonkar at gmail.com>
Date:   Sat Nov 27 11:37:54 2010 -0600

    cifs: Handle extended attribute name cifs_acl to generate cifs acl blob (try #4)
    
    Add extended attribute name system.cifs_acl
    
    Get/generate cifs/ntfs acl blob and hand over to the invoker however
    it wants to parse/process it under experimental configurable option CIFS_ACL.
    
    Do not get CIFS/NTFS ACL for xattr for attribute system.posix_acl_access
    
    Signed-off-by: Shirish Pargaonkar <shirishpargaonkar at gmail.com>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit 78415d2d306bfed0a0ac351aec6c69759d007224
Author: Shirish Pargaonkar <shirishpargaonkar at gmail.com>
Date:   Sat Nov 27 11:37:26 2010 -0600

    cifs: Misc. cleanup in cifsacl handling [try #4]
    
    Change the name of function mode_to_acl to mode_to_cifs_acl.
    
    Handle return code in functions mode_to_cifs_acl and
    cifs_acl_to_fattr.
    
    Signed-off-by: Shirish Pargaonkar <shirishpargaonkar at gmail.com>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit e8a7e48bb248a1196484d3f8afa53bded2b24e71
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Nov 29 20:42:04 2010 -0800

    Linux 2.6.37-rc4

commit 32e1572427bf964ebe038f61d9f0bf0452cbf0e8
Merge: bcb38ceb225f5d5b2198a2755277cd441ed1e82b f2e785ed5fb8e5fe5063ee2ba1c8f150396c53c6
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Nov 29 20:41:39 2010 -0800

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Use call_rcu_sched() for pagetables

commit 67bace72ee64f6a11cfb914b91d9d6bd47e80ed8
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Mon Nov 29 20:34:38 2010 -0500

    parisc: remove redundant initialization in sigsegv path of sys_rt_sigreturn
    
    Noticed-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Kyle McMartin <kyle at redhat.com>

commit 805e3f495057aa5307ad4e3d6dc7073d4733c691
Author: Ian Campbell <ian.campbell at citrix.com>
Date:   Wed Nov 3 15:32:21 2010 +0000

    xen: x86/32: perform initial startup on initial_page_table
    
    Only make swapper_pg_dir readonly and pinned when generic x86 architecture code
    (which also starts on initial_page_table) switches to it.  This helps ensure
    that the generic setup paths work on Xen unmodified. In particular
    clone_pgd_range writes directly to the destination pgd entries and is used to
    initialise swapper_pg_dir so we need to ensure that it remains writeable until
    the last possible moment during bring up.
    
    This is complicated slightly by the need to avoid sharing kernel PMD entries
    when running under Xen, therefore the Xen implementation must make a copy of
    the kernel PMD (which is otherwise referred to by both intial_page_table and
    swapper_pg_dir) before switching to swapper_pg_dir.
    
    Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
    Cc: Borislav Petkov <bp at alien8.de>
    Cc: H. Peter Anvin <hpa at linux.intel.com>
    Cc: Jeremy Fitzhardinge <jeremy at goop.org>
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit f2e785ed5fb8e5fe5063ee2ba1c8f150396c53c6
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Fri Nov 26 15:38:45 2010 +0100

    powerpc: Use call_rcu_sched() for pagetables
    
    PowerPC relies on IRQ-disable to guard against RCU quiecent states,
    use the appropriate RCU call version.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

commit bcb38ceb225f5d5b2198a2755277cd441ed1e82b
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Nov 30 09:15:46 2010 +1000

    Revert "debug_locks: set oops_in_progress if we will log messages."
    
    This reverts commit e0fdace10e75dac67d906213b780ff1b1a4cc360.
    
    On-list discussion seems to suggest that the robustness fixes for printk
    make this unnecessary and DaveM has also agreed in person at Kernel Summit
    and on list.
    
    The main problem with this code is once we hit a lockdep splat we always
    keep oops_in_progress set, the console layer uses oops_in_progress with KMS
    to decide when it should be showing the oops and not showing X, so it causes
    problems around suspend/resume time when a userspace resume can cause a console
    switch away from X, only if oops_in_progress is set (which is what we want
    if an oops actually is in progress, but not because we had a lockdep splat
    2 days prior).
    
    Cc: David S Miller <davem at davemloft.net>
    Cc: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit acfa747baf73922021a047f2d87a2d866f5dbab5
Author: Jiri Slaby <jslaby at suse.cz>
Date:   Mon Nov 29 10:16:54 2010 +0100

    TTY: open/hangup race fixup
    
    Like in the "TTY: don't allow reopen when ldisc is changing" patch,
    this one fixes a TTY WARNING as described in the option 1) there:
    1) __tty_hangup from tty_ldisc_hangup to tty_ldisc_enable. During this
    section tty_lock is held. However tty_lock is temporarily dropped in
    the middle of the function by tty_ldisc_hangup.
    
    The fix is to introduce a new flag which we set during the unlocked
    window and check it in tty_reopen too. The flag is TTY_HUPPING and is
    cleared after TTY_HUPPED is set.
    
    While at it, remove duplicate TTY_HUPPED set_bit. The one after
    calling ops->hangup seems to be more correct. But anyway, we hold
    tty_lock, so there should be no difference.
    
    Also document the function it does that kind of crap.
    
    Nicely reproducible with two forked children:
    static void do_work(const char *tty)
    {
    	if (signal(SIGHUP, SIG_IGN) == SIG_ERR) exit(1);
    	setsid();
    	while (1) {
    		int fd = open(tty, O_RDWR|O_NOCTTY);
    		if (fd < 0) continue;
    		if (ioctl(fd, TIOCSCTTY)) continue;
    		if (vhangup()) continue;
    		close(fd);
    	}
    	exit(0);
    }
    
    Signed-off-by: Jiri Slaby <jslaby at suse.cz>
    Reported-by: <Valdis.Kletnieks at vt.edu>
    Reported-by: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit e2efafbf139d2bfdfe96f2901f03189fecd172e4
Author: Jiri Slaby <jslaby at suse.cz>
Date:   Mon Nov 29 10:16:53 2010 +0100

    TTY: don't allow reopen when ldisc is changing
    
    There are many WARNINGs like the following reported nowadays:
    WARNING: at drivers/tty/tty_io.c:1331 tty_open+0x2a2/0x49a()
    Hardware name: Latitude E6500
    Modules linked in:
    Pid: 1207, comm: plymouthd Not tainted 2.6.37-rc3-mmotm1123 #3
    Call Trace:
     [<ffffffff8103b189>] warn_slowpath_common+0x80/0x98
     [<ffffffff8103b1b6>] warn_slowpath_null+0x15/0x17
     [<ffffffff8128a3ab>] tty_open+0x2a2/0x49a
     [<ffffffff810fd53f>] chrdev_open+0x11d/0x146
    ...
    
    This means tty_reopen is called without TTY_LDISC set. For further
    considerations, note tty_lock is held in tty_open. TTY_LDISC is cleared in:
    1) __tty_hangup from tty_ldisc_hangup to tty_ldisc_enable. During this
    section tty_lock is held. However tty_lock is temporarily dropped in
    the middle of the function by tty_ldisc_hangup.
    
    2) tty_release via tty_ldisc_release till the end of tty existence. If
    tty->count <= 1, tty_lock is taken, TTY_CLOSING bit set and then
    tty_ldisc_release called. tty_reopen checks TTY_CLOSING before checking
    TTY_LDISC.
    
    3) tty_set_ldisc from tty_ldisc_halt to tty_ldisc_enable. We:
       * take tty_lock, set TTY_LDISC_CHANGING, put tty_lock
       * call tty_ldisc_halt (clear TTY_LDISC), tty_lock is _not_ held
       * do some other work
       * take tty_lock, call tty_ldisc_enable (set TTY_LDISC), put
         tty_lock
    
    I cannot see how 2) can be a problem, as there I see no race. OTOH, 1)
    and 3) can happen without problems. This patch the case 3) by checking
    TTY_LDISC_CHANGING along with TTY_CLOSING in tty_reopen. 1) will be
    fixed in the following patch.
    
    Nicely reproducible with two processes:
    while (1) {
    	fd = open("/dev/ttyS1", O_RDWR);
    	if (fd < 0) {
    		warn("open");
    		continue;
    	}
    	close(fd);
    }
    --------
    while (1) {
            fd = open("/dev/ttyS1", O_RDWR);
            ld1 = 0; ld2 = 2;
            while (1) {
                    ioctl(fd, TIOCSETD, &ld1);
                    ioctl(fd, TIOCSETD, &ld2);
            }
            close(fd);
    }
    
    Signed-off-by: Jiri Slaby <jslaby at suse.cz>
    Reported-by: <Valdis.Kletnieks at vt.edu>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 6a20bd45fda271bd57e3ba41b3de3009797f4b5e
Author: Jiri Slaby <jslaby at suse.cz>
Date:   Thu Nov 25 00:27:55 2010 +0100

    NET: wan/x25, fix ldisc->open retval
    
    We should never return positive values from ldisc->open, tty layer
    doesn't (and never did) expect that.
    
    If we do that, weird things like warnings in tty_ldisc_close happen.
    
    Not sure if dev->base_addr is used somehow now.
    
    Signed-off-by: Jiri Slaby <jslaby at suse.cz>
    Cc: Alan Cox <alan at linux.intel.com>
    Cc: Andrew Hendry <andrew.hendry at gmail.com>
    Cc: linux-x25 at vger.kernel.org
    Tested-by: Sergey Lapin <slapin at ossfans.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 7f90cfc505d613f4faf096e0d84ffe99208057d9
Author: Jiri Slaby <jslaby at suse.cz>
Date:   Thu Nov 25 00:27:54 2010 +0100

    TTY: ldisc, fix open flag handling
    
    When a concrete ldisc open fails in tty_ldisc_open, we forget to clear
    TTY_LDISC_OPEN. This causes a false warning on the next ldisc open:
    WARNING: at drivers/char/tty_ldisc.c:445 tty_ldisc_open+0x26/0x38()
    Hardware name: System Product Name
    Modules linked in: ...
    Pid: 5251, comm: a.out Tainted: G        W  2.6.32-5-686 #1
    Call Trace:
     [<c1030321>] ? warn_slowpath_common+0x5e/0x8a
     [<c1030357>] ? warn_slowpath_null+0xa/0xc
     [<c119311c>] ? tty_ldisc_open+0x26/0x38
     [<c11936c5>] ? tty_set_ldisc+0x218/0x304
    ...
    
    So clear the bit when failing...
    
    Introduced in c65c9bc3efa (tty: rewrite the ldisc locking) back in
    2.6.31-rc1.
    
    Signed-off-by: Jiri Slaby <jslaby at suse.cz>
    Cc: Alan Cox <alan at linux.intel.com>
    Reported-by: Sergey Lapin <slapin at ossfans.org>
    Tested-by: Sergey Lapin <slapin at ossfans.org>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 8f1b1a509658bee2397ddb9937cbfa1b71cdca17
Merge: a01af8e4a4ee1135598f157051959982418c38f8 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Nov 29 14:38:06 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      tpm: Autodetect itpm devices

commit a01af8e4a4ee1135598f157051959982418c38f8
Merge: a9735c81a43054a7e8cb8771c8e04c01fcacde10 25888e30319f8896fc656fc68643e6a078263060
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Nov 29 14:36:33 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
      af_unix: limit recursion level
      pch_gbe driver: The wrong of initializer entry
      pch_gbe dreiver: chang author
      ucc_geth: fix ucc halt problem in half duplex mode
      inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners
      ehea: Add some info messages and fix an issue
      hso: fix disable_net
      NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty
      cxgb4vf: fix setting unicast/multicast addresses ...
      net, ppp: Report correct error code if unit allocation failed
      DECnet: don't leak uninitialized stack byte
      au1000_eth: fix invalid address accessing the MAC enable register
      dccp: fix error in updating the GAR
      tcp: restrict net.ipv4.tcp_adv_win_scale (#20312)
      netns: Don't leak others' openreq-s in proc
      Net: ceph: Makefile: Remove unnessary code
      vhost/net: fix rcu check usage
      econet: fix CVE-2010-3848
      econet: fix CVE-2010-3850
      econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
      ...

commit a9735c81a43054a7e8cb8771c8e04c01fcacde10
Merge: aa3fc52546b847f590d86a093afd863ff9081628 0d8e2d0dad98a693bad88aea6876ac8b94ad95c6
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Nov 29 14:36:07 2010 -0800

    Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      OMAP2+: PM/serial: hold console semaphore while OMAP UARTs are disabled
      OMAP: UART: don't resume UARTs that are not enabled.

commit 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27
Author: Matthew Garrett <mjg at redhat.com>
Date:   Thu Oct 21 17:42:40 2010 -0400

    tpm: Autodetect itpm devices
    
    Some Lenovos have TPMs that require a quirk to function correctly. This can
    be autodetected by checking whether the device has a _HID of INTC0102. This
    is an invalid PNPid, and as such is discarded by the pnp layer - however
    it's still present in the ACPI code, so we can pull it out that way. This
    means that the quirk won't be automatically applied on non-ACPI systems,
    but without ACPI we don't have any way to identify the chip anyway so I
    don't think that's a great concern.
    
    Signed-off-by: Matthew Garrett <mjg at redhat.com>
    Acked-by: Rajiv Andrade <srajiv at linux.vnet.ibm.com>
    Tested-by: Jiri Kosina <jkosina at suse.cz>
    Tested-by: Andy Isaacson <adi at hexapodia.org>
    Signed-off-by: James Morris <jmorris at namei.org>

commit 31e323cca9d5c8afd372976c35a5d46192f540d1
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Mon Nov 29 14:16:53 2010 -0800

    xen: don't bother to stop other cpus on shutdown/reboot
    
    Xen will shoot all the VCPUs when we do a shutdown hypercall, so there's
    no need to do it manually.
    
    In any case it will fail because all the IPI irqs have been pulled
    down by this point, so the cross-CPU calls will simply hang forever.
    
    Until change 76fac077db6b34e2c6383a7b4f3f4f7b7d06d8ce the function calls
    were not synchronously waited for, so this wasn't apparent.  However after
    that change the calls became synchronous leading to a hang on shutdown
    on multi-VCPU guests.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
    Cc: Stable Kernel <stable at kernel.org>
    Cc: Alok Kataria <akataria at vmware.com>

commit aa3fc52546b847f590d86a093afd863ff9081628
Merge: 555bdaefd52c386e79f98591810ceb8bab780398 5a92bc88cef279261d3f138e25850c122df67045
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Nov 29 14:11:08 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (24 commits)
      Btrfs: don't use migrate page without CONFIG_MIGRATION
      Btrfs: deal with DIO bios that span more than one ordered extent
      Btrfs: setup blank root and fs_info for mount time
      Btrfs: fix fiemap
      Btrfs - fix race between btrfs_get_sb() and umount
      Btrfs: update inode ctime when using links
      Btrfs: make sure new inode size is ok in fallocate
      Btrfs: fix typo in fallocate to make it honor actual size
      Btrfs: avoid NULL pointer deref in try_release_extent_buffer
      Btrfs: make btrfs_add_nondir take parent inode as an argument
      Btrfs: hold i_mutex when calling btrfs_log_dentry_safe
      Btrfs: use dget_parent where we can UPDATED
      Btrfs: fix more ESTALE problems with NFS
      Btrfs: handle NFS lookups properly
      btrfs: make 1-bit signed fileds unsigned
      btrfs: Show device attr correctly for symlinks
      btrfs: Set file size correctly in file clone
      btrfs: Check if dest_offset is block-size aligned before cloning file
      Btrfs: handle the space_cache option properly
      btrfs: Fix early enospc because 'unused' calculated with wrong sign.
      ...

commit 555bdaefd52c386e79f98591810ceb8bab780398
Merge: 1bfe4eefe530f97c1625982d754908f33acf308d 5989f11ba11c72f98d57580b991418d9ff6a207d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Nov 29 14:10:44 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      EDAC: Fix typos in Documentation/edac.txt
      EDAC, MCE: Fix edac_init_mce_inject error handling
      EDAC: Remove deprecated kbuild goal definitions

commit 1bfe4eefe530f97c1625982d754908f33acf308d
Merge: 72083646528d4887b920deb71b37e09bc7d227bb 14870b457524e745f1a118e17873d104b1a47b70
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon Nov 29 14:10:22 2010 -0800

    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: Userland expects quota limit/warn/usage in 512b blocks

commit 251d380034c6c34efe75ffb89d863558ba68ec6a
Author: John Tapsell <johnflux at gmail.com>
Date:   Thu Mar 25 13:30:45 2010 +0000

    Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN
    
    BugLink: http://bugs.launchpad.net/bugs/441990
    
    This was tested to successfully enable the hardware.
    
    Signed-off-by: John Tapsell <johnflux at gmail.com>
    Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
    CC: stable at kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 5c5e138b590a748c57d54b39634cda974ab9af1d
Author: Christian Lamparter <chunkeey at googlemail.com>
Date:   Fri Nov 26 23:29:23 2010 +0100

    carl9170: fix carl9170_tx_prepare typo
    
    commit: "carl9170: revamp carl9170_tx_prepare"
    introduced a peculiar bug that would only show
    up if the the module parameter noht is set to 1.
    
    Then all outbound voice, video and background
    frames would each invoke a (bogus) RTS/CTS
    handshake.
    
    Signed-off-by: Christian Lamparter <chunkeey at googlemail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 7dff3125534c1d035a910052335a3a39fbb31aa7
Author: Jouni Malinen <jouni.malinen at atheros.com>
Date:   Fri Nov 26 20:41:55 2010 +0200

    mac80211: Fix frame injection using non-AP vif
    
    In order for frame injection to work properly for some use cases
    (e.g., finding the station entry and keys for encryption), mac80211
    needs to find the correct sdata entry. This works when the main vif
    is in AP mode, but commit a2c1e3dad516618cb0fbfb1a62c36d0b0744573a
    broke this particular use case for station main vif. While this type of
    injection is quite unusual operation, it has some uses and we should fix
    it. Do this by changing the monitor vif sdata selection to allow station
    vif to be selected instead of limiting it to just AP vifs. We still need
    to skip some iftypes to avoid selecting unsuitable vif for injection.
    
    Signed-off-by: Jouni Malinen <jouni.malinen at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 46047784b8cdcfc916f6c1cccee0c18dd1223dfd
Author: Rajkumar Manoharan <rmanoharan at atheros.com>
Date:   Fri Nov 26 23:24:31 2010 +0530

    ath9k: Disable SWBA interrupt on remove_interface
    
    while removing beaconing mode interface, SWBA interrupt
    was never disabled when there are no other beaconing interfaces.
    
    Cc: stable at kernel.org
    Signed-off-by: Rajkumar Manoharan <rmanoharan at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit c426ee247e40a70490f3d67d3c9c7d1aba54516f
Author: Johannes Berg <johannes.berg at intel.com>
Date:   Fri Nov 26 11:38:04 2010 +0100

    ath9k/carl9170: advertise P2P
    
    With some upcoming changes we'd like to use
    the interface types for P2P capability tests.
    Enable them now so that when we add those
    tests in wpa_supplicant, nothing will break.
    
    Signed-off-by: Johannes Berg <johannes.berg at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 98c316e348bedffa730e6f1e4baeb8a3c3e0f28b
Author: Gabor Juhos <juhosg at openwrt.org>
Date:   Thu Nov 25 18:26:07 2010 +0100

    ath9k: use per-device struct for pm_qos_* operations
    
    The ath9k driver uses a shared pm_qos_request_list structure for all
    devices. This causes the following warning if more than one device is
    present in the system:
    
    WARNING: at kernel/pm_qos_params.c:234 ath9k_init_device+0x5e8/0x6b0()
    pm_qos_add_request() called for already added request
    Modules linked in:
    Call Trace:
    [<802b1cdc>] dump_stack+0x8/0x34
    [<8007dd90>] warn_slowpath_common+0x78/0xa4
    [<8007de44>] warn_slowpath_fmt+0x2c/0x38
    [<801b0828>] ath9k_init_device+0x5e8/0x6b0
    [<801bc508>] ath_pci_probe+0x2dc/0x39c
    [<80176254>] pci_device_probe+0x64/0xa4
    [<8019471c>] driver_probe_device+0xbc/0x188
    [<80194854>] __driver_attach+0x6c/0xa4
    [<80193e20>] bus_for_each_dev+0x60/0xb0
    [<80193580>] bus_add_driver+0xcc/0x268
    [<80194c08>] driver_register+0xe0/0x198
    [<801764e0>] __pci_register_driver+0x50/0xe0
    [<80365f48>] ath9k_init+0x3c/0x6c
    [<8006050c>] do_one_initcall+0xfc/0x1d8
    [<80355340>] kernel_init+0xd4/0x174
    [<800639a4>] kernel_thread_helper+0x10/0x18
    
    ---[ end trace 5345fc6f870564a6 ]---
    
    This patch fixes that warning by using a separate pm_qos_request_list
    sructure for each device.
    
    Signed-off-by: Gabor Juhos <juhosg at openwrt.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 16ccdf0dbc84b11bc8b7fdbad66804d06a683554
Author: Sven Neumann <s.neumann at raumfeld.com>
Date:   Wed Nov 24 16:02:00 2010 +0000

    libertas: fix invalid access
    
    card->priv must not be accessed after lbs_remove_card() was called
    as lbs_remove_card() frees card->priv via free_netdev().
    
    For libertas_sdio this is a regression introduced by 23b149c1890f9.
    The correct fix to the issue described there is simply to remove the
    assignment. This flag is set at the appropriate time inside
    lbs_remove_card anyway.
    
    Reported-by: Daniel Drake <dsd at laptop.org>
    Signed-off-by: Sven Neumann <s.neumann at raumfeld.com>
    Signed-off-by: Daniel Drake <dsd at laptop.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 517ff43146b17a0d067125f098f675d1e0ac2d82
Author: Daniel Drake <dsd at laptop.org>
Date:   Wed Nov 24 16:00:49 2010 +0000

    libertas: fix memory corruption in lbs_remove_card()
    
    "priv" is stored at the end of the wiphy structure, which is freed
    during the call to lbs_cfg_free(). It must not be touched afterwards.
    
    Remove the unnecessary NULL assignment causing this memory corruption.
    
    Signed-off-by: Daniel Drake <dsd at laptop.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 72f9fc7c8150873d51c61cfb885dc7fbb075d62a
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Mon Nov 22 12:12:37 2010 -0800

    staging: easycap needs smp_lock.h, fixes build error
    
    Add header file to fix build error:
    
    drivers/staging/easycap/easycap_main.c:4251: error: implicit declaration of function 'lock_kernel'
    drivers/staging/easycap/easycap_main.c:4254: error: implicit declaration of function 'unlock_kernel'
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Jiri Kosina <jkosina at suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit b6faaae1a15a352d68b3e3cd8b840e56709820bf
Author: Marek Lindner <lindner_marek at yahoo.de>
Date:   Mon Nov 22 12:34:49 2010 +0100

    Staging: batman-adv: ensure that eth_type_trans gets linear memory
    
    eth_type_trans tries to pull data with the length of the ethernet header
    from the skb. We only ensured that enough data for the first ethernet
    header and the batman header is available in non-paged memory of the skb
    and not for the ethernet after the batman header.
    
    eth_type_trans would fail sometimes with drivers which don't ensure that
    all there data is perfectly linearised.
    
    The failure was noticed through a kernel bug Oops generated by the
    skb_pull inside eth_type_trans.
    
    Reported-by: Rafal Lesniak <lesniak at eresi-project.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 9ee898739b7e4d292abed911008b3f91b442118a
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Nov 22 12:34:50 2010 +0100

    Staging: batman-adv: Don't remove interface with spinlock held
    
    We call a lot of the netdevice code when holding if_list_lock which will
    spin the whole time. This is not necessary because we only want to
    protect the access to the list to be serialized. An extra queue can be
    used which hold all interfaces which should be removed and then use that
    queue without any locks for netdevice cleanup.
    
    We create a "scheduling while atomic" Oops when calling different
    netdevice related functions inside a spinlock protected area on a
    preemtible kernel.
    
    Reported-by: Rafal Lesniak <lesniak at eresi-project.org>
    Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 6df78338e7af7960b67fa00aa2a5c63986a23d3c
Author: Arend van Spriel <arend at broadcom.com>
Date:   Sat Nov 20 12:07:16 2010 +0100

    staging: brcm80211: updated maintainers contact information
    
    Open-source development team extended so contacts updated.
    
    Reviewed-by: Brett Rudley <brudley at broadcom.com>
    Signed-off-by: Arend van Spriel <arend at broadcom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit c5d1b51d3559664920136b45f4d2366ed9a9e8be
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Nov 29 18:00:23 2010 +0000

    drm/i915: Clear pfit registers when not used by any outputs
    
    ... otherwise the panel-fitter may be left enabled with random settings
    and cause unintended filtering (i.e. blurring of native modes on external
    panels).
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31942
    Reported-and-tested-by: Ben Kohler <bkohler at gmail.com>
    Tested-by: Ciprian Docan <docan at eden.rutgers.edu>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit 8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf
Merge: 412dc7f368bf10a8049a8a4c41abbfd0108742e7 72083646528d4887b920deb71b37e09bc7d227bb
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Mon Nov 29 10:44:22 2010 -0800

    Merge branch 'master' into work

commit 39a545559f8d5f13e8a4a7dfddcaad0e2ba9bcfb
Author: Axel Lin <axel.lin at gmail.com>
Date:   Mon Nov 29 14:55:58 2010 +0800

    ASoC: Add missing dev_set_drvdata in p1022_ds_probe
    
    Otherwise, calling dev_get_drvdata in p1022_ds_remove returns NULL.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Timur Tabi <timur at freescale.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 67bd489aa309a680b1462ad635df29e8825152d2
Author: Axel Lin <axel.lin at gmail.com>
Date:   Mon Nov 29 14:54:58 2010 +0800

    ASoC: Add missing dev_set_drvdata in mpc8610_hpcd_probe
    
    Otherwise, calling dev_get_drvdata in mpc8610_hpcd_remove returns NULL.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Timur Tabi <timur at freescale.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 3f90e5028a03be4496a04e4599b16f4420ff1304
Author: Axel Lin <axel.lin at gmail.com>
Date:   Mon Nov 29 17:43:39 2010 +0800

    ASoC: Remove unneeded !! operations while checking return value of nuc900_checkready
    
    I think this unneededd !! operations just reduce the readability.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit a7a9820bae19775df1d6cc70d2571ee26e099413
Author: Axel Lin <axel.lin at gmail.com>
Date:   Mon Nov 29 17:40:53 2010 +0800

    ASoC: Fix compile error for nuc900-pcm.c
    
    This patch fixes below error:
    
      CC      sound/soc/nuc900/nuc900-pcm.o
    sound/soc/nuc900/nuc900-pcm.c: In function 'nuc900_dma_open':
    sound/soc/nuc900/nuc900-pcm.c:267: error: 'nuc900_ac97_data' undeclared (first use in this function)
    sound/soc/nuc900/nuc900-pcm.c:267: error: (Each undeclared identifier is reported only once
    sound/soc/nuc900/nuc900-pcm.c:267: error: for each function it appears in.)
    sound/soc/nuc900/nuc900-pcm.c: At top level:
    sound/soc/nuc900/nuc900-pcm.c:337: error: expected ',' or ';' before 'static'
    sound/soc/nuc900/nuc900-pcm.c:354: error: 'nuc900_soc_platform_probe' undeclared here (not in a function)
    make[3]: *** [sound/soc/nuc900/nuc900-pcm.o] Error 1
    make[2]: *** [sound/soc/nuc900] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit e3edefbd4a9071daf388978355f69c37fbeae261
Author: Axel Lin <axel.lin at gmail.com>
Date:   Mon Nov 29 17:40:05 2010 +0800

    ASoC: Fix prototype for nuc900_ac97_probe and nuc900_ac97_remove
    
    This patch fixes below compile warning:
    
      CC      sound/soc/nuc900/nuc900-ac97.o
    sound/soc/nuc900/nuc900-ac97.c:300: warning: initialization from incompatible pointer type
    sound/soc/nuc900/nuc900-ac97.c:301: warning: initialization from incompatible pointer type
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 5a8f1d4701a50bc2a1e112f6c8e7d30f63597eae
Author: Axel Lin <axel.lin at gmail.com>
Date:   Mon Nov 29 17:39:10 2010 +0800

    ASoC: Fix compile error for nuc900-ac97.c
    
    Fix below compile error by add a missing ';'.
    
      CC      sound/soc/nuc900/nuc900-ac97.o
    sound/soc/nuc900/nuc900-ac97.c:300: warning: initialization from incompatible pointer type
    sound/soc/nuc900/nuc900-ac97.c:301: warning: initialization from incompatible pointer type
    sound/soc/nuc900/nuc900-ac97.c:318: error: expected ',' or ';' before 'static'
    sound/soc/nuc900/nuc900-ac97.c:405: error: 'nuc900_ac97_drvprobe' undeclared here (not in a function)
    make[3]: *** [sound/soc/nuc900/nuc900-ac97.o] Error 1
    make[2]: *** [sound/soc/nuc900] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 523fb8c867650196bef830d5dd9315d9975a9b7e
Author: Suresh Jayaraman <sjayaraman at suse.de>
Date:   Mon Nov 29 22:39:47 2010 +0530

    cifs: trivial comment fix for cifs_invalidate_mapping
    
    Only the callers check whether the invalid_mapping flag is set and not
    cifs_invalidate_mapping().
    
    Signed-off-by: Suresh Jayaraman <sjayaraman at suse.de>
    Signed-off-by: Steve French <sfrench at us.ibm.com>

commit 25888e30319f8896fc656fc68643e6a078263060
Author: Eric Dumazet <eric.dumazet at gmail.com>
Date:   Thu Nov 25 04:11:39 2010 +0000

    af_unix: limit recursion level
    
    Its easy to eat all kernel memory and trigger NMI watchdog, using an
    exploit program that queues unix sockets on top of others.
    
    lkml ref : http://lkml.org/lkml/2010/11/25/8
    
    This mechanism is used in applications, one choice we have is to have a
    recursion limit.
    
    Other limits might be needed as well (if we queue other types of files),
    since the passfd mechanism is currently limited by socket receive queue
    sizes only.
    
    Add a recursion_level to unix socket, allowing up to 4 levels.
    
    Each time we send an unix socket through sendfd mechanism, we copy its
    recursion level (plus one) to receiver. This recursion level is cleared
    when socket receive queue is emptied.
    
    Reported-by: Марк Коренберг <socketpair at gmail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 50a4205333c5e545551f1f82b3004ca635407c5c
Author: Toshiharu Okada <toshiharu-linux at dsn.okisemi.com>
Date:   Mon Nov 29 06:18:07 2010 +0000

    pch_gbe driver: The wrong of initializer entry
    
    The wrong of initializer entry was modified.
    
    Signed-off-by: Toshiharu Okada <toshiharu-linux at dsn.okisemi.com>
    Reported-by: Dr. David Alan Gilbert <linux at treblig.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit a1dcfcb7f2d08717325157ed3c1db2362d6eb8c9
Author: Toshiharu Okada <toshiharu-linux at dsn.okisemi.com>
Date:   Sun Nov 21 19:58:37 2010 +0000

    pch_gbe dreiver: chang author
    
    This driver's AUTHOR was changed to "Toshiharu Okada" from "Masayuki Ohtake".
    I update the Kconfig, renamed "Topcliff" to "EG20T".
    
    Signed-off-by: Toshiharu Okada <toshiharu-linux at dsn.okisemi.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit d65c3768afb47fb93c43fbfcafef53502edaaa85
Author: Simon Wood <simon at mungewell.org>
Date:   Mon Nov 29 17:41:23 2010 +0100

    HID: add support for F430 Force Feedback Wheel
    
    This patch adds USB IDs to enable force feedback on the Thrustmaster
    F430 wheel.
    
    Antonio did the work, I just converted to git patch to include in Kernel.
    
    Reported-by: Antonio Orefice <aorefice77 at gmail.com>
    Signed-off-by: Simon Wood <simon at mungewell.org>
    Signed-off-by: Jiri Kosina <jkosina at suse.cz>

commit 44266416f786514ec43a0d15ad951c34566b99c9
Author: Anton Vorontsov <cbouatmailru at gmail.com>
Date:   Mon Nov 29 18:46:22 2010 +0300

    ARM: cns3xxx: Fix build with CONFIG_PCI=y
    
    commit 6338a6aa7c082f11d55712251e14178c68bf5869 ("ARM: 6269/1: Add 'code'
    parameter for hook_fault_code()") breaks CNS3xxx build:
    
      CC      arch/arm/mach-cns3xxx/pcie.o
    pcie.c: In function 'cns3xxx_pcie_init':
    pcie.c:373: warning: passing argument 4 of 'hook_fault_code' makes integer from pointer without a cast
    pcie.c:373: error: too few arguments to function 'hook_fault_code'
    
    This commit fixes the small issue.
    
    Cc: stable at kernel.org [36]
    Signed-off-by: Anton Vorontsov <cbouatmailru at gmail.com>

commit 5a92bc88cef279261d3f138e25850c122df67045
Author: Chris Mason <chris.mason at oracle.com>
Date:   Mon Nov 29 09:49:11 2010 -0500

    Btrfs: don't use migrate page without CONFIG_MIGRATION
    
    Fixes compile error
    
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit e4dde731ae70072338352c6f8fb75fd04a42cf8d
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Mon Nov 29 10:19:07 2010 +0200

    vhost: correctly set bits of dirty pages
    
    Fix two bugs in dirty page logging:
    When counting pages we should increase address by 1 instead of
    VHOST_PAGE_SIZE. Make log_write() correctly process requests
    that cross pages with write_address not starting at page boundary.
    
    Reported-by: Jason Wang <jasowang at redhat.com>
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>

commit ac70eb1305d5a81efd1e32327d7e79be15a63a5a
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Sat Nov 27 13:58:04 2010 -0500

    ALSA: hda: Use BIOS auto-parsing instead of existing model quirk for MEDION MD2
    
    BugLink: https://launchpad.net/bugs/682199
    
    A 2.6.35 (Ubuntu Maverick) user, burningphantom1, reported a regression
    in audio: playback was inaudible through both speakers and headphones.
    In commit 272a527c04 of sound-2.6.git, a new model was added with this
    machine's PCI SSID.  Fortunately, it is now sufficient to use the auto
    model for BIOS auto-parsing instead of the existing quirk.
    
    Playback, capture, and jack sense were verified working for both
    2.6.35 and the alsa-driver snapshot from 2010-11-27 when model=auto is
    used.
    
    Reported-and-tested-by: burningphantom1
    Cc: <stable at kernel.org> [2.6.35+]
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit c5027dec02c96964847fa68d512318ee5f6f7a19
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Nov 26 10:45:59 2010 -0800

    drm: record monitor status in output_poll_execute
    
    In order to correctly report monitor connected status changes, the
    previous monitor status must be recorded in the connector->status
    value instead of being discarded.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit bf9dc102e284a5aa78c73fc9d72e11d5ccd8669f
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Nov 26 10:45:58 2010 -0800

    drm: Set connector DPMS status to ON in drm_crtc_helper_set_config
    
    When setting a new crtc configuration, force the DPMS state of all
    connectors to ON. Otherwise, they'll be left at OFF and a future mode set
    that disables the specified connector will not turn the connector off.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 193006f7e3b1abd42d7a3677b54fa2996461a842
Author: Vasiliy Kulikov <segoon at openwall.com>
Date:   Fri Nov 26 17:06:28 2010 +0000

    sh: boards: mach-se: use IS_ERR() instead of NULL check
    
    clk_get() returns ERR_PTR() on error, not NULL.
    
    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
    Reviewed-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 4bd5d259e451d35380de2fcd1a3510ae22d000a3
Author: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Date:   Fri Nov 26 09:40:22 2010 +0000

    sh: Add div6_reparent_clks to clock framework for FSI
    
    Current clk_ops doesn't support .init which
    is used to select external clock on ecovec
    without CONFIG_SH_CLK_CPG_LEGACY.
    To solve this problem, this patch add div6_reparent_clks
    to clock-sh7724.
    This patch solve compile error too.
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit d830418e4085d65b3f8bad3216a37bc986ecd17d
Author: Yang Li <leoli at freescale.com>
Date:   Thu Nov 25 23:29:58 2010 +0000

    ucc_geth: fix ucc halt problem in half duplex mode
    
    In commit 58933c64(ucc_geth: Fix the wrong the Rx/Tx FIFO size),
    the UCC_GETH_UTFTT_INIT is set to 512 based on the recommendation
    of the QE Reference Manual.  But that will sometimes cause tx halt
    while working in half duplex mode.
    
    According to errata draft QE_GENERAL-A003(High Tx Virtual FIFO
    threshold size can cause UCC to halt), setting UTFTT less than
    [(UTFS x (M - 8)/M) - 128] will prevent this from happening
    (M is the minimum buffer size).
    
    The patch changes UTFTT back to 256.
    
    Signed-off-by: Li Yang <leoli at freescale.com>
    Cc: Jean-Denis Boyer <jdboyer at media5corp.com>
    Cc: Andreas Schmitz <Andreas.Schmitz at riedel.net>
    Cc: Anton Vorontsov <avorontsov at ru.mvista.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b4ff3c90e6066bacc8a92111752fe9e4f4c45cca
Author: Nagendra Tomar <tomer_iisc at yahoo.com>
Date:   Fri Nov 26 14:26:27 2010 +0000

    inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners
    
    inet sockets corresponding to passive connections are added to the bind hash
    using ___inet_inherit_port(). These sockets are later removed from the bind
    hash using __inet_put_port(). These two functions are not exactly symmetrical.
    __inet_put_port() decrements hashinfo->bsockets and tb->num_owners, whereas
    ___inet_inherit_port() does not increment them. This results in both of these
    going to -ve values.
    
    This patch fixes this by calling inet_bind_hash() from ___inet_inherit_port(),
    which does the right thing.
    
    'bsockets' and 'num_owners' were introduced by commit a9d8f9110d7e953c
    (inet: Allowing more than 64k connections and heavily optimize bind(0))
    
    Signed-off-by: Nagendra Singh Tomar <tomer_iisc at yahoo.com>
    Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
    Acked-by: Evgeniy Polyakov <zbr at ioremap.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 5c7e57f7cddb83d81d83fefa5822dfe80891130e
Author: Breno Leitao <breno at cafe.(none)>
Date:   Fri Nov 26 07:26:27 2010 +0000

    ehea: Add some info messages and fix an issue
    
    This patch adds some debug information about ehea not being able to
    allocate enough spaces. Also it correctly updates the amount of available
    skb.
    
    Signed-off-by: Breno Leitao <leitao at linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 163cf09c2a0ee5cac6285f9347975bd1e97725da
Author: Chris Mason <chris.mason at oracle.com>
Date:   Sun Nov 28 19:56:33 2010 -0500

    Btrfs: deal with DIO bios that span more than one ordered extent
    
    The new DIO bio splitting code has problems when the bio
    spans more than one ordered extent.  This will happen as the
    generic DIO code merges our get_blocks calls together into
    a bigger single bio.
    
    This fixes things by walking forward in the ordered extent
    code finding all the overlapping ordered extents and completing them
    all at once.
    
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 72083646528d4887b920deb71b37e09bc7d227bb
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Nov 28 16:27:19 2010 -0800

    Un-inline get_pipe_info() helper function
    
    This avoids some include-file hell, and the function isn't really
    important enough to be inlined anyway.
    
    Reported-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c66fb347946ebdd5b10908866ecc9fa05ee2cf3d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Nov 28 14:09:57 2010 -0800

    Export 'get_pipe_info()' to other users
    
    And in particular, use it in 'pipe_fcntl()'.
    
    The other pipe functions do not need to use the 'careful' version, since
    they are only ever called for things that are already known to be pipes.
    
    The normal read/write/ioctl functions are called through the file
    operations structures, so if a file isn't a pipe, they'd never get
    called.  But pipe_fcntl() is special, and called directly from the
    generic fcntl code, and needs to use the same careful function that the
    splice code is using.
    
    Cc: Jens Axboe <jaxboe at fusionio.com>
    Cc: Andrew Morton <akpm at linux-foundation.org>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Cc: Dave Jones <davej at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 71993e62a47dabddf10302807d6aa260455503f4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Nov 28 13:56:09 2010 -0800

    Rename 'pipe_info()' to 'get_pipe_info()'
    
    .. and change it to take the 'file' pointer instead of an inode, since
    that's what all users want anyway.
    
    The renaming is preparatory to exporting it to other users.  The old
    'pipe_info()' name was too generic and is already used elsewhere, so
    before making the function public we need to use a more specific name.
    
    Cc: Jens Axboe <jaxboe at fusionio.com>
    Cc: Andrew Morton <akpm at linux-foundation.org>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Cc: Dave Jones <davej at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a9e40a2493d805224f900d839b06188639b7ccd6
Merge: 75f5d2c9bd36047364d1fb35c0720ab37df3be02 ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Nov 28 12:25:02 2010 -0800

    Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf: Fix the software context switch counter
      perf, x86: Fixup Kconfig deps
      x86, perf, nmi: Disable perf if counters are not accessible
      perf: Fix inherit vs. context rotation bug

commit 75f5d2c9bd36047364d1fb35c0720ab37df3be02
Merge: 0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17 b2268830f5cf29d94b3e4a2af0b795a8f28776fe
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Nov 28 12:24:20 2010 -0800

    Merge branch 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: net: throttle TX queue before running out of tlabels
      firewire: net: replace lists by counters
      firewire: net: fix memory leaks
      firewire: net: count stats.tx_packets and stats.tx_bytes

commit 8e65c0ece6f2aa732f9b755331869c67aeb1c7f6
Author: Filip Aben <f.aben at option.com>
Date:   Thu Nov 25 03:40:50 2010 +0000

    hso: fix disable_net
    
    The HSO driver incorrectly creates a serial device instead of a net
    device when disable_net is set. It shouldn't create anything for the
    network interface.
    
    Signed-off-by: Filip Aben <f.aben at option.com>
    Reported-by: Piotr Isajew <pki at ex.com.pl>
    Reported-by: Johan Hovold <jhovold at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 03fe5f3ef7eab88e1405baa52a7923fbf337230b
Author: Jiri Slaby <jslaby at suse.cz>
Date:   Wed Nov 24 13:54:54 2010 +0000

    NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty
    
    We register lapb when tty is created, but unregister it only when the
    device is UP. So move the lapb_unregister to x25_asy_close_tty after
    the device is down.
    
    The old behaviour causes ldisc switching to fail each second attempt,
    because we noted for us that the device is unused, so we use it the
    second time, but labp layer still have it registered, so it fails
    obviously.
    
    Signed-off-by: Jiri Slaby <jslaby at suse.cz>
    Reported-by: Sergey Lapin <slapin at ossfans.org>
    Cc: Andrew Hendry <andrew.hendry at gmail.com>
    Tested-by: Sergey Lapin <slapin at ossfans.org>
    Tested-by: Mikhail Ulyanov <ulyanov.mikhail at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 42eb59d3a80ff83b4cacb92dcc44b22da7d4969b
Author: Casey Leedom <leedom at chelsio.com>
Date:   Wed Nov 24 12:23:57 2010 +0000

    cxgb4vf: fix setting unicast/multicast addresses ...
    
    We were truncating the number of unicast and multicast MAC addresses
    supported.  Additionally, we were incorrectly computing the MAC Address
    hash (a "1 << N" where we needed a "1ULL << N").
    
    Signed-off-by: Casey Leedom <leedom at chelsio.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit bcc70bb3aeae7c3d035881d41055685f08a2b745
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date:   Tue Nov 23 11:43:44 2010 +0000

    net, ppp: Report correct error code if unit allocation failed
    
    Allocating unit from ird might return several error codes
    not only -EAGAIN, so it should not be changed and returned
    precisely. Same time unit release procedure should be invoked
    only if device is unregistering.
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
    CC: Paul Mackerras <paulus at samba.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3c6f27bf33052ea6ba9d82369fb460726fb779c0
Author: Dan Rosenberg <drosenberg at vsecurity.com>
Date:   Tue Nov 23 11:02:13 2010 +0000

    DECnet: don't leak uninitialized stack byte
    
    A single uninitialized padding byte is leaked to userspace.
    
    Signed-off-by: Dan Rosenberg <drosenberg at vsecurity.com>
    CC: stable <stable at kernel.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 462ca99c2ff6caae94dde5c05b56b54f6c01602a
Author: Wolfgang Grandegger <wg at grandegger.com>
Date:   Tue Nov 23 06:40:25 2010 +0000

    au1000_eth: fix invalid address accessing the MAC enable register
    
    "aup->enable" holds already the address pointing to the MAC enable
    register. The bug was introduced by commit d0e7cb:
    
    "au1000-eth: remove volatiles, switch to I/O accessors".
    
    CC: Florian Fainelli <florian at openwrt.org>
    Signed-off-by: Wolfgang Grandegger <wg at denx.de>
    Acked-by: Florian Fainelli <florian at openwrt.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 0ac78870220b6e0ac74dd9292bcfa7b18718babd
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date:   Tue Nov 23 02:36:56 2010 +0000

    dccp: fix error in updating the GAR
    
    This fixes a bug in updating the Greatest Acknowledgment number Received (GAR):
    the current implementation does not track the greatest received value -
    lower values in the range AWL..AWH (RFC 4340, 7.5.1) erase higher ones.
    
    Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit a301e1703edc088592f8c5c16f9bdd34a0792776
Merge: 0147fc058d11bd4009b126d09974d2c8f48fef15 11cd1a8b8cad1acfc140d9acce93762a9c140b20
Author: David S. Miller <davem at davemloft.net>
Date:   Sun Nov 28 11:27:44 2010 -0800

    Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

commit 0147fc058d11bd4009b126d09974d2c8f48fef15
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date:   Mon Nov 22 12:54:21 2010 +0000

    tcp: restrict net.ipv4.tcp_adv_win_scale (#20312)
    
    tcp_win_from_space() does the following:
    
          if (sysctl_tcp_adv_win_scale <= 0)
                  return space >> (-sysctl_tcp_adv_win_scale);
          else
                  return space - (space >> sysctl_tcp_adv_win_scale);
    
    "space" is int.
    
    As per C99 6.5.7 (3) shifting int for 32 or more bits is
    undefined behaviour.
    
    Indeed, if sysctl_tcp_adv_win_scale is exactly 32,
    space >> 32 equals space and function returns 0.
    
    Which means we busyloop in tcp_fixup_rcvbuf().
    
    Restrict net.ipv4.tcp_adv_win_scale to [-31, 31].
    
    Fix https://bugzilla.kernel.org/show_bug.cgi?id=20312
    
    Steps to reproduce:
    
          echo 32 >/proc/sys/net/ipv4/tcp_adv_win_scale
          wget www.kernel.org
          [softlockup]
    
    Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit de18a29e0fa3904894b4e02fae0e712cd43f740c
Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Sat Nov 27 22:30:41 2010 +0100

    drm/i915: fix regression due to ba3d8d749b01548b9
    
    We don't track gpu flush request in any special way. So even with
    obj->write_domain == 0, a gpu flush might be outstanding but no
    yet executed. Even worse, the latest request might use the object
    only for reading. So and unconditional call to object_wait_rendering
    is needed for !pipelined.
    
    Hence revert that patch fully and untangle the flushing from the
    synchronization again.
    
    Reported-by: Keith Packard <keithp at keithp.com>
    Tested-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit e7a3481c0246c8e45e79c629efd63b168e91fcda
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Mon Oct 25 16:53:46 2010 -0700

    x86/pvclock: Zero last_value on resume
    
    If the guest domain has been suspend/resumed or migrated, then the
    system clock backing the pvclock clocksource may revert to a smaller
    value (ie, can be non-monotonic across the migration/save-restore).
    
    Make sure we zero last_value in that case so that the domain
    continues to see clock updates.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 8475ef9fd16cadbfc692f78e608d1941a340beb2
Author: Pavel Emelyanov <xemul at parallels.com>
Date:   Mon Nov 22 03:26:12 2010 +0000

    netns: Don't leak others' openreq-s in proc
    
    The /proc/net/tcp leaks openreq sockets from other namespaces.
    
    Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 4cb6a614ba0e58cae8abdadbf73bcb4d37a3f599
Author: Tracey Dent <tdent48227 at gmail.com>
Date:   Sun Nov 21 15:23:50 2010 +0000

    Net: ceph: Makefile: Remove unnessary code
    
    Remove the if and else conditional because the code is in mainline and there
    is no need in it being there.
    
    Signed-off-by: Tracey Dent <tdent48227 at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17
Merge: 19650e8580987c0ffabc2fe2cbc16b944789df8b 37fa84d8e647e584bf1b71bdff0330049e34f5ef
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 12:42:15 2010 -0800

    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: (30 commits)
      ALSA: hda - Use ALC_INIT_DEFAULT for really default initialization
      ASoC: Fix resource reclaim for osk5912
      ASoC: tlv320aic3x - fix variable may be used uninitialized warning
      ASoC: davinci-vcif - fix a memory leak
      ASoC: phycore-ac97: fix resource leak
      ASoC: imx-ssi: fix resource leak
      ASoC: simone: fix resource leak in simone_init error path
      ASoC: sam9g20_wm8731: fix resource leak in at91sam9g20ek_init error path
      ASoC: snd-soc-afeb9260: remove unneeded platform_device_del in error path
      ASoC: pcm030-audio-fabric: fix resource leak in pcm030_fabric_init error path
      ASoC: efika-audio-fabric: fix resource leak in efika_fabric_init error path
      ASoC: Call snd_soc_unregister_dais instead of snd_soc_unregister_dai in sh4_soc_dai_remove
      ASoC: fix SND_PXA2XX_LIB Kconfig warning
      ALSA: hda - Fix ALC660-VD/ALC861-VD capture/playback mixers
      ALSA: HDA: Add an extra DAC for Realtek ALC887-VD
      ASoC: nuc900-ac97: fix a memory leak
      ASoC: Return proper error for omap3pandora_soc_init
      ASoC: wm8961 - clear WM8961_MCLKDIV bit for freq <= 16500000
      ASoC: wm8961 - clear WM8961_DACSLOPE bit for normal mode
      ALSA: hda - Fix Acer 7730G support
      ...

commit 450ba0ea06b6ed3612d27f2b7127a9de4160f285
Author: Josef Bacik <josef at redhat.com>
Date:   Fri Nov 19 14:59:15 2010 -0500

    Btrfs: setup blank root and fs_info for mount time
    
    There is a problem with how we use sget, it searches through the list of supers
    attached to the fs_type looking for a super with the same fs_devices as what
    we're trying to mount.  This depends on sb->s_fs_info being filled, but we don't
    fill that in until we get to btrfs_fill_super, so we could hit supers on the
    fs_type super list that have a null s_fs_info.  In order to fix that we need to
    go ahead and setup a blank root with a blank fs_info to hold fs_devices, that
    way our test will work out right and then we can set s_fs_info in
    btrfs_set_super, and then open_ctree will simply use our pre-allocated root and
    fs_info when setting everything up.  Thanks,
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 975f84fee2e8a77ee5f41bfe7c5682bf29366b10
Author: Josef Bacik <josef at redhat.com>
Date:   Tue Nov 23 19:36:57 2010 +0000

    Btrfs: fix fiemap
    
    There are two big problems currently with FIEMAP
    
    1) We return extents for holes.  This isn't supposed to happen, we just don't
    return extents for holes and then userspace interprets the lack of an extent as
    a hole.
    
    2) We sometimes don't set FIEMAP_EXTENT_LAST properly.  This is because we wait
    to see a EXTENT_FLAG_VACANCY flag on the em, but this won't happen if say we ask
    fiemap to map up to the last extent in a file, and there is nothing but holes up
    to the i_size.  To fix this we need to lookup the last extent in this file and
    save the logical offset, so if we happen to try and map that extent we can be
    sure to set FIEMAP_EXTENT_LAST.
    
    With this patch we now pass xfstest 225, which we never have before.
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 619c8c763928841b1112e1d417f88bc1d44daecb
Author: Ian Kent <raven at themaw.net>
Date:   Mon Nov 22 02:21:38 2010 +0000

    Btrfs - fix race between btrfs_get_sb() and umount
    
    When mounting a btrfs file system btrfs_test_super() may attempt to
    use sb->s_fs_info, the btrfs root, of a super block that is going away
    and that has had the btrfs root set to NULL in its ->put_super(). But
    if the super block is going away it cannot be an existing super block
    so we can return false in this case.
    
    Signed-off-by: Ian Kent <raven at themaw.net>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit bc1cbf1f86aa2501efa9ca637c736fce6bcc4b1d
Author: Josef Bacik <josef at redhat.com>
Date:   Tue Nov 23 19:50:59 2010 +0000

    Btrfs: update inode ctime when using links
    
    Currently we fail xfstest 236 because we're not updating the inode ctime on
    link.  This is a simple fix, and makes it so we pass 236 now.
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 0ed42a63f3edb144b091d9528401fce95c3c4d8d
Author: Josef Bacik <josef at redhat.com>
Date:   Mon Nov 22 18:55:39 2010 +0000

    Btrfs: make sure new inode size is ok in fallocate
    
    We have been failing xfstest 228 forever, because we don't check to make sure
    the new inode size is acceptable as far as RLIMIT is concerned.  Just check to
    make sure it's ok to create a inode with this new size and error out if not.
    With this patch we now pass 228.
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 55a61d1d06a3dc443d0db8aaa613365dcb83b98a
Author: Josef Bacik <josef at redhat.com>
Date:   Mon Nov 22 18:50:32 2010 +0000

    Btrfs: fix typo in fallocate to make it honor actual size
    
    There is a typo in __btrfs_prealloc_file_range() where we set the i_size to
    actual_len/cur_offset, and then just set it to cur_offset again, and do the same
    with btrfs_ordered_update_i_size().  This fixes it back to keeping i_size in a
    local variable and then updating i_size properly.  Tested this with
    
    xfs_io -F -f -c "falloc 0 1" -c "pwrite 0 1" foo
    
    stat'ing foo gives us a size of 1 instead of 4096 like it was.  Thanks,
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 19650e8580987c0ffabc2fe2cbc16b944789df8b
Merge: 1eb4c6362cb7d6a2f904c555c10dc45caeeefc31 0b26a0bf6ff398185546432420bb772bcfdf8d94
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:30:30 2010 +0900

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFS: Ensure we return the dirent->d_type when it is known
      NFS: Correct the array bound calculation in nfs_readdir_add_to_array
      NFS: Don't ignore errors from nfs_do_filldir()
      NFS: Fix the error handling in "uncached_readdir()"
      NFS: Fix a page leak in uncached_readdir()
      NFS: Fix a page leak in nfs_do_filldir()
      NFS: Assume eof if the server returns no readdir records
      NFS: Buffer overflow in ->decode_dirent() should not be fatal
      Pure nfs client performance using odirect.
      SUNRPC: Fix an infinite loop in call_refresh/call_refreshresult

commit 1eb4c6362cb7d6a2f904c555c10dc45caeeefc31
Merge: 03187552762cba3db20d22bc7b0fe2d3642bc15b 1b1d76e2df2a0aa965d6a227db7061d3fff029b1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:30:08 2010 +0900

    Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
    
    * 'linux-next' of git://git.infradead.org/ubi-2.6:
      UBI: release locks in check_corruption

commit 03187552762cba3db20d22bc7b0fe2d3642bc15b
Merge: fbe6c4047f011d76be83bc2380531cd4fb6aa0e6 c0deae8c9587419ab13874b74425ce2eb2e18508
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:29:20 2010 +0900

    Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      posix-cpu-timers: Rcu_read_lock/unlock protect find_task_by_vpid call

commit fbe6c4047f011d76be83bc2380531cd4fb6aa0e6
Merge: d2f30c73aba19be828c759edcd21140390cd06e4 4917b284db8607e414c334317b7d15239854d39c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:28:47 2010 +0900

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      dmar, x86: Use function stubs when CONFIG_INTR_REMAP is disabled
      x86-64: Fix and clean up AMD Fam10 MMCONF enabling
      x86: UV: Address interrupt/IO port operation conflict
      x86: Use online node real index in calulate_tbl_offset()
      x86, asm: Fix binutils 2.15 build failure

commit d2f30c73aba19be828c759edcd21140390cd06e4
Merge: 1b065fdff1c950d96e4c571abe873a9a8aaa6d51 02a9d03772aa1ff33a26180a2da0bfb191240eda
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:28:17 2010 +0900

    Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf symbols: Remove incorrect open-coded container_of()
      perf record: Handle restrictive permissions in /proc/{kallsyms,modules}
      x86/kprobes: Prevent kprobes to probe on save_args()
      irq_work: Drop cmpxchg() result
      perf: Fix owner-list vs exit
      x86, hw_nmi: Move backtrace_mask declaration under ARCH_HAS_NMI_WATCHDOG
      tracing: Fix recursive user stack trace
      perf,hw_breakpoint: Initialize hardware api earlier
      x86: Ignore trap bits on single step exceptions
      tracing: Force arch_local_irq_* notrace for paravirt
      tracing: Fix module use of trace_bprintk()

commit 1b065fdff1c950d96e4c571abe873a9a8aaa6d51
Merge: b76a1e4f2a2f95354f4567c8eb420fd4cb68fc26 d5ad140bc1505a98c0f040937125bfcbb508078f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:27:54 2010 +0900

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: Fix idle balancing
      sched: Fix volanomark performance regression

commit b76a1e4f2a2f95354f4567c8eb420fd4cb68fc26
Merge: 78daa87b1d332e4ac963c793a4157533d57501c7 4814a2b3c603438ed8c330c74b49aa662b1ede43
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:26:48 2010 +0900

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
    
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] qdio: free indicator after reset is finished
      [S390] nmi: fix clock comparator revalidation

commit 78daa87b1d332e4ac963c793a4157533d57501c7
Merge: d4d2ad948e9a9c316e72fdc09d7490dfda4773da bbe425cd9ae83eacd0c9f09df2bf56dc911a54cd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:17:50 2010 +0900

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
    
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      cciss: fix build for PROC_FS disabled
      block: fix amiga and atari floppy driver compile warning
      blk-throttle: Fix calculation of max number of WRITES to be dispatched
      ioprio: grab rcu_read_lock in sys_ioprio_{set,get}()
      xen/blkfront: cope with backend that fail empty BLKIF_OP_WRITE_BARRIER requests
      xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER
      xen/blkfront: change blk_shadow.request to proper pointer
      xen/blkfront: map REQ_FLUSH into a full barrier

commit d4d2ad948e9a9c316e72fdc09d7490dfda4773da
Merge: 5c3b9bac28c62151f133a944fe14df5e153ae493 540565257101f7c52b6fc5a57651f7505f8d20fe
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:17:16 2010 +0900

    Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      ARM: mach-shmobile: clock-sh7372: remove bogus pllc2 clock toggling.
      ARM: mach-shmobile: clock-sh7372: remove unnecessary fsi clocks
      ARM: mach-shmobile: clock-sh7372: modify error code
      ARM: mach-shmobile: ap4evb: FSI clock use proper process for ak4642
      ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI
      ARM: mach-shmobile: clock-sh7372: remove fsidiv bogus disable
      ARM: mach-shmobile: sh7372 USB0/IIC1 MSTP fix

commit 5c3b9bac28c62151f133a944fe14df5e153ae493
Merge: b127c6fb508f86542c3d5e460e1b99d2294360a6 15ec44611904be0dcc97b84c29fbf964e5e2b36f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:16:29 2010 +0900

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
      mmc: sdhci: 8-bit bus width changes
      mmc: sdio: fix runtime PM anomalies by introducing MMC_CAP_POWER_OFF_CARD
      mmc: sdio: fix nasty oops in mmc_sdio_detect
      mmc: omap4: hsmmc: Fix improper card detection while booting
      mmc: fix rmmod race for hosts using card-detection polling
      mmc: sdhci: Fix crash on boot with C0 stepping Moorestown platforms
      mmc: sdhci-esdhc-imx: enable QUIRK_NO_MULTIBLOCK only for i.MX25 and i.MX35
      mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhci
      mmc: sdhci: Properly enable SDIO IRQ wakeups
      mmc: ushc: Return proper error code for ushc_probe()
      mmc: Fix printing of card DDR type

commit b127c6fb508f86542c3d5e460e1b99d2294360a6
Merge: 0a66a59649f8d3f09a0ca77f1a232ec77adeeda2 9adf262a9f81489635f7868c9819cb864192811b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:15:25 2010 +0900

    Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
    
    * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: S5PV210: Fix sysdev related warning messages
      ARM: S3C24XX: Fix UART3 submask on S3C2416 and S3C2443
      ARM: S3C24XX: Fix Demux error in UART3 irqs on S3C2443 and S3C2416
      ARM: S3C64XX: fix uart clock setup for mini6410/real6410
      ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull
      ARM: S3C2410: Adapt h1940-bluetooth to gpiolib changes

commit 0a66a59649f8d3f09a0ca77f1a232ec77adeeda2
Merge: 698fd6a2c3ca05ec796072defb5c415289a86cdc f6c26ec5085be805c9dc72d074ef5f504b9cd7df
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat Nov 27 07:14:00 2010 +0900

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: fix typo in comment of nilfs_dat_move function
      nilfs2: nilfs_iget_for_gc() returns ERR_PTR

commit 37fa84d8e647e584bf1b71bdff0330049e34f5ef
Merge: 5a8cfb4e8ae317d283f84122ed20faa069c5e0c4 25436180ee8bed6740f29d92c2030c759885c147
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri Nov 26 17:17:42 2010 +0100

    Merge branch 'fix/asoc' into for-linus

commit 5a8cfb4e8ae317d283f84122ed20faa069c5e0c4
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri Nov 26 17:11:18 2010 +0100

    ALSA: hda - Use ALC_INIT_DEFAULT for really default initialization
    
    When SKU assid gives no valid bits for 0x38, the driver didn't take
    any action, so far.  This resulted in the missing initialization for
    external amps, etc, thus the silent output in the end.
    
    Especially users hit this problem on ALC888 newly since 2.6.35,
    where the driver doesn't force to use ALC_INIT_DEFAULT any more.
    
    This patch sets the default initialization scheme to use
    ALC_INIT_DEFAULT when no valid bits are set for SKU assid.
    
    Reference:
    	https://bugzilla.redhat.com/show_bug.cgi?id=657388
    
    Reported-and-tested-by: Kyle McMartin <kyle at redhat.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 61ab25447ad6334a74e32f60efb135a3467223f8
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Fri Nov 26 13:00:59 2010 +0100

    nohz: Fix printk_needs_cpu() return value on offline cpus
    
    This patch fixes a hang observed with 2.6.32 kernels where timers got enqueued
    on offline cpus.
    
    printk_needs_cpu() may return 1 if called on offline cpus. When a cpu gets
    offlined it schedules the idle process which, before killing its own cpu, will
    call tick_nohz_stop_sched_tick(). That function in turn will call
    printk_needs_cpu() in order to check if the local tick can be disabled. On
    offline cpus this function should naturally return 0 since regardless if the
    tick gets disabled or not the cpu will be dead short after. That is besides the
    fact that __cpu_disable() should already have made sure that no interrupts on
    the offlined cpu will be delivered anyway.
    
    In this case it prevents tick_nohz_stop_sched_tick() to call
    select_nohz_load_balancer(). No idea if that really is a problem. However what
    made me debug this is that on 2.6.32 the function get_nohz_load_balancer() is
    used within __mod_timer() to select a cpu on which a timer gets enqueued. If
    printk_needs_cpu() returns 1 then the nohz_load_balancer cpu doesn't get
    updated when a cpu gets offlined. It may contain the cpu number of an offline
    cpu. In turn timers get enqueued on an offline cpu and not very surprisingly
    they never expire and cause system hangs.
    
    This has been observed 2.6.32 kernels. On current kernels __mod_timer() uses
    get_nohz_timer_target() which doesn't have that problem. However there might be
    other problems because of the too early exit tick_nohz_stop_sched_tick() in
    case a cpu goes offline.
    
    Easiest way to fix this is just to test if the current cpu is offline and call
    printk_tick() directly which clears the condition.
    
    Alternatively I tried a cpu hotplug notifier which would clear the condition,
    however between calling the notifier function and printk_needs_cpu() something
    could have called printk() again and the problem is back again. This seems to
    be the safest fix.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Cc: stable at kernel.org
    LKML-Reference: <20101126120235.406766476 at de.ibm.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 49f4138346b3cec2706adff02658fe27ceb1e46f
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Fri Nov 26 13:42:47 2010 +0100

    printk: Fix wake_up_klogd() vs cpu hotplug
    
    wake_up_klogd() may get called from preemptible context but uses
    __raw_get_cpu_var() to write to a per cpu variable. If it gets preempted
    between getting the address and writing to it, the cpu in question could be
    offline if the process gets scheduled back and hence writes to the per cpu data
    of an offline cpu.
    
    This buggy behaviour was introduced with fa33507a "printk: robustify
    printk, fix #2" which was supposed to fix a "using smp_processor_id() in
    preemptible" warning.
    
    Let's use this_cpu_write() instead which disables preemption and makes sure
    that the outlined scenario cannot happen.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    LKML-Reference: <20101126124247.GC7023 at osiris.boeblingen.de.ibm.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Fri Nov 26 13:49:04 2010 +0100

    perf: Fix the software context switch counter
    
    Stephane noticed that because the perf_sw_event() call is inside the
    perf_event_task_sched_out() call it won't get called unless we
    have a per-task counter.
    
    Reported-by: Stephane Eranian <eranian at google.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    LKML-Reference: <new-submission>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit cc2067a51424dd25c10c1b1230b4222d8baec94d
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Tue Nov 16 21:49:01 2010 +0100

    perf, x86: Fixup Kconfig deps
    
    This leads to a Kconfig dep inversion, x86 selects PERF_EVENT (due to
    a hw_breakpoint dep) but doesn't unconditionally provide
    HAVE_PERF_EVENT.
    
    (This can cause build failures on M386/M486 kernel .config's.)
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    LKML-Reference: <20101117222055.982965150 at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 33c6d6a7ad0ffab9b1b15f8e4107a2af072a05a0
Author: Don Zickus <dzickus at redhat.com>
Date:   Mon Nov 22 16:55:23 2010 -0500

    x86, perf, nmi: Disable perf if counters are not accessible
    
    In a kvm virt guests, the perf counters are not emulated.  Instead they
    return zero on a rdmsrl. The perf nmi handler uses the fact that crossing
    a zero means the counter overflowed (for those counters that do not have
    specific interrupt bits). Therefore on kvm guests, perf will swallow all
    NMIs thinking the counters overflowed.
    
    This causes problems for subsystems like kgdb which needs NMIs to do its
    magic. This problem was discovered by running kgdb tests.
    
    The solution is to write garbage into a perf counter during the
    initialization and hopefully reading back the same number.  On kvm
    guests, the value will be read back as zero and we disable perf as
    a result.
    
    Reported-by: Jason Wessel <jason.wessel at windriver.com>
    Patch-inspired-by: Peter Zijlstra <peterz at infradead.org>
    Signed-off-by: Don Zickus <dzickus at redhat.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Cc: Stephane Eranian <eranian at google.com>
    LKML-Reference: <1290462923-30734-1-git-send-email-dzickus at redhat.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit dddd3379a619a4cb8247bfd3c94ca9ae3797aa2e
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Wed Nov 24 10:05:55 2010 +0100

    perf: Fix inherit vs. context rotation bug
    
    It was found that sometimes children of tasks with inherited events had
    one extra event. Eventually it turned out to be due to the list rotation
    no being exclusive with the list iteration in the inheritance code.
    
    Cure this by temporarily disabling the rotation while we inherit the events.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    LKML-Reference: <new-submission>
    Cc: <stable at kernel.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit e5cba24e3f018d4beb6acd101a82483c98f91ce7
Author: Hitoshi Mitake <mitake at dcl.info.waseda.ac.jp>
Date:   Fri Nov 26 12:06:44 2010 +0100

    workqueue: check the allocation of system_unbound_wq
    
    I found a trivial bug on initialization of workqueue.
    Current init_workqueues doesn't check the result of
    allocation of system_unbound_wq, this should be checked
    like other queues.
    
    Signed-off-by: Hitoshi Mitake <mitake at dcl.info.waseda.ac.jp>
    Cc: Arjan van de Ven <arjan at linux.intel.com>
    Cc: David Howells <dhowells at redhat.com>
    Signed-off-by: Tejun Heo <tj at kernel.org>

commit 4917b284db8607e414c334317b7d15239854d39c
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Mon Nov 22 12:48:34 2010 -0800

    dmar, x86: Use function stubs when CONFIG_INTR_REMAP is disabled
    
    The stubs for CONFIG_INTR_REMAP disabled need to be functions
    instead of values to eliminate build warnings.
    
     arch/x86/kernel/apic/apic.c: In function 'lapic_suspend':
     arch/x86/kernel/apic/apic.c:2060:3: warning: statement with no effect
     arch/x86/kernel/apic/apic.c: In function 'lapic_resume':
     arch/x86/kernel/apic/apic.c:2137:3: warning: statement with no effect
    
    Reported-and-Tested-by: Fabio Comolli <fabio.comolli at gmail.com>
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: Suresh Siddha <suresh.b.siddha at intel.com>
    Cc: Yinghai Lu <yinghai at kernel.org>
    Cc: David Woodhouse <dwmw2 at infradead.org>
    Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
    LKML-Reference: <20101122124834.74429004.randy.dunlap at oracle.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 22a95949d03548cb346d81d71ce6c64dc273f421
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Fri Nov 26 05:20:25 2010 +0000

    framebuffer: fix fbcmap.c kernel-doc warning
    
    Fix kernel-doc warning in fbcmap.c:
    
    Warning(drivers/video/fbcmap.c:92): No description found for parameter 'flags'
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit e536fb6f9dc3908ad4c642414002ec9daf590ed7
Merge: a235e4c9302509ac5956bbbffa22eb5ed9fcdc54 ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Nov 26 10:45:03 2010 +1000

    Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
    
    * 'intel/drm-intel-fixes' of /ssd/git/drm-next:
      drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
      MAINTAINERS: INTEL DRM DRIVERS list (intel-gfx) is subscribers-only
      drm/i915/sdvo: Always fallback to querying the shared DDC line
      drm/i915: Handle pagefaults in execbuffer user relocations
      drm/i915/sdvo: Only enable HDMI encodings only if the commandset is supported
      drm/i915: Only save/restore cursor regs if !KMS
      drm/i915: Prevent integer overflow when validating the execbuffer

commit a235e4c9302509ac5956bbbffa22eb5ed9fcdc54
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Nov 24 22:26:55 2010 -0500

    Revert "drm/radeon/kms: fix typo in r600 cs checker"
    
    This reverts commit d33ef52d9db8a36900dd53f2e32db9a521ace259.
    
    This change seems to expose a bug in the 3D driver tiggered by
    certain apps, so revert it to keep userspace working.
    
    Reported-by: Rafael J. Wysocki <rjw at sisk.pl>
    
    Cc: Rafael J. Wysocki <rjw at sisk.pl>
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 25436180ee8bed6740f29d92c2030c759885c147
Author: Axel Lin <axel.lin at gmail.com>
Date:   Wed Nov 24 22:24:01 2010 +0800

    ASoC: Fix resource reclaim for osk5912
    
    In current implementation, there are resources leak in the error path.
    This patch properly reclaims the allocated resources in the error path.
    
    Also adds a missing clk_put in osk_soc_exit.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Jarkko Nikula <jhnikula at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit fe99b55994f08d321cc5f621c3634b1de4961d01
Author: Axel Lin <axel.lin at gmail.com>
Date:   Wed Nov 24 22:40:59 2010 +0800

    ASoC: tlv320aic3x - fix variable may be used uninitialized warning
    
    If aic3x_read failed , val is used uninitialized.
    Fix it by initializing val to 0.
    
    This patch fixes below compile warning:
    sound/soc/codecs/tlv320aic3x.c: In function 'aic3x_get_gpio':
    sound/soc/codecs/tlv320aic3x.c:1183: warning: 'val' may be used uninitialized in this function
    sound/soc/codecs/tlv320aic3x.c: In function 'aic3x_headset_detected':
    sound/soc/codecs/tlv320aic3x.c:1211: warning: 'val' may be used uninitialized in this function
    sound/soc/codecs/tlv320aic3x.c: In function 'aic3x_button_pressed':
    sound/soc/codecs/tlv320aic3x.c:1219: warning: 'val' may be used uninitialized in this function
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 5989f11ba11c72f98d57580b991418d9ff6a207d
Author: Raoul Bhatia <r.bhatia at ipax.at>
Date:   Thu Nov 25 17:32:47 2010 +0100

    EDAC: Fix typos in Documentation/edac.txt
    
    Fix trivial typos in edac.txt
    
    Signed-off-by: Raoul Bhatia <r.bhatia at ipax.at>
    Signed-off-by: Borislav Petkov <borislav.petkov at amd.com>

commit 8b6b30ab665d3bbb23180c39f6215e6f64516ed0
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 25 11:33:14 2010 +0800

    ASoC: davinci-vcif - fix a memory leak
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 09de9533348632fbbf32ce618f669882aa718817
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 25 15:14:03 2010 +0800

    ASoC: phycore-ac97: fix resource leak
    
    Fix imx_phycore_init() error path and imx_phycore_exit() to properly free
    allocated resources.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Sascha Hauer <s.hauer at pengutronix.de>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit ac8f924af555573e29b126ac5cef4fdd122ae517
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 25 15:13:09 2010 +0800

    ASoC: imx-ssi: fix resource leak
    
    Fix imx_ssi_probe() error path and imx_ssi_remove() to properly free
    allocated resources.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Sascha Hauer <s.hauer at pengutronix.de>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 14abca3dfc51c0a4f798183f131d63bfd6552bd4
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 25 15:12:30 2010 +0800

    ASoC: simone: fix resource leak in simone_init error path
    
    Fix the error path to properly free allocated resources.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Mika Westerberg <mika.westerberg at iki.fi>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit c7a734e58ed237ecac2608a70eb31ba64e21c768
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 25 15:11:03 2010 +0800

    ASoC: sam9g20_wm8731: fix resource leak in at91sam9g20ek_init error path
    
    Fix the error path to properly free allocated resources.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit b193deead8637291138a8c1c49753ee686fa5b17
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 25 10:44:59 2010 +0800

    ASoC: snd-soc-afeb9260: remove unneeded platform_device_del in error path
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 917dac0ff1754776b86967b0ec1750022d9c4265
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 25 15:08:31 2010 +0800

    ASoC: pcm030-audio-fabric: fix resource leak in pcm030_fabric_init error path
    
    Add missing platform_device_put() if platform_device_add() failed.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 4e1f86509732ccc39938974db0612d14afbca953
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 25 15:07:25 2010 +0800

    ASoC: efika-audio-fabric: fix resource leak in efika_fabric_init error path
    
    Add missing platform_device_put() if platform_device_add() failed.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 3b6bc354cb22b1069f88acdc7673d3476fbadfca
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 25 17:23:55 2010 +0800

    ASoC: Call snd_soc_unregister_dais instead of snd_soc_unregister_dai in sh4_soc_dai_remove
    
    We call snd_soc_register_dais() in sh4_soc_dai_probe(),
    thus we should call snd_soc_unregister_dais() in sh4_soc_dai_remove().
    
    Otherwise, we got "too many arguments to function 'snd_soc_unregister_dai'"
    error message.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 846172dfe33c7ee07638e04f94dd90e21dfdc5ba
Author: Dmitry Artamonow <mad_soft at inbox.ru>
Date:   Thu Nov 25 00:46:15 2010 +0300

    ASoC: fix SND_PXA2XX_LIB Kconfig warning
    
    Fix following warning observed when SND_PXA2XX_SOC is set and SND_ARM isn't:
    
    warning: (SND_PXA2XX_AC97 && SOUND && !M68K && SND && SND_ARM && ARCH_PXA ||
    SND_PXA2XX_SOC && SOUND && !M68K && SND && SND_SOC && ARCH_PXA) selects
    SND_PXA2XX_LIB which has unmet direct dependencies (SOUND && !M68K && SND &&
    SND_ARM)
    
    Signed-off-by: Dmitry Artamonow <mad_soft at inbox.ru>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 11cd1a8b8cad1acfc140d9acce93762a9c140b20
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Sun Nov 14 17:31:52 2010 +0200

    vhost/net: fix rcu check usage
    
    Incorrect rcu check was used as rcu isn't done
    under mutex here. Force check to 1 for now,
    to stop it from complaining.
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>

commit 4814a2b3c603438ed8c330c74b49aa662b1ede43
Author: Jan Glauber <jang at linux.vnet.ibm.com>
Date:   Thu Nov 25 09:52:46 2010 +0100

    [S390] qdio: free indicator after reset is finished
    
    The qdio device indicator is freed before the device is notified that
    the indicator is reset. This sequence contains a race when the freed
    indicator is used by a new device while the reset of the indicator is
    still pending. Do the reset operation before freeing the indicator to
    avoid that potential race.
    
    Signed-off-by: Jan Glauber <jang at linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit e8129c642155616d9e2160a75f103e127c8c3708
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Thu Nov 25 09:52:45 2010 +0100

    [S390] nmi: fix clock comparator revalidation
    
    On each machine check all registers are revalidated. The save area for
    the clock comparator however only contains the upper most seven bytes
    of the former contents, if valid.
    Therefore the machine check handler uses a store clock instruction to
    get the current time and writes that to the clock comparator register
    which in turn will generate an immediate timer interrupt.
    However within the lowcore the expected time of the next timer
    interrupt is stored. If the interrupt happens before that time the
    handler won't be called. In turn the clock comparator won't be
    reprogrammed and therefore the interrupt condition stays pending which
    causes an interrupt loop until the expected time is reached.
    
    On NOHZ machines this can result in unresponsive machines since the
    time of the next expected interrupted can be a couple of days in the
    future.
    
    To fix this just revalidate the clock comparator register with the
    expected value.
    In addition the special handling for udelay must be changed as well.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit e5843341e3ad8ff00332376cd0745026e4b5d45f
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date:   Wed Nov 24 09:48:10 2010 +0000

    dma: shdma: add a MODULE_ALIAS() to allow module autoloading
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 7167594a3da7dcc33203b85d62e519594baee390
Author: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Date:   Thu Nov 25 00:08:01 2010 -0200

    ALSA: hda - Fix ALC660-VD/ALC861-VD capture/playback mixers
    
    The mixer nids passed to alc_auto_create_input_ctls are wrong: 0x15 is
    a pin, and 0x09 is the ADC on both ALC660-VD/ALC861-VD. Thus with
    current code, input playback volume/switches and input source mixer
    controls are not created, and recording doesn't work. Select correct
    mixers, 0x0b (input playback mixer) and 0x22 (capture source mixer).
    
    Reference: https://qa.mandriva.com/show_bug.cgi?id=61159
    
    Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
    Cc: <stable at kernel.org>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 9adf262a9f81489635f7868c9819cb864192811b
Author: Abhilash Kesavan <a.kesavan at samsung.com>
Date:   Fri Oct 8 09:07:19 2010 +0530

    ARM: S5PV210: Fix sysdev related warning messages
    
    This patch fixes following warning messages when CONFIG_PM selected.
    
    In file included from arch/arm/mach-s5pv210/mach-smdkv210.c:34:
    arch/arm/plat-samsung/include/plat/pm.h:104: warning: 'struct sys_device'
    declared inside parameter list
    arch/arm/plat-samsung/include/plat/pm.h:104: warning: its scope is only this
    definition or declaration, which is probably not what you want
    arch/arm/plat-samsung/include/plat/pm.h:105: warning: 'struct sys_device'
    declared inside parameter list
    
    In file included from arch/arm/mach-s5pv210/mach-smdkc110.c:31:
    arch/arm/plat-samsung/include/plat/pm.h:104: warning: 'struct sys_device'
    declared inside parameter list
    arch/arm/plat-samsung/include/plat/pm.h:104: warning: its scope is only this
    definition or declaration, which is probably not what you want
    arch/arm/plat-samsung/include/plat/pm.h:105: warning: 'struct sys_device'
    declared inside parameter list
    
    Signed-off-by: Abhilash Kesavan <a.kesavan at samsung.com>
    Signed-off-by: Sangbeom Kim <sbkim73 at samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim at samsung.com>

commit 35bbcfe6dd283ab36b46ce7c0b79986acad7b20b
Author: Abhilash Kesavan <a.kesavan at samsung.com>
Date:   Thu Oct 21 06:45:48 2010 +0530

    ARM: S3C24XX: Fix UART3 submask on S3C2416 and S3C2443
    
    The UART3 submask should be 0x7 (SUBSRCPND[26:24]).
    
    Signed-off-by: Abhilash Kesavan <a.kesavan at samsung.com>
    Signed-off-by: Sangbeom Kim <sbkim73 at samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim at samsung.com>

commit 18ad782c7fdbbb6b9db9e8d912fee1d783fe79e0
Author: Abhilash Kesavan <a.kesavan at samsung.com>
Date:   Thu Oct 21 06:45:48 2010 +0530

    ARM: S3C24XX: Fix Demux error in UART3 irqs on S3C2443 and S3C2416
    
    IRQ_S3C2443_UART3 is being used as the base when it should actually
    be IRQ_S3C2443_RX3 on S3C2443 and S3C2416 for the UART3.
    
    Signed-off-by: Abhilash Kesavan <a.kesavan at samsung.com>
    Signed-off-by: Sangbeom Kim <sbkim73 at samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim at samsung.com>

commit 8b8c87dee47ae7e41af95d03ca56b3a4633466a6
Author: Darius Augulis <augulis.darius at gmail.com>
Date:   Tue Nov 16 18:08:50 2010 +0900

    ARM: S3C64XX: fix uart clock setup for mini6410/real6410
    
    Don't rewrite clock config in UCON preconfigured by
    bootloader. No need to set 10th bit in UCON because
    [11:10] 2'b00 means source clock is PCLK too.
    If set, console does not work if bootloader
    has preconfigured [11:10] with 2'b00.
    If not set, console works with any bootloader
    config value (2'bxx).
    More information about clock setup in UCON is available
    in "S3C6410X RISC Microprocessor User's Manual,
    Revision 1.20" p. 31-13 (Chapter 31.6.2
    UART CONTROL REGISTER).
    
    Signed-off-by: Darius Augulis <augulis.darius at gmail.com>
    Signed-off-by: Kukjin Kim <kgene.kim at samsung.com>

commit cce58ab380727169ef72b76481441f851e5850b0
Author: Kukjin Kim <kgene.kim at samsung.com>
Date:   Mon Nov 15 11:11:22 2010 +0900

    ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull
    
    This patch fixes wrong s3c_gpio_cfgpull with s3c_gpio_setpull.
    
    Cc: Ben Dooks <ben-linux at fluff.org>
    Signed-off-by: Kukjin Kim <kgene.kim at samsung.com>

commit 6fc50eafc49262e376455a480f9d793817fe74e2
Author: Vasily Khoruzhick <anarsoul at gmail.com>
Date:   Tue Nov 16 18:11:59 2010 +0900

    ARM: S3C2410: Adapt h1940-bluetooth to gpiolib changes
    
    Replace in s3c_gpio_cfgpull with s3c_gpio_setpull.
    
    Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>
    Signed-off-by: Kukjin Kim <kgene.kim at samsung.com>

commit 0d8e2d0dad98a693bad88aea6876ac8b94ad95c6
Author: Paul Walmsley <paul at pwsan.com>
Date:   Wed Nov 24 16:49:05 2010 -0700

    OMAP2+: PM/serial: hold console semaphore while OMAP UARTs are disabled
    
    The console semaphore must be held while the OMAP UART devices are
    disabled, lest a console write cause an ARM abort (and a kernel crash)
    when the underlying console device is inaccessible.  These crashes
    only occur when the console is on one of the OMAP internal serial
    ports.
    
    While this problem has been latent in the PM idle loop for some time,
    the crash was not triggerable with an unmodified kernel until commit
    6f251e9db1093c187addc309b5f2f7fe3efd2995 ("OMAP: UART: omap_device
    conversions, remove implicit 8520 assumptions").  After this patch, a
    console write often occurs after the console UART has been disabled in
    the idle loop, crashing the system.  Several users have encountered
    this bug:
    
        http://www.mail-archive.com/linux-omap@vger.kernel.org/msg38396.html
    
        http://www.mail-archive.com/linux-omap@vger.kernel.org/msg36602.html
    
    The same commit also introduced new code that disabled the UARTs
    during init, in omap_serial_init_port().  The kernel will also crash
    in this code when earlyconsole and extra debugging is enabled:
    
        http://www.mail-archive.com/linux-omap@vger.kernel.org/msg36411.html
    
    The minimal fix for the -rc series is to hold the console semaphore
    while the OMAP UARTs are disabled.  This is a somewhat overbroad fix,
    since the console may not be located on an OMAP UART, as is the case
    with the GPMC UART on Zoom3.  While it is technically possible to
    determine which devices the console or earlyconsole is actually
    running on, it is not a trivial problem to solve, and the code to do
    so is not really appropriate for the -rc series.
    
    The right long-term fix is to ensure that no code outside of the OMAP
    serial driver can disable an OMAP UART.  As I understand it, code to
    implement this is under development by TI.
    
    This patch is a collaboration between Paul Walmsley <paul at pwsan.com>
    and Tony Lindgren <tony at atomide.com>.  Thanks to Ming Lei
    <tom.leiming at gmail.com> and Pramod <pramod.gurav at ti.com> for their
    feedback on earlier versions of this patch.
    
    Signed-off-by: Paul Walmsley <paul at pwsan.com>
    Signed-off-by: Tony Lindgren <tony at atomide.com>
    Acked-by: Kevin Hilman <khilman at deeprootsystems.com>
    Cc: Ming Lei <tom.leiming at gmail.com>
    Cc: Pramod <pramod.gurav at ti.com>
    Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
    Cc: Jean Pihet <jean.pihet at newoldbits.com>
    Cc: Govindraj.R <govindraj.raja at ti.com>

commit f910043ce00791c06afc3789278447c4e88670ea
Author: Kevin Hilman <khilman at deeprootsystems.com>
Date:   Wed Nov 24 11:09:03 2010 -0800

    OMAP: UART: don't resume UARTs that are not enabled.
    
    Add additional check to omap_uart_resume_idle() so that only
    enabled (specifically, idle-enabled) UARTs are allowed to resume.
    This matches the existing check in prepare idle.
    
    Without this patch, the system will hang if a board is
    configured to register only some uarts instead of all of
    them and PM is enabled.
    
    Cc: Govindraj R. <govindraj.raja at ti.com>
    Signed-off-by: Kevin Hilman <khilman at deeprootsystems.com>
    [tony at atomide.com: updated description]
    Signed-off-by: Tony Lindgren <tony at atomide.com>

commit 698fd6a2c3ca05ec796072defb5c415289a86cdc
Merge: 8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47 32292f49f9683622ad0fb95a8c754910121e7b16
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 25 08:36:24 2010 +0900

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
      hwmon: (lis3lv02d_i2c) Fix compile warnings
      hwmon: (i5k_amb) Fix compile warning

commit 8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47
Merge: c12ae95ccc2dc80b4bd57363240cdb6eab2adcbc e6d4a76dbf2ff27314e09291dfb9e4afcb9ecd60
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 25 08:35:53 2010 +0900

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen: remove duplicated #include
      xen: x86/32: perform initial startup on initial_page_table

commit c12ae95ccc2dc80b4bd57363240cdb6eab2adcbc
Merge: 47143b094d4700842e42b0a7cc2548d7ae292690 3edabee2ed22ee4f98f4b4bb38a41059226a8446
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 25 07:42:32 2010 +0900

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
      arch/tile: fix memchr() not to dereference memory for zero length
      arch/tile: make glibc's sysconf(_SC_NPROCESSORS_CONF) work correctly
      arch/tile: fix rwlock so would-be write lockers don't block new readers

commit 47143b094d4700842e42b0a7cc2548d7ae292690
Merge: 0b9466ccea3c4ec363737288dd9467bf978c9c2d f02cbbe657939489347cbda598401a56913ffcbd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 25 07:42:03 2010 +0900

    Merge branch 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
    
    * 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
      pci root complex: support for tile architecture
      drivers/net/tile/: on-chip network drivers for the tile architecture
      MAINTAINERS: add drivers/char/hvc_tile.c as maintained by tile

commit 0b9466ccea3c4ec363737288dd9467bf978c9c2d
Merge: e5fa506173a6ed1ca8d78ba1e390cfdebc2fd49a 0e91ec0c06d2cd15071a6021c94840a50e6671aa
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 25 07:41:10 2010 +0900

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6482/2: Fix find_next_zero_bit and related assembly
      ARM: 6490/1: MM: bugfix: initialize spinlock for init_mm.context
      ARM: avoid annoying <4>'s in printk output
      SCSI: arm fas216: fix missing ';'
      ARM: avoid marking decompressor .stack section as having contents
      ARM: 6489/1: thumb2: fix incorrect optimisation in usracc
      ARM: 6488/1: nomadik: prevent sched_clock() wraparound
      ARM: 6484/1: fix compile warning in mm/init.c
      ARM: 6473/1: Small update to ux500 specific L2 cache code
      ARM: improve compiler's ability to optimize page tables
      mx25: fix spi device registration typo
      ARM i.MX27 eukrea: Fix compilation
      ARM i.MX spi: fix compilation for i.MX21
      ARM i.MX pcm037 eet: compile fixes
      ARM i.MX: sdma is merged, so remove #ifdef SDMA_IS_MERGED
      ARM mx3fb: check for DMA engine type
      mach-pcm037_eet: Fix section mismatch for eet_init_devices()

commit e5fa506173a6ed1ca8d78ba1e390cfdebc2fd49a
Merge: 3070fb888be52c5488976828ffc9f950872ffadc c07a1c6b0fc6408efda7b7f5d12f24a3eda6a5e8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 25 06:58:56 2010 +0900

    Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
    
    * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
      sisfb: delete osdef.h
      sisfb: move the CONFIG warning to sis_main.c
      sisfb: replace SiS_SetMemory with memset_io
      sisfb: remove InPort/OutPort wrappers
      sisfb: use CONFIG_FB_SIS_301/315 instead of SIS301/315H
      sisfb: delete redudant #define SIS_LINUX_KERNEL
      sisfb: delete dead SIS_XORG_XF86 code
      sisfb: delete fallback code for pci_map_rom()
      sisfb: delete obsolete PCI ROM bug workaround
      fbdev: Update documentation index file.
      lxfb: Program panel v/h sync output polarity correctly
      fbcmap: integer overflow bug
      fbcmap: cleanup white space in fb_alloc_cmap()
      MAINTAINERS: Add fbdev patchwork entry, tidy up file patterns.
      fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define
      fbdev: sh_mobile_lcdcfb: fix bug in reconfig()

commit 3070fb888be52c5488976828ffc9f950872ffadc
Merge: 68ca92aa1f980d91ac98f798b313b70864f60e4b dfcd6e438927ad8c54278e5b1a34a4fe76e57ad2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 25 06:58:19 2010 +0900

    Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: clkfwk: Build fix for non-legacy CPG changes.
      sh: Use GCC __builtin_prefetch() to implement prefetch().
      sh: fix vsyscall compilation due to .eh_frame issue
      sh: avoid to flush all cache in sys_cacheflush
      sh: clkfwk: Disable init clk op for non-legacy clocks.
      sh: clkfwk: Kill off now unused algo_id in set_rate op.
      sh: clkfwk: Kill off unused clk_set_rate_ex().

commit 68ca92aa1f980d91ac98f798b313b70864f60e4b
Merge: c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27 be20e6c67b6c6024c19094d3447f144d118733b0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 25 06:57:43 2010 +0900

    Merge branch 'for-linus' of git://neil.brown.name/md
    
    * 'for-linus' of git://neil.brown.name/md:
      md: Call blk_queue_flush() to establish flush/fua support
      md/raid1: really fix recovery looping when single good device fails.
      md: fix return value of rdev_size_change()

commit c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27
Merge: 91d95fda8594ce5e0ccd81381ee7b956cf513c59 be6528b2e58d92ef2ffed6f130e2d42bb85dbf29
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 25 06:57:11 2010 +0900

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      virtio: fix format of sysfs driver/vendor files
      Char: virtio_console, fix memory leak
      virtio: return correct capacity to users
      module: Update prototype for ref_module (formerly use_module)

commit 91d95fda8594ce5e0ccd81381ee7b956cf513c59
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed Nov 24 12:57:18 2010 -0800

    arch/x86/include/asm/fixmap.h: mark __set_fixmap_offset as __always_inline
    
    When compiling arch/x86/kernel/early_printk_mrst.c with i386
    allmodconfig, gcc-4.1.0 generates an out-of-line copy of
    __set_fixmap_offset() which contains a reference to
    __this_fixmap_does_not_exist which the compiler cannot elide.
    
    Marking __set_fixmap_offset() as __always_inline prevents this.
    
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Ingo Molnar <mingo at redhat.com>
    Cc: "H. Peter Anvin" <hpa at zytor.com>
    Cc: Feng Tang <feng.tang at intel.com>
    Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 27af038494ef2f3f3a23aa040bfc1ea29d99d76d
Author: Mel Gorman <mel at csn.ul.ie>
Date:   Wed Nov 24 12:57:17 2010 -0800

    scripts: fix gfp-translate for recent changes to gfp.h
    
    The recent changes to gfp.h to satisfy sparse broke scripts/gfp-translate.
    This patch fixes it up to work with old and new versions of gfp.h .
    
    [akpm at linux-foundation.org: use `grep -q', per WANG Cong]
    Signed-off-by: Mel Gorman <mel at csn.ul.ie>
    Cc: Namhyung Kim <namhyung at gmail.com>
    Reviewed-by: WANG Cong <xiyou.wangcong at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit da905873effecd1c0166e578bc4b5006f041b18b
Author: Frederic Weisbecker <fweisbec at gmail.com>
Date:   Wed Nov 24 12:57:15 2010 -0800

    reiserfs: fix inode mutex - reiserfs lock misordering
    
    reiserfs_unpack() locks the inode mutex with reiserfs_mutex_lock_safe()
    to protect against reiserfs lock dependency.  However this protection
    requires to have the reiserfs lock to be locked.
    
    This is the case if reiserfs_unpack() is called by reiserfs_ioctl but
    not from reiserfs_quota_on() when it tries to unpack tails of quota
    files.
    
    Fix the ordering of the two locks in reiserfs_unpack() to fix this
    issue.
    
    Signed-off-by: Frederic Weisbecker <fweisbec at gmail.com>
    Reported-by: Markus Gapp <markus.gapp at gmx.net>
    Reported-by: Jan Kara <jack at suse.cz>
    Cc: Jeff Mahoney <jeffm at suse.com>
    Cc: <stable at kernel.org>		[2.6.36.x]
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d1d73578e053b981c3611e5a211534290d24a5eb
Author: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
Date:   Wed Nov 24 12:57:14 2010 -0800

    backlight: grab ops_lock before testing bd->ops
    
    According to the comment describing ops_lock in the definition of struct
    backlight_device and when comparing with other functions in backlight.c
    the mutex must be hold when checking ops to be non-NULL.
    
    Fixes a problem added by c835ee7f4154992e6 ("backlight: Add suspend/resume
    support to the backlight core") in Jan 2009.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
    Acked-by: Richard Purdie <rpurdie at linux.intel.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b38eeaae267e4cd385ababcc2df82f6c46fc8633
Author: Axel Lin <axel.lin at gmail.com>
Date:   Wed Nov 24 12:57:14 2010 -0800

    drivers/misc/isl29020.c: remove incorrect kfree in isl29020_remove()
    
    struct als_data *data is not used in this driver at all.
    
    Also add a missing ">" character for MODULE_AUTHOR.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Alan Cox <alan at linux.intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ea251c1d5c481cda1cf6b0c9e4965f04a6cf2ffc
Author: Naoya Horiguchi <n-horiguchi at ah.jp.nec.com>
Date:   Wed Nov 24 12:57:13 2010 -0800

    pagemap: set pagemap walk limit to PMD boundary
    
    Currently one pagemap_read() call walks in PAGEMAP_WALK_SIZE bytes (== 512
    pages.) But there is a corner case where walk_pmd_range() accidentally
    runs over a VMA associated with a hugetlbfs file.
    
    For example, when a process has mappings to VMAs as shown below:
    
      # cat /proc/<pid>/maps
      ...
      3a58f6d000-3a58f72000 rw-p 00000000 00:00 0
      7fbd51853000-7fbd51855000 rw-p 00000000 00:00 0
      7fbd5186c000-7fbd5186e000 rw-p 00000000 00:00 0
      7fbd51a00000-7fbd51c00000 rw-s 00000000 00:12 8614   /hugepages/test
    
    then pagemap_read() goes into walk_pmd_range() path and walks in the range
    0x7fbd51853000-0x7fbd51a53000, but the hugetlbfs VMA should be handled by
    walk_hugetlb_range().  Otherwise PMD for the hugepage is considered bad
    and cleared, which causes undesirable results.
    
    This patch fixes it by separating pagemap walk range into one PMD.
    
    Signed-off-by: Naoya Horiguchi <n-horiguchi at ah.jp.nec.com>
    Cc: Jun'ichi Nomura <j-nomura at ce.jp.nec.com>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Cc: Matt Mackall <mpm at selenic.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5f0af70a25593a9d53b87bc8d31902fb7cc63e40
Author: David Sterba <dsterba at suse.cz>
Date:   Wed Nov 24 12:57:10 2010 -0800

    mm: remove call to find_vma in pagewalk for non-hugetlbfs
    
    Commit d33b9f45 ("mm: hugetlb: fix hugepage memory leak in
    walk_page_range()") introduces a check if a vma is a hugetlbfs one and
    later in 5dc37642 ("mm hugetlb: add hugepage support to pagemap") it is
    moved under #ifdef CONFIG_HUGETLB_PAGE but a needless find_vma call is
    left behind and its result is not used anywhere else in the function.
    
    The side-effect of caching vma for @addr inside walk->mm is neither
    utilized in walk_page_range() nor in called functions.
    
    Signed-off-by: David Sterba <dsterba at suse.cz>
    Reviewed-by: Naoya Horiguchi <n-horiguchi at ah.jp.nec.com>
    Acked-by: Andi Kleen <ak at linux.intel.com>
    Cc: Andy Whitcroft <apw at canonical.com>
    Cc: David Rientjes <rientjes at google.com>
    Cc: Hugh Dickins <hugh.dickins at tiscali.co.uk>
    Cc: Lee Schermerhorn <lee.schermerhorn at hp.com>
    Cc: Matt Mackall <mpm at selenic.com>
    Acked-by: Mel Gorman <mel at csn.ul.ie>
    Cc: Wu Fengguang <fengguang.wu at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e9959f0f37160e1f5351af828cc981712b5066c1
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Date:   Wed Nov 24 12:57:09 2010 -0800

    mm/page_alloc.c: fix build_all_zonelist() where percpu_alloc() is wrongly called under stop_machine_run()
    
    During memory hotplug, build_allzonelists() may be called under
    stop_machine_run().  In this function, setup_zone_pageset() is called.
    But it's bug because it will do page allocation under stop_machine_run().
    
    Here is a report from Alok Kataria.
    
      BUG: sleeping function called from invalid context at kernel/mutex.c:94
      in_atomic(): 0, irqs_disabled(): 1, pid: 4, name: migration/0
      Pid: 4, comm: migration/0 Not tainted 2.6.35.6-45.fc14.x86_64 #1
      Call Trace:
       [<ffffffff8103d12b>] __might_sleep+0xeb/0xf0
       [<ffffffff81468245>] mutex_lock+0x24/0x50
       [<ffffffff8110eaa6>] pcpu_alloc+0x6d/0x7ee
       [<ffffffff81048888>] ? load_balance+0xbe/0x60e
       [<ffffffff8103a1b3>] ? rt_se_boosted+0x21/0x2f
       [<ffffffff8103e1cf>] ? dequeue_rt_stack+0x18b/0x1ed
       [<ffffffff8110f237>] __alloc_percpu+0x10/0x12
       [<ffffffff81465e22>] setup_zone_pageset+0x38/0xbe
       [<ffffffff810d6d81>] ? build_zonelists_node.clone.58+0x79/0x8c
       [<ffffffff81452539>] __build_all_zonelists+0x419/0x46c
       [<ffffffff8108ef01>] ? cpu_stopper_thread+0xb2/0x198
       [<ffffffff8108f075>] stop_machine_cpu_stop+0x8e/0xc5
       [<ffffffff8108efe7>] ? stop_machine_cpu_stop+0x0/0xc5
       [<ffffffff8108ef57>] cpu_stopper_thread+0x108/0x198
       [<ffffffff81467a37>] ? schedule+0x5b2/0x5cc
       [<ffffffff8108ee4f>] ? cpu_stopper_thread+0x0/0x198
       [<ffffffff81065f29>] kthread+0x7f/0x87
       [<ffffffff8100aae4>] kernel_thread_helper+0x4/0x10
       [<ffffffff81065eaa>] ? kthread+0x0/0x87
       [<ffffffff8100aae0>] ? kernel_thread_helper+0x0/0x10
      Built 5 zonelists in Node order, mobility grouping on.  Total pages: 289456
      Policy zone: Normal
    
    This patch tries to fix the issue by moving setup_zone_pageset() out from
    stop_machine_run(). It's obviously not necessary to be called under
    stop_machine_run().
    
    [akpm at linux-foundation.org: remove unneeded local]
    Reported-by: Alok Kataria <akataria at vmware.com>
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Cc: Tejun Heo <tj at kernel.org>
    Cc: Petr Vandrovec <petr at vmware.com>
    Cc: Pekka Enberg <penberg at cs.helsinki.fi>
    Reviewed-by: Christoph Lameter <cl at linux-foundation.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a42c390cfa0c2612459d7226ba11612847ca3a64
Author: Michal Hocko <mhocko at suse.cz>
Date:   Wed Nov 24 12:57:08 2010 -0800

    cgroups: make swap accounting default behavior configurable
    
    Swap accounting can be configured by CONFIG_CGROUP_MEM_RES_CTLR_SWAP
    configuration option and then it is turned on by default.  There is a boot
    option (noswapaccount) which can disable this feature.
    
    This makes it hard for distributors to enable the configuration option as
    this feature leads to a bigger memory consumption and this is a no-go for
    general purpose distribution kernel.  On the other hand swap accounting
    may be very usuful for some workloads.
    
    This patch adds a new configuration option which controls the default
    behavior (CGROUP_MEM_RES_CTLR_SWAP_ENABLED).  If the option is selected
    then the feature is turned on by default.
    
    It also adds a new boot parameter swapaccount[=1|0] which enhances the
    original noswapaccount parameter semantic by means of enable/disable logic
    (defaults to 1 if no value is provided to be still consistent with
    noswapaccount).
    
    The default behavior is unchanged (if CONFIG_CGROUP_MEM_RES_CTLR_SWAP is
    enabled then CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is enabled as well)
    
    Signed-off-by: Michal Hocko <mhocko at suse.cz>
    Acked-by: Daisuke Nishimura <nishimura at mxp.nes.nec.co.jp>
    Cc: Balbir Singh <balbir at linux.vnet.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b1dd693e5b9348bd68a80e679e03cf9c0973b01b
Author: Daisuke Nishimura <nishimura at mxp.nes.nec.co.jp>
Date:   Wed Nov 24 12:57:06 2010 -0800

    memcg: avoid deadlock between move charge and try_charge()
    
    __mem_cgroup_try_charge() can be called under down_write(&mmap_sem)(e.g.
    mlock does it). This means it can cause deadlock if it races with move charge:
    
    Ex.1)
                    move charge             |        try charge
      --------------------------------------+------------------------------
        mem_cgroup_can_attach()             |  down_write(&mmap_sem)
          mc.moving_task = current          |    ..
          mem_cgroup_precharge_mc()         |  __mem_cgroup_try_charge()
            mem_cgroup_count_precharge()    |    prepare_to_wait()
              down_read(&mmap_sem)          |    if (mc.moving_task)
              -> cannot aquire the lock     |    -> true
                                            |      schedule()
    
    Ex.2)
                    move charge             |        try charge
      --------------------------------------+------------------------------
        mem_cgroup_can_attach()             |
          mc.moving_task = current          |
          mem_cgroup_precharge_mc()         |
            mem_cgroup_count_precharge()    |
              down_read(&mmap_sem)          |
              ..                            |
              up_read(&mmap_sem)            |
                                            |  down_write(&mmap_sem)
        mem_cgroup_move_task()              |    ..
          mem_cgroup_move_charge()          |  __mem_cgroup_try_charge()
            down_read(&mmap_sem)            |    prepare_to_wait()
            -> cannot aquire the lock       |    if (mc.moving_task)
                                            |    -> true
                                            |      schedule()
    
    To avoid this deadlock, we do all the move charge works (both can_attach() and
    attach()) under one mmap_sem section.
    And after this patch, we set/clear mc.moving_task outside mc.lock, because we
    use the lock only to check mc.from/to.
    
    Signed-off-by: Daisuke Nishimura <nishimura at mxp.nes.nec.co.jp>
    Cc: Balbir Singh <balbir at linux.vnet.ibm.com>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 11e7946f196e5fdde20584e3e58c60335ee3b3bc
Author: Samu Onkalo <samu.p.onkalo at nokia.com>
Date:   Wed Nov 24 12:57:05 2010 -0800

    drivers/leds/leds-lp5523.c: perform SW reset before detection
    
    Chip detection may fail if the chip is in some odd state for example after
    system restart.  Chip doesn't have HW reset line.
    
    Signed-off-by: Samu Onkalo <samu.p.onkalo at nokia.com>
    Cc: Richard Purdie <rpurdie at rpsys.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 95ea8eec341c1fc881407c96114de7e4173c1b7c
Author: Samu Onkalo <samu.p.onkalo at nokia.com>
Date:   Wed Nov 24 12:57:05 2010 -0800

    drivers/leds/leds-lp5521.c: perform SW reset before detection
    
    Chip detection may fail if the chip is in some odd state for example after
    system restart.  Chip doesn't have HW reset line.
    
    Signed-off-by: Samu Onkalo <samu.p.onkalo at nokia.com>
    Cc: Richard Purdie <rpurdie at rpsys.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2e4840edb7c485211993919a6a50d93c108198b8
Author: Samu Onkalo <samu.p.onkalo at nokia.com>
Date:   Wed Nov 24 12:57:04 2010 -0800

    drivers/leds/leds-lp5523.c: adjust delays and add comments to them
    
    Delays were little bit too long.  Adjust delay times and add some comments
    to them.
    
    Signed-off-by: Samu Onkalo <samu.p.onkalo at nokia.com>
    Cc: Richard Purdie <rpurdie at rpsys.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 09c76b0f6e8fcd78f2d194acb1f07e41789cc29b
Author: Samu Onkalo <samu.p.onkalo at nokia.com>
Date:   Wed Nov 24 12:57:03 2010 -0800

    drivers/leds/leds-lp5521.c: adjust delays and add comments to them
    
    Delays were little bit too long.  Adjust delay times and add some comments
    to them.
    
    Signed-off-by: Samu Onkalo <samu.p.onkalo at nokia.com>
    Cc: Richard Purdie <rpurdie at rpsys.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 87dbf6234d965851e7e13cbe80ad439f5fcb99c8
Author: Samu Onkalo <samu.p.onkalo at nokia.com>
Date:   Wed Nov 24 12:57:03 2010 -0800

    drivers/leds/leds-lp5523.c: change some macros to functions
    
    A small macro changed to inline function to have proper type checking.
    Inline added to two similar small functions.
    
    Signed-off-by: Samu Onkalo <samu.p.onkalo at nokia.com>
    Cc: Richard Purdie <rpurdie at rpsys.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9fdb18b6cb225fa7a874985fcb4a370cce1ac086
Author: Samu Onkalo <samu.p.onkalo at nokia.com>
Date:   Wed Nov 24 12:57:02 2010 -0800

    drivers/leds/leds-lp5521.c: change some macros to functions
    
    Some small macros changed to inline functions to have proper type
    checking.
    
    Signed-off-by: Samu Onkalo <samu.p.onkalo at nokia.com>
    Cc: Richard Purdie <rpurdie at rpsys.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a0822c55779d9319939eac69f00bb729ea9d23da
Author: Ken Sumrall <ksumrall at android.com>
Date:   Wed Nov 24 12:57:00 2010 -0800

    fuse: fix attributes after open(O_TRUNC)
    
    The attribute cache for a file was not being cleared when a file is opened
    with O_TRUNC.
    
    If the filesystem's open operation truncates the file ("atomic_o_trunc"
    feature flag is set) then the kernel should invalidate the cached st_mtime
    and st_ctime attributes.
    
    Also i_size should be explicitly be set to zero as it is used sometimes
    without refreshing the cache.
    
    Signed-off-by: Ken Sumrall <ksumrall at android.com>
    Cc: Anfei <anfei.zhou at gmail.com>
    Cc: "Anand V. Avati" <avati at gluster.com>
    Signed-off-by: Miklos Szeredi <miklos at szeredi.hu>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c22c7aeff69796f46ae0fcec141538e28f50b24e
Author: Robin at sgi.com <Robin at sgi.com>
Date:   Wed Nov 24 12:56:59 2010 -0800

    sgi-xpc: XPC fails to discover partitions with all nasids above 128
    
    UV hardware defines 256 memory protection regions versus the baseline 64
    with increasing size for the SN2 ia64.  This was overlooked when XPC was
    modified to accomodate both UV and SN2.
    
    Without this patch, a user could reconfigure their existing system and
    suddenly disable cross-partition communications with no indication of what
    has gone wrong.  It also prevents larger configurations from using
    cross-partition communication.
    
    Signed-off-by: Robin Holt <holt at sgi.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 112bc2e120a94a511858918d6866a4978f9c500e
Author: Kirill A. Shutemov <kirill at shutemov.name>
Date:   Wed Nov 24 12:56:58 2010 -0800

    memcg: fix false positive VM_BUG on non-SMP
    
    Fix this:
    
      kernel BUG at mm/memcontrol.c:2155!
      invalid opcode: 0000 [#1]
      last sysfs file:
    
      Pid: 18, comm: sh Not tainted 2.6.37-rc3 #3 /Bochs
      EIP: 0060:[<c10731b2>] EFLAGS: 00000246 CPU: 0
      EIP is at mem_cgroup_move_account+0xe2/0xf0
      EAX: 00000004 EBX: c6f931d4 ECX: c681c300 EDX: c681c000
      ESI: c681c300 EDI: ffffffea EBP: c681c000 ESP: c46f3e30
       DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
      Process sh (pid: 18, ti=c46f2000 task=c6826e60 task.ti=c46f2000)
      Stack:
       00000155 c681c000 0805f000 c46ee180 c46f3e5c c7058820 c1074d37 00000000
       08060000 c46db9a0 c46ec080 c7058820 0805f000 08060000 c46f3e98 c1074c50
       c106c75e c46f3e98 c46ec080 08060000 0805ffff c46db9a0 c46f3e98 c46e0340
      Call Trace:
       [<c1074d37>] ? mem_cgroup_move_charge_pte_range+0xe7/0x130
       [<c1074c50>] ? mem_cgroup_move_charge_pte_range+0x0/0x130
       [<c106c75e>] ? walk_page_range+0xee/0x1d0
       [<c10725d6>] ? mem_cgroup_move_task+0x66/0x90
       [<c1074c50>] ? mem_cgroup_move_charge_pte_range+0x0/0x130
       [<c1072570>] ? mem_cgroup_move_task+0x0/0x90
       [<c1042616>] ? cgroup_attach_task+0x136/0x200
       [<c1042878>] ? cgroup_tasks_write+0x48/0xc0
       [<c1041e9e>] ? cgroup_file_write+0xde/0x220
       [<c101398d>] ? do_page_fault+0x17d/0x3f0
       [<c108a79d>] ? alloc_fd+0x2d/0xd0
       [<c1041dc0>] ? cgroup_file_write+0x0/0x220
       [<c1077ba2>] ? vfs_write+0x92/0xc0
       [<c1077c81>] ? sys_write+0x41/0x70
       [<c1140e3d>] ? syscall_call+0x7/0xb
      Code: 03 00 74 09 8b 44 24 04 e8 1c f1 ff ff 89 73 04 8d 86 b0 00 00 00 b9 01 00 00 00 89 da 31 ff e8 65 f5 ff ff e9 4d ff ff ff 0f 0b <0f> 0b 0f 0b 0f 0b 90 8d b4 26 00 00 00 00 83 ec 10 8b 0d f4 e3
      EIP: [<c10731b2>] mem_cgroup_move_account+0xe2/0xf0 SS:ESP 0068:c46f3e30
      ---[ end trace 7daa1582159b6532 ]---
    
    lock_page_cgroup and unlock_page_cgroup are implemented using
    bit_spinlock.  bit_spinlock doesn't touch the bit if we are on non-SMP
    machine, so we can't use the bit to check whether the lock was taken.
    
    Let's introduce is_page_cgroup_locked based on bit_spin_is_locked instead
    of PageCgroupLocked to fix it.
    
    [akpm at linux-foundation.org: s/is_page_cgroup_locked/page_is_cgroup_locked/]
    Signed-off-by: Kirill A. Shutemov <kirill at shutemov.name>
    Reviewed-by: Johannes Weiner <hannes at cmpxchg.org>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujtisu.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 69e83dad5207f8f03c9699e57e1febb114383cb8
Author: Will Newton <will.newton at gmail.com>
Date:   Wed Nov 24 12:56:55 2010 -0800

    uml: disable winch irq before freeing handler data
    
    Disable the winch irq early to make sure we don't take an interrupt part
    way through the freeing of the handler data, resulting in a crash on
    shutdown:
    
      winch_interrupt : read failed, errno = 9
      fd 13 is losing SIGWINCH support
      ------------[ cut here ]------------
      WARNING: at lib/list_debug.c:48 list_del+0xc6/0x100()
      list_del corruption, next is LIST_POISON1 (00100100)
      082578c8:  [<081fd77f>] dump_stack+0x22/0x24
      082578e0:  [<0807a18a>] warn_slowpath_common+0x5a/0x80
      08257908:  [<0807a23e>] warn_slowpath_fmt+0x2e/0x30
      08257920:  [<08172196>] list_del+0xc6/0x100
      08257940:  [<08060244>] free_winch+0x14/0x80
      08257958:  [<080606fb>] winch_interrupt+0xdb/0xe0
      08257978:  [<080a65b5>] handle_IRQ_event+0x35/0xe0
      08257998:  [<080a8717>] handle_edge_irq+0xb7/0x170
      082579bc:  [<08059bc4>] do_IRQ+0x34/0x50
      082579d4:  [<08059e1b>] sigio_handler+0x5b/0x80
      082579ec:  [<0806a374>] sig_handler_common+0x44/0xb0
      08257a68:  [<0806a538>] sig_handler+0x38/0x50
      08257a78:  [<0806a77c>] handle_signal+0x5c/0xa0
      08257a9c:  [<0806be28>] hard_handler+0x18/0x20
      08257aac:  [<00c14400>] 0xc14400
    
    Signed-off-by: Will Newton <will.newton at gmail.com>
    Acked-by: WANG Cong <xiyou.wangcong at gmail.com>
    Cc: Jeff Dike <jdike at addtoit.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 04c3496152394d17e3bc2316f9731ee3e8a026bc
Author: Steven J. Magnani <steve at digidescorp.com>
Date:   Wed Nov 24 12:56:54 2010 -0800

    nommu: yield CPU while disposing VM
    
    Depending on processor speed, page size, and the amount of memory a
    process is allowed to amass, cleanup of a large VM may freeze the system
    for many seconds.  This can result in a watchdog timeout.
    
    Make sure other tasks receive some service when cleaning up large VMs.
    
    Signed-off-by: Steven J. Magnani <steve at digidescorp.com>
    Cc: Greg Ungerer <gerg at snapgear.com>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3a3a1af37f0405d15c0b64a6ce7f4878084442e0
Author: Loïc Minier <loic.minier at linaro.org>
Date:   Wed Nov 24 12:56:53 2010 -0800

    include/linux/fs.h: fix userspace build
    
    dpkg uses fiemap but didn't particularly need to include stdint.h so far.
    Since 367a51a33902 ("fs: Add FITRIM ioctl"), build of linux/fs.h failed in
    dpkg with:
    
      In file included from ../../src/filesdb.c:27:0:
      /usr/include/linux/fs.h:37:2: error: expected specifier-qualifier-list before 'uint64_t'
    
    Use exportable type __u64 to avoid the dependency on stdint.h.
    
    b31d42a5af18 ("Fix compile brekage with !CONFIG_BLOCK") fixed only the
    kernel build by including linux/types.h, but this also fixed "make
    headers_check", so don't revert it.
    
    Signed-off-by: Loïc Minier <loic.minier at linaro.org>
    Tested-by: Arnd Bergmann <arnd.bergmann at linaro.org>
    Cc: Lukas Czerner <lczerner at redhat.com>
    Cc: Dmitry Monakhov <dmonakhov at openvz.org>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 50d431e8a15701b599c98afe2b464eb33c952477
Author: Steven Rostedt <rostedt at goodmis.org>
Date:   Wed Nov 24 12:56:52 2010 -0800

    leds: fix bug with reading NAS SS4200 dmi code
    
    While running randconfg with ktest.pl I stumbled upon this bug:
    
      BUG: unable to handle kernel NULL pointer dereference at 0000000000000003
      IP: [<ffffffff815fe44f>] strstr+0x39/0x86
      PGD 0
      Oops: 0000 [#1] SMP
      last sysfs file:
      CPU 0
      Modules linked in:
    
      Pid: 1, comm: swapper Not tainted 2.6.37-rc1-test+ #6 DG965MQ/
      RIP: 0010:[<ffffffff815fe44f>]  [<ffffffff815fe44f>] strstr+0x39/0x86
      RSP: 0018:ffff8800797cbd80  EFLAGS: 00010213
      RAX: 0000000000000000 RBX: 0000000000000003 RCX: ffffffffffffffff
      RDX: 0000000000000000 RSI: ffffffff82eb7ac9 RDI: 0000000000000003
      RBP: ffff8800797cbda0 R08: ffff880000000003 R09: 0000000000030725
      R10: ffff88007d294c00 R11: 0000000000014c00 R12: 0000000000000020
      R13: ffffffff82eb7ac9 R14: ffffffffffffffff R15: ffffffff82eb7b08
      FS:  0000000000000000(0000) GS:ffff88007d200000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
      CR2: 0000000000000003 CR3: 0000000002a1d000 CR4: 00000000000006f0
      DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      Process swapper (pid: 1, threadinfo ffff8800797ca000, task ffff8800797d0000)
      Stack:
       00000000000000ba ffffffff82eb7ac9 ffffffff82eb7ab8 00000000000000ba
       ffff8800797cbdf0 ffffffff81e2050f ffff8800797cbdc0 00000000815f913b
       ffff8800797cbe00 ffffffff82eb7ab8 0000000000000000 0000000000000000
      Call Trace:
       [<ffffffff81e2050f>] dmi_matches+0x117/0x154
       [<ffffffff81e205d7>] dmi_check_system+0x3d/0x8d
       [<ffffffff82e1ad25>] ? nas_gpio_init+0x0/0x2c8
       [<ffffffff82e1ad49>] nas_gpio_init+0x24/0x2c8
       [<ffffffff820d750d>] ? wm8350_led_init+0x0/0x20
       [<ffffffff82e1ad25>] ? nas_gpio_init+0x0/0x2c8
       [<ffffffff810022f7>] do_one_initcall+0xab/0x1b2
       [<ffffffff82da749c>] kernel_init+0x248/0x331
       [<ffffffff8100e624>] kernel_thread_helper+0x4/0x10
       [<ffffffff82da7254>] ? kernel_init+0x0/0x331
    
    Found that the nas_led_whitelist dmi_system_id structure array had no
    NULL end delimiter, causing the dmi_check_system() loop to read an
    undefined entry.
    
    Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
    Acked-by: Dave Hansen <dave at sr71.net>
    Acked-by: Richard Purdie <rpurdie at linux.intel.com>
    Acked-by: Arjan van de Ven <arjan at linux.intel.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0e91ec0c06d2cd15071a6021c94840a50e6671aa
Author: James Jones <jajones at nvidia.com>
Date:   Wed Nov 24 00:21:37 2010 +0100

    ARM: 6482/2: Fix find_next_zero_bit and related assembly
    
    The find_next_bit, find_first_bit, find_next_zero_bit
    and find_first_zero_bit functions were not properly
    clamping to the maxbit argument at the bit level. They
    were instead only checking maxbit at the byte level.
    To fix this, add a compare and a conditional move
    instruction to the end of the common bit-within-the-
    byte code used by all the functions and be sure not to
    clobber the maxbit argument before it is used.
    
    Cc: <stable at kernel.org>
    Reviewed-by: Nicolas Pitre <nicolas.pitre at linaro.org>
    Tested-by: Stephen Warren <swarren at nvidia.com>
    Signed-off-by: James Jones <jajones at nvidia.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit a27e13d370415add3487949c60810e36069a23a6
Author: Phil Blundell <philb at gnu.org>
Date:   Wed Nov 24 11:51:47 2010 -0800

    econet: fix CVE-2010-3848
    
    Don't declare variable sized array of iovecs on the stack since this
    could cause stack overflow if msg->msgiovlen is large.  Instead, coalesce
    the user-supplied data into a new buffer and use a single iovec for it.
    
    Signed-off-by: Phil Blundell <philb at gnu.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 16c41745c7b92a243d0874f534c1655196c64b74
Author: Phil Blundell <philb at gnu.org>
Date:   Wed Nov 24 11:49:53 2010 -0800

    econet: fix CVE-2010-3850
    
    Add missing check for capable(CAP_NET_ADMIN) in SIOCSIFADDR operation.
    
    Signed-off-by: Phil Blundell <philb at gnu.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit fa0e846494792e722d817b9d3d625a4ef4896c96
Author: Phil Blundell <philb at gnu.org>
Date:   Wed Nov 24 11:49:19 2010 -0800

    econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
    
    Later parts of econet_sendmsg() rely on saddr != NULL, so return early
    with EINVAL if NULL was passed otherwise an oops may occur.
    
    Signed-off-by: Phil Blundell <philb at gnu.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c39508d6f118308355468314ff414644115a07f3
Author: David S. Miller <davem at davemloft.net>
Date:   Wed Nov 24 11:47:22 2010 -0800

    tcp: Make TCP_MAXSEG minimum more correct.
    
    Use TCP_MIN_MSS instead of constant 64.
    
    Reported-by: Min Zhang <mzhang at mvista.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 4448008eb12f4b6bb9993584de8ec1d20b708d6f
Author: Steven Rostedt <rostedt at goodmis.org>
Date:   Wed Nov 24 11:19:05 2010 -0800

    isdn: icn: Fix stack corruption bug.
    
    Running randconfig with ktest.pl I hit this bug:
    
    [   16.101158] ICN-ISDN-driver Rev 1.65.6.8 mem=0x000d0000
    [   16.106376] icn: (line0) ICN-2B, port 0x320 added
    [   16.111064] Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: c1642880
    [   16.111066]
    [   16.121214] Pid: 1, comm: swapper Not tainted 2.6.37-rc2-test-00124-g6656b3f #8
    [   16.128499] Call Trace:
    [   16.130942]  [<c0f51662>] ? printk+0x1d/0x23
    [   16.135200]  [<c0f5153f>] panic+0x5c/0x162
    [   16.139286]  [<c0d62a9a>] ? icn_addcard+0x6d/0xbe
    [   16.143975]  [<c0445783>] print_tainted+0x0/0x8c
    [   16.148582]  [<c1642880>] ? icn_init+0xd8/0xdf
    [   16.153012]  [<c1642880>] icn_init+0xd8/0xdf
    [   16.157271]  [<c04012e5>] do_one_initcall+0x8c/0x143
    [   16.162222]  [<c16427a8>] ? icn_init+0x0/0xdf
    [   16.166566]  [<c15f1a05>] kernel_init+0x13f/0x1da
    [   16.171256]  [<c15f18c6>] ? kernel_init+0x0/0x1da
    [   16.175945]  [<c0403bfe>] kernel_thread_helper+0x6/0x10
    [   16.181181] panic occurred, switching back to text console
    
    Looking into it I found that the stack was corrupted by the assignment
    of the Rev #. The variable rev is given 10 bytes, and in this output the
    characters that were copied was: " 1.65.6.8 $". Which was 11 characters
    plus the null ending character for a total of 12 bytes, thus corrupting
    the stack.
    
    This patch ups the variable size to 20 bytes as well as changes the
    strcpy to strncpy. I also added a check to make sure '$' is found.
    
    Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3edabee2ed22ee4f98f4b4bb38a41059226a8446
Author: Chris Metcalf <cmetcalf at tilera.com>
Date:   Wed Nov 24 13:57:42 2010 -0500

    arch/tile: fix memchr() not to dereference memory for zero length
    
    This change fixes a bug that memchr() will read the first word
    of the source even if the length is zero.  Ironically, the code
    was originally written with a test to avoid exactly this problem,
    but to make the code conform to Linux coding standards with all
    declarations preceding all statements, the first load from memory
    was moved up above that test as the initial value for a variable.
    
    The change just moves all the variable declarations to the top
    of the file, with no initializers, so that the test can also be
    at the top of the file.
    
    Signed-off-by: Chris Metcalf <cmetcalf at tilera.com>

commit 4d658d13c90f14cf3510ca15cafe2f4aa9e23d64
Author: Chris Metcalf <cmetcalf at tilera.com>
Date:   Wed Nov 24 13:42:15 2010 -0500

    arch/tile: make glibc's sysconf(_SC_NPROCESSORS_CONF) work correctly
    
    glibc assumes that it can count /sys/devices/system/cpu/cpu* to get
    the number of configured cpus.  For this to be valid on tile, we need
    to generate a "cpu" entry for all cpus, including the ones that are
    not currently allocated for Linux's use.
    
    Signed-off-by: Chris Metcalf <cmetcalf at tilera.com>

commit b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f
Merge: 24f3f6b5eff92608a62449e33bfac0eed1447d02 3561d43fd289f590fdae672e5eb831b8d5cf0bf6
Author: Chris Metcalf <cmetcalf at tilera.com>
Date:   Wed Nov 24 13:30:28 2010 -0500

    Merge branch 'master' into for-linus

commit f02cbbe657939489347cbda598401a56913ffcbd
Author: Chris Metcalf <cmetcalf at tilera.com>
Date:   Tue Nov 2 12:05:10 2010 -0400

    pci root complex: support for tile architecture
    
    This change enables PCI root complex support for TILEPro.  Unlike
    TILE-Gx, TILEPro has no support for memory-mapped I/O, so the PCI
    support consists of hypervisor upcalls for PIO, DMA, etc.  However,
    the performance is fine for the devices we have tested with so far
    (1Gb Ethernet, SATA, etc.).
    
    The <asm/io.h> header was tweaked to be a little bit more aggressive
    about disabling attempts to map/unmap IO port space.  The hacky
    <asm/pci-bridge.h> header was rolled into the <asm/pci.h> header
    and the result was simplified.  Both of the latter two headers were
    preliminary versions not meant for release before now - oh well.
    
    There is one quirk for our TILEmpower platform, which accidentally
    negotiates up to 5GT and needs to be kicked down to 2.5GT.
    
    Signed-off-by: Chris Metcalf <cmetcalf at tilera.com>

commit e5a06939736277c54a68ae275433db55b99d187c
Author: Chris Metcalf <cmetcalf at tilera.com>
Date:   Mon Nov 1 17:00:37 2010 -0400

    drivers/net/tile/: on-chip network drivers for the tile architecture
    
    This change adds the first network driver for the tile architecture,
    supporting the on-chip XGBE and GBE shims.
    
    The infrastructure is present for the TILE-Gx networking drivers (another
    three source files in the new directory) but for now the the actual
    tilegx sources are waiting on releasing hardware to initial customers.
    
    Note that arch/tile/include/hv/* are "upstream" headers from the
    Tilera hypervisor and will probably benefit less from LKML review.
    
    Signed-off-by: Chris Metcalf <cmetcalf at tilera.com>

commit ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 24 17:37:17 2010 +0000

    drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
    
    Commit d09c23de intended to add a 30ms delay to give the ADD time to
    detect any TVs connected. However, it used the sdvo->is_tv flag to do so
    which is dependent upon the previous detection result and not whether the
    output supports TVs.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: stable at kernel.org

commit 66fc5dff5e4f82c92723202a5de9bdec16a9331f
Merge: 9915672d41273f5b77f1b3c29b391ffb7732b84b e476a5a41ad67d0e2b4a652820c49a3923eb936b
Author: David S. Miller <davem at davemloft.net>
Date:   Wed Nov 24 09:16:14 2010 -0800

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 9915672d41273f5b77f1b3c29b391ffb7732b84b
Author: Eric Dumazet <eric.dumazet at gmail.com>
Date:   Wed Nov 24 09:15:27 2010 -0800

    af_unix: limit unix_tot_inflight
    
    Vegard Nossum found a unix socket OOM was possible, posting an exploit
    program.
    
    My analysis is we can eat all LOWMEM memory before unix_gc() being
    called from unix_release_sock(). Moreover, the thread blocked in
    unix_gc() can consume huge amount of time to perform cleanup because of
    huge working set.
    
    One way to handle this is to have a sensible limit on unix_tot_inflight,
    tested from wait_for_unix_gc() and to force a call to unix_gc() if this
    limit is hit.
    
    This solves the OOM and also reduce overall latencies, and should not
    slowdown normal workloads.
    
    Reported-by: Vegard Nossum <vegard.nossum at gmail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e6d4a76dbf2ff27314e09291dfb9e4afcb9ecd60
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date:   Sat Nov 20 20:05:46 2010 +0800

    xen: remove duplicated #include
    
    Remove duplicated #include('s) in
      arch/x86/xen/setup.c
    
    Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>

commit 5b5c1af104ab5adec1be9dcb4c787492d83d8d83
Author: Ian Campbell <ian.campbell at citrix.com>
Date:   Wed Nov 24 12:09:41 2010 +0000

    xen: x86/32: perform initial startup on initial_page_table
    
    Only make swapper_pg_dir readonly and pinned when generic x86 architecture code
    (which also starts on initial_page_table) switches to it.  This helps ensure
    that the generic setup paths work on Xen unmodified. In particular
    clone_pgd_range writes directly to the destination pgd entries and is used to
    initialise swapper_pg_dir so we need to ensure that it remains writeable until
    the last possible moment during bring up.
    
    This is complicated slightly by the need to avoid sharing kernel PMD entries
    when running under Xen, therefore the Xen implementation must make a copy of
    the kernel PMD (which is otherwise referred to by both intial_page_table and
    swapper_pg_dir) before switching to swapper_pg_dir.
    
    Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
    Tested-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
    Cc: Borislav Petkov <bp at alien8.de>
    Cc: H. Peter Anvin <hpa at linux.intel.com>
    Cc: Jeremy Fitzhardinge <jeremy at goop.org>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>

commit 53c96dfdd0c0ccbba7aee84c60ce0f2aa466413f
Author: Zeng Zhaoming <zengzm.kernel at gmail.com>
Date:   Fri Nov 19 00:46:19 2010 +0800

    ACPI, hp-wmi: Fix memory leak in acpi query
    
    Free acpi return memory after query.
    
    Signed-off-by: Zeng Zhaoming <zengzm.kernel at gmail.com>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit a80e1cd70144fe7727f2e2d838611b6b8cf8a6d5
Author: Anisse Astier <anisse at astier.eu>
Date:   Thu Nov 18 13:00:54 2010 +0100

    msi-wmi: fix semantically incorrect use of keycode instead of scancode
    
    I didn't know the difference between the two when I wrote this code in
    commit c30116c6f0d26cd6e46dfa578163d573ef4730b2.
    
    Signed-off-by: Anisse Astier <anisse at astier.eu>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit 92f61cbc614fb422759790739cbd3e5a68c9a6fc
Author: Anisse Astier <anisse at astier.eu>
Date:   Thu Nov 18 13:00:53 2010 +0100

    msi-wmi: Add mute key support
    
    Add new MUTE key seen on Medion Akoya AIO PC P4010D using MSI motherboard
    (Product Name: MS-7621)
    
    Reported-and-tested-by: Mark Huijgen <mark.sf.net at huijgen.tk>
    Signed-off-by: Anisse Astier <anisse at astier.eu>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit ba1ff5be52163a97ac4ce8bc51beae2c96861a43
Author: Corentin Chary <corentincj at iksaif.net>
Date:   Sun Nov 14 17:40:12 2010 +0100

    asus-laptop: add wimax and wwan support
    
    Asus UL30A has a 3G chip, but the radio is disabled by default.
    The DSDT also reference a WIMAX device, which is not present on this model.
    
    This patch adds two new files: wwan and wimax to control WWAN and
    WIMAX devices. It does not use rfkill, because like WLED and BLED,
    we don't know yet that the two ACPI functions will always control the
    radio, they may control only the leds on some hardware.
    
    We may add rfkill switchs later.
    
    Signed-off-by: Corentin Chary <corentincj at iksaif.net>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit 67fa38ec097a3e270ab175636338185017b49fa7
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date:   Wed Nov 3 11:14:01 2010 -0700

    eeepc-wmi: fix compiler warning
    
    This fixes the following:
    
      CC [M]  drivers/platform/x86/eeepc-wmi.o
    drivers/platform/x86/eeepc-wmi.c:322: warning: initialization from incompatible pointer type
    
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit 1d37db77c1aa199ae9a4114af7c0412c8417e949
Author: Vernon Mauery <vernux at us.ibm.com>
Date:   Tue Nov 2 13:08:11 2010 -0700

    ibm_rtl: _RTL_ is not available in UEFI mode
    
    Some of the IBM servers that are supported by ibm_rtl
    can run in both Legacy mode (BIOS) and in UEFI mode.
    When running in UEFI mode, it is possible that the
    EBDA table exists but cannot be mapped and reports
    errors.  We need to make sure that by default we don't
    try to probe the machines if they are running in UEFI
    mode.
    
    Signed-off-by: Vernon Mauery <vernux at us.ibm.com>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit a2262260f9eaee4acd56b5624b5d2bf4be9bb38a
Author: Vernon Mauery <vernux at us.ibm.com>
Date:   Tue Nov 2 13:08:10 2010 -0700

    ibm_rtl: Loosen the DMI criteria to all IBM machines
    
    Allow all IBM machines to pass the DMI check so that we
    don't have to add them one by one to the driver.  Any IBM
    machine that has the _RTL_ table in the EBDA will work.
    
    Signed-off-by: Vernon Mauery <vernux at us.ibm.com>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit d41014b92d60a6b375aad9b6ebc52201ee58df70
Author: Julia Lawall <julia at diku.dk>
Date:   Tue Oct 26 12:25:37 2010 +0200

    drivers/platform/x86/thinkpad_acpi.c: delete double assignment
    
    Delete successive assignments to the same location.
    
    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression i;
    @@
    
    *i = ...;
     i = ...;
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia at diku.dk>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit e599ab2556006398ba9aad536a58eedad515e807
Author: Chris Bagwell <chris at cnpbagwell.com>
Date:   Mon Oct 25 21:08:39 2010 -0500

    eeepc-wmi: add cpufv sysfs documentation
    
    Based on cpufv text from sysfs-platform-eeepc-laptop that
    has almost same behavior.
    
    Signed-off-by: Chris Bagwell <chris at cnpbagwell.com>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>
    Acked-by: Corentin Chary <corentincj at iksaif.net>

commit a49010f53b723ed0711d645ec43bde498c6756dc
Author: Jon Dowland <jmtd at debian.org>
Date:   Wed Oct 27 00:24:59 2010 +0100

    toshiba_acpi.c: Add key_entry for a lone FN keypress
    
    A lone FN key press on a Toshiba Portégé R700 without another key in
    conjunction results in an ACPI event and a spurious error message on
    the console.
    
    Add a key entry to map this event to a KEY_FN keypress. This prevents
    the console message.
    
    Signed-off-by: Jon Dowland <jmtd at debian.org>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit c72b844ed2f55c442b464e382a2eb2ecab5292a8
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Fri Oct 22 16:18:47 2010 -0700

    ibm_rtl: fix printk format warning
    
    Fix printk format warning:
    
    drivers/platform/x86/ibm_rtl.c:305:warning: format '%#llx' expects type 'long long unsigned int', but argument 2 has type 'phys_addr_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: Keith Mannthey <kmannth at us.ibm.com>
    Cc: Vernon Mauery <vernux at us.ibm.com>
    Cc: platform-driver-x86 at vger.kernel.org
    Cc: Matthew Garrett <mjg at redhat.com>
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

commit cc1c452e509aefc28f7ad2deed75bc69d4f915f7
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Nov 24 14:17:47 2010 +0100

    ALSA: HDA: Add an extra DAC for Realtek ALC887-VD
    
    The patch enables ALC887-VD to use the DAC at nid 0x26,
    which makes it possible to use this DAC for e g Headphone
    volume.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit d6f443ae4c1d54379ad5953d7bcb89a63387184d
Author: Axel Lin <axel.lin at gmail.com>
Date:   Wed Nov 24 16:44:23 2010 +0800

    ASoC: nuc900-ac97: fix a memory leak
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Acked-by: Wan ZongShun <mcuos.com at gmail.com>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 59e21020284e80aa6183baf9f7948bbe9801a812
Merge: 5c12d20145ce30f9f8b7415d36dace5fb4dcc4f0 bf86f07e8479f4de20d8b19748482eccda240664
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Wed Nov 24 11:22:55 2010 +0000

    Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.37

commit 5c12d20145ce30f9f8b7415d36dace5fb4dcc4f0
Author: Axel Lin <axel.lin at gmail.com>
Date:   Wed Nov 24 15:20:48 2010 +0800

    ASoC: Return proper error for omap3pandora_soc_init
    
    Return PTR_ERR(omap3pandora_dac_reg) instead of 0 if regulator_get failed.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 2f7dceeda4708f470fd927adb3861bd8ebbe2310
Author: Axel Lin <axel.lin at gmail.com>
Date:   Wed Nov 24 10:21:54 2010 +0800

    ASoC: wm8961 - clear WM8961_MCLKDIV bit for freq <= 16500000
    
    MCLKDIV bit of Register 04h Clocking1:
    	0 : Divide by 1
    	1 : Divide by 2
    
    Thus in the case of freq <= 16500000, we should clear MCLKDIV bit.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Cc: stable at kernel.org

commit 08b1a38465cab8c2224a5202c7a3b5e5f5630894
Author: Axel Lin <axel.lin at gmail.com>
Date:   Wed Nov 24 10:20:33 2010 +0800

    ASoC: wm8961 - clear WM8961_DACSLOPE bit for normal mode
    
    DACSLOPE bit of Register 06h ADC and DAC Control 2:
            0: Normal mode
            1: Sloping stop-band mode
    
    Thus in the case of normal mode, we should clear DACSLOPE bit.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Cc: stable at kernel.org

commit cc840f77036fa0a141951967cd010014f088b5e0
Author: Joe Perches <joe at perches.com>
Date:   Tue Nov 23 22:36:42 2010 -0800

    MAINTAINERS: INTEL DRM DRIVERS list (intel-gfx) is subscribers-only
    
    Mark it so.
    
    Signed-off-by: Joe Perches <joe at perches.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit 540565257101f7c52b6fc5a57651f7505f8d20fe
Merge: 4d048435e9864998f6a6ad16422393d42322716d 421b446abeec55bed1251fab80cb5c12be58b773
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Wed Nov 24 16:21:08 2010 +0900

    Merge branch 'rmobile/fsi-despair' into rmobile-fixes-for-linus

commit c07a1c6b0fc6408efda7b7f5d12f24a3eda6a5e8
Author: Aaro Koskinen <aaro.koskinen at iki.fi>
Date:   Fri Nov 19 21:58:51 2010 +0000

    sisfb: delete osdef.h
    
    The file is not needed.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
    Cc: Thomas Winischhofer <thomas at winischhofer.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 1f8e6eee81709cfd500ca05e36b8207566e58222
Author: Aaro Koskinen <aaro.koskinen at iki.fi>
Date:   Fri Nov 19 21:58:50 2010 +0000

    sisfb: move the CONFIG warning to sis_main.c
    
    sis_main.c is always compiled, so we can check Kconfig options there.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
    Cc: Thomas Winischhofer <thomas at winischhofer.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit ec49ec33e22885a255855c2f820b640afbd88ef4
Author: Aaro Koskinen <aaro.koskinen at iki.fi>
Date:   Fri Nov 19 21:58:49 2010 +0000

    sisfb: replace SiS_SetMemory with memset_io
    
    Get rid of one more wrapper.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
    Cc: Thomas Winischhofer <thomas at winischhofer.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 2ad28472695a940bbda8fa1aec8286f0df8f6c4f
Author: Aaro Koskinen <aaro.koskinen at iki.fi>
Date:   Fri Nov 19 21:58:48 2010 +0000

    sisfb: remove InPort/OutPort wrappers
    
    Remove register IO wrappers.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
    Cc: Thomas Winischhofer <thomas at winischhofer.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit f7854e5df3f0828e942b089a82dfa5ce9baea428
Author: Aaro Koskinen <aaro.koskinen at iki.fi>
Date:   Fri Nov 19 21:58:47 2010 +0000

    sisfb: use CONFIG_FB_SIS_301/315 instead of SIS301/315H
    
    There is no need to alias CONFIG #defines.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
    Cc: Thomas Winischhofer <thomas at winischhofer.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit b6c30ca6136c6c6900a086b6b843f738a588a2f3
Author: Aaro Koskinen <aaro.koskinen at iki.fi>
Date:   Fri Nov 19 21:58:46 2010 +0000

    sisfb: delete redudant #define SIS_LINUX_KERNEL
    
    It's not needed anymore with SIS_XORG_XF86 gone.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
    Cc: Thomas Winischhofer <thomas at winischhofer.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit e7d828ab91c95e9fdc85f5167f236a8c85fb2445
Author: Aaro Koskinen <aaro.koskinen at iki.fi>
Date:   Fri Nov 19 21:58:45 2010 +0000

    sisfb: delete dead SIS_XORG_XF86 code
    
    Delete code for compiling the driver for X.org/XFree86. The development
    has forked, so there is no point keeping this code in the tree.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
    Cc: Thomas Winischhofer <thomas at winischhofer.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit f3fff7359415f3e6331fa727ab27e9a1556ee7e7
Author: Aaro Koskinen <aaro.koskinen at iki.fi>
Date:   Fri Nov 19 21:58:44 2010 +0000

    sisfb: delete fallback code for pci_map_rom()
    
    If pci_map_rom() fails, there is some fallback code that basically
    duplicates pci_map_rom() on non-x86 platforms. No point in that.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
    Cc: Thomas Winischhofer <thomas at winischhofer.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 8807236b1895b3aca022180cb9906022965344ad
Author: Aaro Koskinen <aaro.koskinen at iki.fi>
Date:   Fri Nov 19 21:58:43 2010 +0000

    sisfb: delete obsolete PCI ROM bug workaround
    
    Delete a workaround for a PCI ROM bug that has been fixed ages ago by
    the commit 761a3ac08c63718dacde12aaf0ec6d6760e8c2b7.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
    Cc: Thomas Winischhofer <thomas at winischhofer.net>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 421b446abeec55bed1251fab80cb5c12be58b773
Author: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Date:   Fri Nov 19 07:23:52 2010 +0000

    ARM: mach-shmobile: clock-sh7372: remove bogus pllc2 clock toggling.
    
    The PLLC2 clock was utilizing the same sort of enable/disable without
    regard to usecount approach that the FSIDIV clock was when being used as
    a PLL pass-through. This forces the enable/disable through the clock
    framework, which now prevents the clock from being ripped out or modified
    underneath users that have an existing handle on it.
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit b16a2892b9852839307894cc429b7a7b145138a7
Author: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Date:   Fri Nov 19 07:23:32 2010 +0000

    ARM: mach-shmobile: clock-sh7372: remove unnecessary fsi clocks
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit a57b1a9bdfb61e8d7dc7acc5e2d8bc04c549e668
Author: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Date:   Fri Nov 19 07:23:26 2010 +0000

    ARM: mach-shmobile: clock-sh7372: modify error code
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 22de4e1fe446794acaebdf19dcaff4256d659972
Author: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Date:   Fri Nov 19 07:23:17 2010 +0000

    ARM: mach-shmobile: ap4evb: FSI clock use proper process for ak4642
    
    Current AP4 FSI didn't use set_rate for ak4642,
    and used dummy rate when init.
    And FSI driver was modified to always call set_rate.
    
    The user which are using FSI set_rate is only AP4 now.
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit d4bc99b977e3a1dd10a84a01ebe59ac2ccebf0cd
Author: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Date:   Wed Nov 24 02:44:06 2010 +0000

    ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI
    
    Current AP4 FSI set_rate function used bogus clock process
    which didn't care enable/disable and clk->usecound.
    To solve this issue, this patch also modify FSI driver to call
    set_rate with enough options.
    This patch modify it.
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit e8ee13a818db4954517cea7da6e7c15b9656eb00
Author: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Date:   Fri Nov 19 07:22:58 2010 +0000

    ARM: mach-shmobile: clock-sh7372: remove fsidiv bogus disable
    
    Current FSIDIV clock framework had bogus disable.
    This patch remove it.
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit be20e6c67b6c6024c19094d3447f144d118733b0
Author: Darrick J. Wong <djwong at us.ibm.com>
Date:   Wed Nov 24 16:40:33 2010 +1100

    md: Call blk_queue_flush() to establish flush/fua support
    
    Before 2.6.37, the md layer had a mechanism for catching I/Os with the
    barrier flag set, and translating the barrier into barriers for all
    the underlying devices.  With 2.6.37, I/O barriers have become plain
    old flushes, and the md code was updated to reflect this.  However,
    one piece was left out -- the md layer does not tell the block layer
    that it supports flushes or FUA access at all, which results in md
    silently dropping flush requests.
    
    Since the support already seems there, just add this one piece of
    bookkeeping.
    
    Signed-off-by: Darrick J. Wong <djwong at us.ibm.com>
    Signed-off-by: NeilBrown <neilb at suse.de>

commit 8f9e0ee38f75d4740daa9e42c8af628d33d19a02
Author: NeilBrown <neilb at suse.de>
Date:   Wed Nov 24 16:39:46 2010 +1100

    md/raid1: really fix recovery looping when single good device fails.
    
    Commit 4044ba58dd15cb01797c4fd034f39ef4a75f7cc3 supposedly fixed a
    problem where if a raid1 with just one good device gets a read-error
    during recovery, the recovery would abort and immediately restart in
    an infinite loop.
    
    However it depended on raid1_remove_disk removing the spare device
    from the array.  But that does not happen in this case.  So add a test
    so that in the 'recovery_disabled' case, the device will be removed.
    
    This suitable for any kernel since 2.6.29 which is when
    recovery_disabled was introduced.
    
    Cc: stable at kernel.org
    Reported-by: Sebastian Färber <faerber at gmail.com>
    Signed-off-by: NeilBrown <neilb at suse.de>

commit c26a44ed1e552aaa1d4ceb71842002d235fe98d7
Author: Justin Maggard <jmaggard10 at gmail.com>
Date:   Wed Nov 24 16:36:17 2010 +1100

    md: fix return value of rdev_size_change()
    
    When trying to grow an array by enlarging component devices,
    rdev_size_store() expects the return value of rdev_size_change() to be
    in sectors, but the actual value is returned in KBs.
    
    This functionality was broken by commit
         dd8ac336c13fd8afdb082ebacb1cddd5cf727889
    so this patch is suitable for any kernel since 2.6.30.
    
    Cc: stable at kernel.org
    Signed-off-by: Justin Maggard <jmaggard10 at gmail.com>
    Signed-off-by: NeilBrown <neilb at suse.de>

commit d94772070acc5a8f312ab4650cbbf5e78ea9dda2
Author: Denis Kuplyakov <dener.kup at gmail.com>
Date:   Wed Nov 24 06:01:09 2010 +0100

    ALSA: hda - Fix Acer 7730G support
    
    Fixes automatic EAPD configuration on Acer 7730G laptop.
    
    Signed-off-by: Denis Kuplyakov <dener.kup at gmail.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit be6528b2e58d92ef2ffed6f130e2d42bb85dbf29
Author: Stephen Hemminger <shemminger at vyatta.com>
Date:   Tue Nov 9 22:20:29 2010 -0800

    virtio: fix format of sysfs driver/vendor files
    
    The sysfs files for virtio produce the wrong format and are missing
    the required newline. The output for virtio bus vendor/device should
    have the same format as the corresponding entries for PCI devices.
    
    Although this technically changes the ABI for sysfs, these files were
    broken to start with!
    
    Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 22e132ff2645aab1e1a25c45e9544a39ae1dc106
Author: Jiri Slaby <jslaby at suse.cz>
Date:   Sat Nov 6 10:06:50 2010 +0100

    Char: virtio_console, fix memory leak
    
    Stanse found that in init_vqs, memory is leaked under certain
    circumstanses (the fail path order is incorrect). Fix that by checking
    allocations in one turn and free all of them at once if some fails
    (some may be NULL, but this is OK).
    
    Signed-off-by: Jiri Slaby <jslaby at suse.cz>
    Cc: Amit Shah <amit.shah at redhat.com>
    Cc: virtualization at lists.linux-foundation.org
    Cc: Greg Kroah-Hartman <gregkh at suse.de>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 7ae4b866f86f9ab7b99484b56dd303a860ad1cc9
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Thu Nov 4 14:24:24 2010 +0200

    virtio: return correct capacity to users
    
    We can't rely on indirect buffers for capacity
    calculations because they need a memory allocation
    which might fail.  In particular, virtio_net can get
    into this situation under stress, and it drops packets
    and performs badly.
    
    So return the number of buffers we can guarantee users.
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    Reported-By: Krishna Kumar2 <krkumar2 at in.ibm.com>

commit dfd62d1d84d83f9421792c78bcf72de9bc2bb603
Author: Anders Kaseorg <andersk at ksplice.com>
Date:   Wed Nov 24 15:21:10 2010 -0600

    module: Update prototype for ref_module (formerly use_module)
    
    Commit 9bea7f23952d5948f8e5dfdff4de09bb9981fb5f renamed use_module to
    ref_module (and changed its return value), but forgot to update this
    prototype in module.h.
    
    Signed-off-by: Anders Kaseorg <andersk at ksplice.com>
    Acked-by: WANG Cong <xiyou.wangcong at gmail.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit f6c26ec5085be805c9dc72d074ef5f504b9cd7df
Author: Ryusuke Konishi <konishi.ryusuke at lab.ntt.co.jp>
Date:   Wed Nov 24 02:18:59 2010 +0900

    nilfs2: fix typo in comment of nilfs_dat_move function
    
    Fixes a typo: "uncommited" -> "uncommitted".
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke at lab.ntt.co.jp>

commit ea49b1669b7b405e0eb0bf877c7b7fb01f8dd19b
Merge: a4ec046c98283d9f36817589081e14850570739f 9e8c32cac9929858337e29dd4e28fd87bc073ef5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Nov 24 08:23:56 2010 +0900

    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: (41 commits)
      ALSA: hda - Identify more variants for ALC269
      ALSA: hda - Fix wrong ALC269 variant check
      ALSA: hda - Enable jack sense for Thinkpad Edge 11
      ALSA: Revert "ALSA: hda - Fix switching between dmic and mic using the same mux on IDT/STAC"
      ALSA: hda - Fixed ALC887-VD initial error
      ALSA: atmel - Fix the return value in error path
      ALSA: hda: Use hp-laptop quirk to enable headphones automute for Asus A52J
      ALSA: snd-atmel-abdac: test wrong variable
      ALSA: azt3328: period bug fix (for PA), add missing ACK on stop timer
      ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup
      ALSA: sound/pci/asihpi/hpioctl.c: Remove unnecessary casts of pci_get_drvdata
      ALSA: sound/core/pcm_lib.c: Remove unnecessary semicolons
      ALSA: sound/ppc: Use printf extension %pR for struct resource
      ALSA: ac97: Apply quirk for Dell Latitude D610 binding Master and Headphone controls
      ASoC: uda134x - set reg_cache_default to uda134x_reg
      ASoC: Add support for MAX98089 CODEC
      ASoC: davinci: fixes for multi-component
      ASoC: Fix register cache setup WM8994 for multi-component
      ASoC: Fix dapm_seq_compare() for multi-component
      ASoC: RX1950: Fix hw_params function
      ...

commit a4ec046c98283d9f36817589081e14850570739f
Merge: 3cbaa0f7a78d3b970b566629ee298c310780b919 9b8321531a90c400e9c561d903926eee79639dcf
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Nov 24 08:23:18 2010 +0900

    Merge branch 'upstream/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
    
    * 'upstream/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (23 commits)
      xen/events: Use PIRQ instead of GSI value when unmapping MSI/MSI-X irqs.
      xen: set IO permission early (before early_cpu_init())
      xen: re-enable boot-time ballooning
      xen/balloon: make sure we only include remaining extra ram
      xen/balloon: the balloon_lock is useless
      xen: add extra pages to balloon
      xen: make evtchn's name less generic
      xen/evtchn: the evtchn device is non-seekable
      Revert "xen/privcmd: create address space to allow writable mmaps"
      xen/events: use locked set|clear_bit() for cpu_evtchn_mask
      xen/evtchn: clear secondary CPUs' cpu_evtchn_mask[] after restore
      xen/xenfs: update xenfs_mount for new prototype
      xen: fix header export to userspace
      xen: implement XENMEM_machphys_mapping
      xen: set vma flag VM_PFNMAP in the privcmd mmap file_op
      xen: xenfs: privcmd: check put_user() return code
      xen/evtchn: add missing static
      xen/evtchn: Fix name of Xen event-channel device
      xen/evtchn: don't do unbind_from_irqhandler under spinlock
      xen/evtchn: remove spurious barrier
      ...

commit 3cbaa0f7a78d3b970b566629ee298c310780b919
Merge: e94571653876922bbc247c8ef13c0b7839c3e503 cf41a51db89850033efc11c18a5257de810b5417
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Nov 24 08:22:34 2010 +0900

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      of/phylib: Use device tree properties to initialize Marvell PHYs.
      phylib: Add support for Marvell 88E1149R devices.
      phylib: Use common page register definition for Marvell PHYs.
      qlge: Fix incorrect usage of module parameters and netdev msg level
      ipv6: fix missing in6_ifa_put in addrconf
      SuperH IrDA: correct Baud rate error correction
      atl1c: Fix hardware type check for enabling OTP CLK
      net: allow GFP_HIGHMEM in __vmalloc()
      bonding: change list contact to netdev at vger.kernel.org
      e1000: fix screaming IRQ

commit e94571653876922bbc247c8ef13c0b7839c3e503
Merge: 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 02e2c51ba3e80acde600721ea784c3ef84da5ea1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Nov 24 08:21:43 2010 +0900

    Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
    
    * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
      USB: EHCI: fix obscure race in ehci_endpoint_disable
      USB: gadget: AT91: fix typo in atmel_usba_udc driver
      USB: isp1362-hcd - fix section mismatch warning
      USB: EHCI: AMD periodic frame list table quirk
      USB: OTG: langwell_otg: fix up some sysfs attribute permissions
      USB: misc: usbsevseg: fix up some sysfs attribute permissions
      USB: misc: usbled: fix up some sysfs attribute permissions
      USB: misc: trancevibrator: fix up a sysfs attribute permission
      USB: misc: cypress_cy7c63: fix up some sysfs attribute permissions
      USB: storage: sierra_ms: fix sysfs file attribute
      USB: ehci: fix debugfs 'lpm' permissions
      USB: atm: ueagle-atm: fix up some permissions on the sysfs files
      xhci: Fix command ring replay after resume.
      xHCI: fix wMaxPacketSize mask
      xHCI: release spinlock when setup interrupt
      xhci: Remove excessive printks with shared IRQs.

commit 0c1dab89ee0e483f382391d6aec77db4affb0931
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Nov 23 22:37:01 2010 +0000

    drm/i915/sdvo: Always fallback to querying the shared DDC line
    
    On a few devices, like the Mac Mini, the CRT DDC pins are shared between
    the analog connector and the digital connector. In this scenario, rely
    on the EDID to determine if a digital panel is connected to the digital
    connector.
    
    Reported-and-tested-by: Tino Keitel <tino.keitel at tikei.de>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit 28c22d7dc99486ef4186dde41d5260e75b3076f7
Author: MyungJoo Ham <myungjoo.ham at gmail.com>
Date:   Tue Nov 23 11:39:23 2010 +0100

    ARM: 6490/1: MM: bugfix: initialize spinlock for init_mm.context
    
    init_mm used at kernel/sched.c:idle_task_exit() has spin_lock
    (init_mm.context.id_lock) that is not initialized when spin_lock/unlock
    is called at an ARM machine. Note that mm_struct.context.id_lock is
    usually initialized except for the instance of init_mm at
    linux/arch/arm/mm/context.c
    
    Not initializing this spinlock incurs "BUG: pinlock bad magic"
    warning when spinlock debug is enabled. We have observed such
    instances when testing PM in S5PC210 machines.
    
    Signed-off-by: MyungJoo Ham <myungjoo.ham at samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 932c42b286e2c6479d1cbdee2927cb283b1c0c3b
Author: Russell King <rmk+kernel at arm.linux.org.uk>
Date:   Tue Nov 23 22:27:55 2010 +0000

    ARM: avoid annoying <4>'s in printk output
    
    Adding KERN_WARNING in the middle of strings now produces those tokens
    in the output, rather than accepting the level as was once the case.
    Fix this in the one reported case.  There might be more...
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 5d61b718ec23694a87b2c5c590809c12453a1833
Author: Russell King <rmk+kernel at arm.linux.org.uk>
Date:   Tue Nov 23 22:19:08 2010 +0000

    SCSI: arm fas216: fix missing ';'
    
    f281233 (SCSI host lock push-down) broke the fas216 build:
    
    drivers/scsi/arm/fas216.h: In function 'fas216_noqueue_command':
    drivers/scsi/arm/fas216.h:354: error: storage class specified for parameter 'fas216_intr'
    drivers/scsi/arm/fas216.h:356: error: storage class specified for parameter 'fas216_remove'
    ...
    
    Fix it.
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit bcf50e2775bbc3101932d8e4ab8c7902aa4163b4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Nov 21 22:07:12 2010 +0000

    drm/i915: Handle pagefaults in execbuffer user relocations
    
    Currently if we hit a pagefault when applying a user relocation for the
    execbuffer, we bail and return EFAULT to the application. Instead, we
    need to unwind, drop the dev->struct_mutex, copy all the relocation
    entries to a vmalloc array (to avoid any potential circular deadlocks
    when resolving the pagefault), retake the mutex and then apply the
    relocations.  Afterwards, we need to again drop the lock and copy the
    vmalloc array back to userspace.
    
    v2: Incorporate feedback from Daniel Vetter.
    
    Reported-by: Daniel Vetter <daniel.vetter at ffwll.ch>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

commit e476a5a41ad67d0e2b4a652820c49a3923eb936b
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date:   Tue Nov 23 17:10:24 2010 +0100

    wireless: b43: fix error path in SDIO
    
    Fix unbalanced call to sdio_release_host() on the error path.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Acked-by: Larry Finger <Larry.Finger at lwfinger.net>
    Cc: stable at kernel.org
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 02a9d03772aa1ff33a26180a2da0bfb191240eda
Author: Rabin Vincent <rabin at rab.in>
Date:   Tue Nov 23 22:08:18 2010 +0530

    perf symbols: Remove incorrect open-coded container_of()
    
    At least on ARM, padding is inserted between rb_node and sym in struct
    symbol_name_rb_node, causing "((void *)sym) - sizeof(struct rb_node)" to
    point inside rb_node rather than to the symbol_name_rb_node.  Fix this
    by converting the code to use container_of().
    
    Cc: Ian Munsie <imunsie at au1.ibm.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Ming Lei <tom.leiming at gmail.com>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Tom Zanussi <tzanussi at gmail.com>
    LKML-Reference: <20101123163106.GA25677 at debian>
    Signed-off-by: Rabin Vincent <rabin at rab.in>
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>

commit 24fb2b1174ddc1f844e2008eb5b3105832860395
Author: Axel Lin <axel.lin at gmail.com>
Date:   Tue Nov 23 15:58:39 2010 +0800

    ASoC: wm8994 - fix memory leaks
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit cd70978cb59fd20dccdfc790ea8bb308c2dfd1d6
Author: Axel Lin <axel.lin at gmail.com>
Date:   Tue Nov 23 15:57:49 2010 +0800

    ASoC: wm8904 - fix memory leaks
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit bc5954f00e80c55140f546c80f34a8660bdd2c5f
Author: Axel Lin <axel.lin at gmail.com>
Date:   Tue Nov 23 15:56:21 2010 +0800

    ASoC: max98088 - fix a memory leak
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 7a479b02843c8d78ef51a64d1168592258440c97
Author: Axel Lin <axel.lin at gmail.com>
Date:   Tue Nov 23 14:14:07 2010 +0800

    ASoC: Do not update the cache if write to hardware failed
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Peter Ujfalusi <peter.ujfalusi at nokia.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 92a5288501685bf05fc348ee2a3115a9bd9ae36f
Author: Jesper Juhl <jj at chaosbits.net>
Date:   Mon Nov 22 22:54:03 2010 +0100

    ASoC: MPC5200: Eliminate duplicate include of of_device.h
    
    Eliminate duplicate  #include <linux/of_device.h>  from
    sound/soc/fsl/mpc5200_dma.c
    
    Signed-off-by: Jesper Juhl <jj at chaosbits.net>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 9e8c32cac9929858337e29dd4e28fd87bc073ef5
Merge: 48c88e820fb3e35c5925e4743fd13f200891b7b5 bf86f07e8479f4de20d8b19748482eccda240664
Author: Takashi Iwai <tiwai at suse.de>
Date:   Tue Nov 23 12:41:17 2010 +0100

    Merge branch 'fix/asoc' into for-linus

commit bf86f07e8479f4de20d8b19748482eccda240664
Merge: 2811fe2beb7cb9f34eef4bc9627dcabb401bc05e 233538501f707b0176f09af7039fec1e3fcac6e7
Author: Takashi Iwai <tiwai at suse.de>
Date:   Tue Nov 23 12:40:15 2010 +0100

    Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc

commit f6a1f2184c0ea85ad98a4d6e450ad584423d10ce
Merge: b0c4d4ee4e4f13fa3f017c00319a18c1ea31b7d7 46e3f3075931493f65e9561ef57bcc23fe077a13
Author: Russell King <rmk+kernel at arm.linux.org.uk>
Date:   Tue Nov 23 09:37:25 2010 +0000

    Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

commit 48c88e820fb3e35c5925e4743fd13f200891b7b5
Author: Kailang Yang <kailang at realtek.com>
Date:   Tue Nov 23 08:56:16 2010 +0100

    ALSA: hda - Identify more variants for ALC269
    
    Give more correct chip names for ALC269-variant codecs.
    
    Signed-off-by: Kailang Yang <kailang at realtek.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 1657cbd87125a623d28ce8a7ef5ff6959098d425
Author: Kailang Yang <kailang at realtek.com>
Date:   Tue Nov 23 08:53:32 2010 +0100

    ALSA: hda - Fix wrong ALC269 variant check
    
    The refactoring commit d433a67831ab2c470cc53a3ff9b60f656767be15
        ALSA: hda - Optimize the check of ALC269 codec variants
    introduced a wrong check for ALC269-vb type.  This patch corrects it.
    
    Signed-off-by: Kailang Yang <kailang at realtek.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 103cfcf522cefe00d8c322c6beac9a711acbf235
Author: Dan Carpenter <error27 at gmail.com>
Date:   Tue Nov 23 09:26:02 2010 +0300

    nilfs2: nilfs_iget_for_gc() returns ERR_PTR
    
    nilfs_iget_for_gc() returns an ERR_PTR() on failure and doesn't return
    NULL.
    
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke at lab.ntt.co.jp>

commit 6027277e77df2d2893d906c42f5c9f9abcb731e0
Author: Manoj Iyer <manoj.iyer at canonical.com>
Date:   Tue Nov 23 07:43:44 2010 +0100

    ALSA: hda - Enable jack sense for Thinkpad Edge 11
    
    Add a quirk entry for Thinkpad Edge 11 as well as other TP Edge models.
    
    Signed-off-by: Manoj Iyer <manoj.iyer at canonical.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit d090f5976dfcac4935286676825d64e081335e09
Author: Takashi Iwai <tiwai at suse.de>
Date:   Tue Nov 23 07:39:58 2010 +0100

    ALSA: Revert "ALSA: hda - Fix switching between dmic and mic using the same mux on IDT/STAC"
    
    This reverts commit f41cc2a85d52ac6971299922084ac5ac59dc339d.
    
    The patch broke the digital mic pin handling wrongly.
    Reference: bko#23162
    	https://bugzilla.kernel.org/show_bug.cgi?id=23162
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit bc15fde77fc5d9ec2eec6066a5ab554ea1266a0a
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Mon Nov 22 17:17:50 2010 -0800

    xen: use default_idle
    
    We just need the idle loop to drop into safe_halt, which default_idle()
    is perfectly capable of doing.  There's no need to duplicate it.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit c2d0879112825cddddd6c4f9b2645ff32acd6dc5
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Mon Nov 22 16:31:35 2010 -0800

    xen: clean up "extra" memory handling some more
    
    Make sure that extra_pages is added for all E820_RAM regions beyond
    mem_end - completely excluded regions as well as the remains of partially
    included regions.
    
    Also makes sure the extra region is not unnecessarily high, and simplifies
    the logic to decide which regions should be added.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit eba19fdd818dfec3782ff095591e51c9bd617403
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Fri Nov 19 16:09:15 2010 +0000

    ASoC: Restore WM8994 volatile and readable register operations
    
    They went AWOL during the multi-component merge.
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit f71a4734b1ad7edccbfd9bd395df328ebbd94287
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Mon Nov 22 19:11:48 2010 +0000

    ASoC: Fix multi-component mismerge in WM8523
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>

commit b3915d1fb6557dda206f4644ba9aa96ffd9a99d2
Author: Vasiliy Kulikov <segoon at openwall.com>
Date:   Mon Nov 22 18:59:13 2010 +0300

    ASoC: atmel: test wrong variable
    
    After clk_get() mclk is checked second time instead of pllb check.
    In patch v1 Jarkko Nikula noticed that PTR_ERR() is also has wrong argument.
    
    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 32292f49f9683622ad0fb95a8c754910121e7b16
Author: Guenter Roeck <guenter.roeck at ericsson.com>
Date:   Thu Nov 18 21:06:45 2010 -0800

    hwmon: (lis3lv02d_i2c) Fix compile warnings
    
    This commit fixes the following compile warnings.
    
    From v2.6.37-rc2/m68k/m68k-allmodconfig, v2.6.37-rc2/powerpc/powerpc-randconfig:
    drivers/hwmon/lis3lv02d_i2c.c:222: warning: 'lis3_i2c_runtime_suspend' defined but not used
    drivers/hwmon/lis3lv02d_i2c.c:231: warning: 'lis3_i2c_runtime_resume' defined but not used
    
    Seen if CONFIG_PM_RUNTIME is not set.
    
    From v2.6.37-rc2/sh4/sh-allyesconfig:
    drivers/hwmon/lis3lv02d_i2c.c:191: warning: 'lis3lv02d_i2c_suspend' defined but not used
    drivers/hwmon/lis3lv02d_i2c.c:201: warning: 'lis3lv02d_i2c_resume' defined but not used
    
    Seen if CONFIG_PM is set but CONFIG_PM_SLEEP is not.
    
    Signed-off-by: Guenter Roeck <guenter.roeck at ericsson.com>
    Acked-by: Jean Delvare <khali at linux-fr.org>

commit c48a2916355337895aea33839d39810eb575e775
Author: Guenter Roeck <guenter.roeck at ericsson.com>
Date:   Fri Nov 19 09:39:11 2010 -0800

    hwmon: (i5k_amb) Fix compile warning
    
    This patch fixes the following compile warning.
    
    drivers/hwmon/i5k_amb.c:500: warning: 'i5k_amb_ids' defined but not used
    
    The warning is seen if the driver is built into the kernel (not as module).
    
    Signed-off-by: Guenter Roeck <guenter.roeck at ericsson.com>
    Acked-by: Jean Delvare <khali at linux-fr.org>

commit c89ad7372232b69fd37edf90d6f5d2a8d6381214
Author: Gustavo F. Padovan <padovan at profusion.mobi>
Date:   Mon Nov 1 19:08:50 2010 +0000

    Bluetooth: Fix not returning proper error in SCO
    
    Return 0 in that situation could lead to errors in the caller.
    
    Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>

commit 9b8321531a90c400e9c561d903926eee79639dcf
Merge: 12334715720b012180579f57650879d0fbb11a84 9045d47ea362e6a3727ee3f1b69a1b656976772e b5d827b641b192ceb6968c21feb544c744e43108
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Mon Nov 22 12:22:42 2010 -0800

    Merge branches 'upstream/core', 'upstream/xenfs' and 'upstream/evtchn' into upstream/for-linus
    
    * upstream/core:
      xen/events: Use PIRQ instead of GSI value when unmapping MSI/MSI-X irqs.
      xen: set IO permission early (before early_cpu_init())
      xen: re-enable boot-time ballooning
      xen/balloon: make sure we only include remaining extra ram
      xen/balloon: the balloon_lock is useless
      xen: add extra pages to balloon
      xen/events: use locked set|clear_bit() for cpu_evtchn_mask
      xen/evtchn: clear secondary CPUs' cpu_evtchn_mask[] after restore
      xen: implement XENMEM_machphys_mapping
    
    * upstream/xenfs:
      Revert "xen/privcmd: create address space to allow writable mmaps"
      xen/xenfs: update xenfs_mount for new prototype
      xen: fix header export to userspace
      xen: set vma flag VM_PFNMAP in the privcmd mmap file_op
      xen: xenfs: privcmd: check put_user() return code
    
    * upstream/evtchn:
      xen: make evtchn's name less generic
      xen/evtchn: the evtchn device is non-seekable
      xen/evtchn: add missing static
      xen/evtchn: Fix name of Xen event-channel device
      xen/evtchn: don't do unbind_from_irqhandler under spinlock
      xen/evtchn: remove spurious barrier
      xen/evtchn: ports start enabled
      xen/evtchn: dynamically allocate port_user array
      xen/evtchn: track enabled state for each port

commit b397492a8c1022887a9b2fb925fe92e69ce0ad4d
Author: Christian Lamparter <chunkeey at googlemail.com>
Date:   Sat Nov 20 13:15:27 2010 +0100

    carl9170: fix virtual interface setup crash
    
    This patch fixes a faulty bound check which caused a
    crash when too many virtual interface were brought up.
    
    BUG: unable to handle kernel NULL pointer dereference at 00000004
    IP: [<f8125f67>] carl9170_op_add_interface+0x1d7/0x2c0 [carl9170]
    *pde = 00000000
    Oops: 0002 [#1] PREEMPT
    Modules linked in: carl9170 [...]
    Pid: 4720, comm: wpa_supplicant Not tainted 2.6.37-rc2-wl+
    EIP: 0060:[<f8125f67>] EFLAGS: 00210206 CPU: 0
    EIP is at carl9170_op_add_interface+0x1d7/0x2c0 [carl9170]
    EAX: 00000000 ...
    Process wpa_supplicant
    Stack:
     f4f88f34 fffffff4 ..
    Call Trace:
     [<f8f4e666>] ? ieee80211_do_open+0x406/0x5c0 [mac80211]
     [...]
    Code: <89> 42 04 ...
    EIP: [<f8125f67>] carl9170_op_add_interface+0x1d7/0x2c0 [carl9170]
    CR2: 0000000000000004
    
    Signed-off-by: Christian Lamparter <chunkeey at googlemail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 1d8638d4038eb8709edc80e37a0bbb77253d86e9
Author: Daniel Klaffenbach <danielklaffenbach at gmail.com>
Date:   Fri Nov 19 21:25:21 2010 -0600

    ssb: b43-pci-bridge: Add new vendor for BCM4318
    
    Add new vendor for Broadcom 4318.
    
    Signed-off-by: Daniel Klaffenbach <danielklaffenbach at gmail.com>
    Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
    Cc: Stable <stable at kernel.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit d47844a014fada1a788719f6426bc7044f2a0fd8
Author: Felix Fietkau <nbd at openwrt.org>
Date:   Sat Nov 20 03:08:47 2010 +0100

    ath9k: fix timeout on stopping rx dma
    
    It seems that using ath9k_hw_stoppcurecv to stop rx dma is not enough.
    When it's time to stop DMA, the PCU is still busy, so the rx enable
    bit never clears.
    Using ath9k_hw_abortpcurecv helps with getting rx stopped much faster,
    with this change, I cannot reproduce the rx stop related WARN_ON anymore.
    
    Signed-off-by: Felix Fietkau <nbd at openwrt.org>
    Cc: stable at kernel.org
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 15ec44611904be0dcc97b84c29fbf964e5e2b36f
Author: Philip Rakity <prakity at marvell.com>
Date:   Fri Nov 19 16:48:39 2010 -0500

    mmc: sdhci: 8-bit bus width changes
    
    We now:
     * check for a v3 controller before setting 8-bit bus width
     * offer a callback for platform code to switch to 8-bit mode, which
       allows non-v3 controllers to support it
     * rely on mmc->caps |= MMC_CAP_8_BIT_DATA; in platform code to specify
       that the board designers have indeed brought out all the pins for
       8-bit to the slot.
    
    We were previously relying only on whether the *controller* supported
    8-bit, which doesn't tell us anything about the pin configuration in
    the board design.
    
    This fixes the MMC card regression reported by Maxim Levitsky here:
       http://thread.gmane.org/gmane.linux.kernel.mmc/4336
    by no longer assuming that 8-bit works by default.
    
    Signed-off-by: Philip Rakity <prakity at marvell.com>
    Tested-by: Giuseppe Cavallaro <peppe.cavallaro at st.com>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit 12334715720b012180579f57650879d0fbb11a84
Author: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
Date:   Fri Nov 19 11:27:09 2010 -0500

    xen/events: Use PIRQ instead of GSI value when unmapping MSI/MSI-X irqs.
    
    When we allocate a vector for MSI/MSI-X we save away the PIRQ, and the
    vector value. When we unmap (de-allocate) the MSI/MSI-X vector(s) we
    need to provide the PIRQ and the vector value. What we did instead
    was to provide the GSI (which was zero) and the vector value, and we
    got these unhappy error messages:
    
    (XEN) irq.c:1575: dom0: pirq 0 not mapped
    [    7.733415] unmap irq failed -22
    
    This patches fixes this and we use the PIRQ value instead of the GSI
    value.
    
    CC: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>

commit ec35a69c467026437519bafcf325a7362e422db9
Author: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
Date:   Tue Nov 16 12:09:59 2010 -0500

    xen: set IO permission early (before early_cpu_init())
    
    This patch is based off "xen dom0: Set up basic IO permissions for dom0."
    by Juan Quintela <quintela at redhat.com>.
    
    On AMD machines when we boot the kernel as Domain 0 we get this nasty:
    
    mapping kernel into physical memory
    Xen: setup ISA identity maps
    about to get started...
    (XEN) traps.c:475:d0 Unhandled general protection fault fault/trap [#13] on VCPU 0 [ec=0000]
    (XEN) domain_crash_sync called from entry.S
    (XEN) Domain 0 (vcpu#0) crashed on cpu#0:
    (XEN) ----[ Xen-4.1-101116  x86_64  debug=y  Not tainted ]----
    (XEN) CPU:    0
    (XEN) RIP:    e033:[<ffffffff8130271b>]
    (XEN) RFLAGS: 0000000000000282   EM: 1   CONTEXT: pv guest
    (XEN) rax: 000000008000c068   rbx: ffffffff8186c680   rcx: 0000000000000068
    (XEN) rdx: 0000000000000cf8   rsi: 000000000000c000   rdi: 0000000000000000
    (XEN) rbp: ffffffff81801e98   rsp: ffffffff81801e50   r8:  ffffffff81801eac
    (XEN) r9:  ffffffff81801ea8   r10: ffffffff81801eb4   r11: 00000000ffffffff
    (XEN) r12: ffffffff8186c694   r13: ffffffff81801f90   r14: ffffffffffffffff
    (XEN) r15: 0000000000000000   cr0: 000000008005003b   cr4: 00000000000006f0
    (XEN) cr3: 0000000221803000   cr2: 0000000000000000
    (XEN) ds: 0000   es: 0000   fs: 0000   gs: 0000   ss: e02b   cs: e033
    (XEN) Guest stack trace from rsp=ffffffff81801e50:
    
    RIP points to read_pci_config() function.
    
    The issue is that we don't set IO permissions for the Linux kernel early enough.
    
    The call sequence used to be:
    
        xen_start_kernel()
    	x86_init.oem.arch_setup = xen_setup_arch;
            setup_arch:
               - early_cpu_init
                   - early_init_amd
                      - read_pci_config
               - x86_init.oem.arch_setup [ xen_arch_setup ]
                   - set IO permissions.
    
    We need to set the IO permissions earlier on, which this patch does.
    
    Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>

commit 09910509ebc74643e94fe6f3feb4c23b019aeb34
Author: Glenn Sommer <gsommer at datanordisk.dk>
Date:   Mon Nov 22 12:00:05 2010 -0800

    Input: usbtouchscreen - add support for LG Flatron T1710B
    
    I've recently got my hands on a LG Flatron T1710B touchscreen.
    As other LG products, this seems to use the ITM panel.
    
    Signed-off-by: Glenn Sommer <gsommer at datanordisk.dk>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 0b26a0bf6ff398185546432420bb772bcfdf8d94
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Sat Nov 20 14:26:44 2010 -0500

    NFS: Ensure we return the dirent->d_type when it is known
    
    Store the dirent->d_type in the struct nfs_cache_array_entry so that we
    can use it in getdents() calls.
    
    This fixes a regression with the new readdir code.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 3020093f578fb6c9acc6914dfd887a1ebd1db659
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Sat Nov 20 15:18:22 2010 -0500

    NFS: Correct the array bound calculation in nfs_readdir_add_to_array
    
    It looks as if the array size calculation in MAX_READDIR_ARRAY does not
    take the alignment of struct nfs_cache_array_entry into account.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit ece0b4233b6b915d1f63add2bd9f2733aec6317a
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Sat Nov 20 13:55:33 2010 -0500

    NFS: Don't ignore errors from nfs_do_filldir()
    
    We should ignore the errors from the filldir callback, and just interpret
    them as meaning we should exit, however we should definitely pass back
    ENOMEM errors.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 85f8607e163f8d281fb407357279cb4ac6df12e6
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Sat Nov 20 13:24:49 2010 -0500

    NFS: Fix the error handling in "uncached_readdir()"
    
    Currently, uncached_readdir() is broken because if fails to handle
    the results from nfs_readdir_xdr_to_array() correctly.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 7a8e1dc34f52fd2927dbf7e520d7cd8eadc51336
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Sat Nov 20 13:24:46 2010 -0500

    NFS: Fix a page leak in uncached_readdir()
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit e7c58e974a0318fcca5368e7b3570e10e9ae9028
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Sat Nov 20 13:22:24 2010 -0500

    NFS: Fix a page leak in nfs_do_filldir()
    
    nfs_do_filldir() must always free desc->page when it is done, otherwise
    we end up leaking the page.
    
    Also remove unused variable 'dentry'.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 5c346854d8ce6ca91931f8fc9177934257a667d0
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Sat Nov 20 12:43:45 2010 -0500

    NFS: Assume eof if the server returns no readdir records
    
    Some servers are known to be buggy w.r.t. this. Deal with them...
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 463a376eae1c92a66c912af539bfd4bbefa37673
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Sat Nov 20 12:22:20 2010 -0500

    NFS: Buffer overflow in ->decode_dirent() should not be fatal
    
    Overflowing the buffer in the readdir ->decode_dirent() should not lead to
    a fatal error, but rather to an attempt to reread the record in question.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit b47d19de2c714020ba8f5545a6e7d4968f37eb45
Author: Arun Bharadwaj <arun at linux.vnet.ibm.com>
Date:   Thu Nov 18 10:36:43 2010 +0000

    Pure nfs client performance using odirect.
    
    When an application opens a file with O_DIRECT flag, if the size of
    the data that is written is equal to wsize, the client sends a
    WRITE RPC with stable flag set to UNSTABLE followed by a single
    COMMIT RPC rather than sending a single WRITE RPC with the stable
    flag set to FILE_SYNC. This a bug.
    
    Patch to fix this.
    
    Signed-off-by: Arun R Bharadwaj <arun at linux.vnet.ibm.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit 5fc43978a79e8021c189660ab63249fd29c5fb32
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date:   Sat Nov 20 11:13:31 2010 -0500

    SUNRPC: Fix an infinite loop in call_refresh/call_refreshresult
    
    If the rpcauth_refreshcred() call returns an error other than
    EACCES, ENOMEM or ETIMEDOUT, we currently end up looping forever
    between call_refresh and call_refreshresult.
    
    The correct thing to do here is to exit on all errors except
    EAGAIN and ETIMEDOUT, for which case we retry 3 times, then
    return EACCES.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

commit cf41a51db89850033efc11c18a5257de810b5417
Author: David Daney <ddaney at caviumnetworks.com>
Date:   Fri Nov 19 12:13:18 2010 +0000

    of/phylib: Use device tree properties to initialize Marvell PHYs.
    
    Some aspects of PHY initialization are board dependent, things like
    indicator LED connections and some clocking modes cannot be determined
    by probing.  The dev_flags element of struct phy_device can be used to
    control these things if an appropriate value can be passed from the
    Ethernet driver.  We run into problems however if the PHY connections
    are specified by the device tree.  There is no way for the Ethernet
    driver to know what flags it should pass.
    
    If we are using the device tree, the struct phy_device will be
    populated with the device tree node corresponding to the PHY, and we
    can extract extra configuration information from there.
    
    The next question is what should the format of that information be?
    It is highly device specific, and the device tree representation
    should not be tied to any arbitrary kernel defined constants.  A
    straight forward representation is just to specify the exact bits that
    should be set using the "marvell,reg-init" property:
    
          phy5: ethernet-phy at 5 {
            reg = <5>;
            compatible = "marvell,88e1149r";
            marvell,reg-init =
                    /* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */
                    <3 0x10 0 0x5777>, /* Reg 3,16 <- 0x5777 */
                    /* mix %:0, led[0123]:drive low off hiZ */
                    <3 0x11 0 0x00aa>, /* Reg 3,17 <- 0x00aa */
                    /* default blink periods. */
                    <3 0x12 0 0x4105>, /* Reg 3,18 <- 0x4105 */
                    /* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */
                    <3 0x13 0 0x0a60>; /* Reg 3,19 <- 0x0a60 */
          };
    
          phy6: ethernet-phy at 6 {
            reg = <6>;
            compatible = "marvell,88e1118";
            marvell,reg-init =
                    /* Fix rx and tx clock transition timing */
                    <2 0x15 0xffcf 0>, /* Reg 2,21 Clear bits 4, 5 */
                    /* Adjust LED drive. */
                    <3 0x11 0 0x442a>, /* Reg 3,17 <- 0442a */
                    /* irq, blink-activity, blink-link */
                    <3 0x10 0 0x0242>; /* Reg 3,16 <- 0x0242 */
          };
    
    The Marvell PHYs have a page select register at register 22 (0x16), we
    can specify any register by its page and register number.  These are
    the first and second word.  The third word contains a mask to be ANDed
    with the existing register value, and the fourth word is ORed with the
    result to yield the new register value.  The new marvell_of_reg_init
    function leaves the page select register unchanged, so a call to it
    can be dropped into the .config_init functions without unduly
    affecting the state of the PHY.
    
    If CONFIG_OF_MDIO is not set, there is no of_node, or no
    "marvell,reg-init" property, the PHY initialization is unchanged.
    
    Signed-off-by: David Daney <ddaney at caviumnetworks.com>
    Cc: Grant Likely <grant.likely at secretlab.ca>
    Cc: Cyril Chemparathy <cyril at ti.com>
    Cc: David Daney <ddaney at caviumnetworks.com>
    Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
    Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Reviewed-by: Grant Likely <grant.likely at secretlab.ca>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 90600732d8b2fbc422bc9c57bdc73513d909367f
Author: David Daney <ddaney at caviumnetworks.com>
Date:   Fri Nov 19 11:58:53 2010 +0000

    phylib: Add support for Marvell 88E1149R devices.
    
    The 88E1149R is 10/100/1000 quad-gigabit Ethernet PHY.  The
    .config_aneg function can be shared with 88E1118, but it needs its own
    .config_init.
    
    Signed-off-by: David Daney <ddaney at caviumnetworks.com>
    Cc: Cyril Chemparathy <cyril at ti.com>
    Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
    Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Cc: Wolfram Sang <w.sang at pengutronix.de>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 27d916d680e7b324087a75d080f215e7c34a4e8f
Author: David Daney <ddaney at caviumnetworks.com>
Date:   Fri Nov 19 11:58:52 2010 +0000

    phylib: Use common page register definition for Marvell PHYs.
    
    The definition of the Marvell PHY page register is not specific to
    88E1121, so rename the macro to MII_MARVELL_PHY_PAGE, and use it
    throughout.
    
    Suggested-by: Cyril Chemparathy <cyril at ti.com>
    Signed-off-by: David Daney <ddaney at caviumnetworks.com>
    Cc: Cyril Chemparathy <cyril at ti.com>
    Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
    Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 84cf7029b63ca3eef823438a29ceb5ba139b883a
Author: Sonny Rao <sonnyrao at us.ibm.com>
Date:   Thu Nov 18 11:50:02 2010 +0000

    qlge: Fix incorrect usage of module parameters and netdev msg level
    
    Driver appears to be mistaking the permission field with default value
    in the case of debug and qlge_irq_type.
    
    Driver is also passing debug as a bitmask into netif_msg_init()
    which wants a number of bits.  Ron Mercer suggests we should
    change this to pass in -1 so the defaults get used instead,
    which makes the default much less verbose.
    
    Signed-off-by: Milton Miller <miltonm at bga.com>
    Signed-off-by: Sonny Rao <sonnyrao at linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c1a3a4b90a5a47adcca0e587f5d7e9ea61329b26
Author: Arnaldo Carvalho de Melo <acme at redhat.com>
Date:   Mon Nov 22 14:01:55 2010 -0200

    perf record: Handle restrictive permissions in /proc/{kallsyms,modules}
    
    The 59365d1 commit, even being reverted by 33e0d57, showed a non robust
    behavior in 'perf record': it really should just warn the user that some
    functionality will not be available.
    
    The new behavior then becomes:
    
    	[acme at felicio linux]$ ls -la /proc/{kallsyms,modules}
    	-r-------- 1 root root 0 Nov 22 12:19 /proc/kallsyms
    	-r-------- 1 root root 0 Nov 22 12:19 /proc/modules
    	[acme at felicio linux]$ perf record ls -R > /dev/null
    	Couldn't record kernel reference relocation symbol
    	Symbol resolution may be skewed if relocation was used (e.g. kexec).
    	Check /proc/kallsyms permission or run as root.
    	[ perf record: Woken up 1 times to write data ]
    	[ perf record: Captured and wrote 0.004 MB perf.data (~161 samples) ]
    	[acme at felicio linux]$ perf report --stdio
    	[kernel.kallsyms] with build id 77b05e00e64e4de1c9347d83879779b540d69f00 not found, continuing without symbols
    	# Events: 98  cycles
    	#
    	# Overhead  Command    Shared Object                Symbol
    	# ........  .......  ...............  ....................
    	#
    	    48.26%       ls  [kernel]         [k] ffffffff8102b92b
    	    22.49%       ls  libc-2.12.90.so  [.] __strlen_sse2
    	     8.35%       ls  libc-2.12.90.so  [.] __GI___strcoll_l
    	     8.17%       ls  ls               [.]            11580
    	     3.35%       ls  libc-2.12.90.so  [.] _IO_new_file_xsputn
    	     3.33%       ls  libc-2.12.90.so  [.] _int_malloc
    	     1.88%       ls  libc-2.12.90.so  [.] _int_free
    	     0.84%       ls  libc-2.12.90.so  [.] malloc_consolidate
    	     0.84%       ls  libc-2.12.90.so  [.] __readdir64
    	     0.83%       ls  ls               [.] strlen at plt
    	     0.83%       ls  libc-2.12.90.so  [.] __GI_fwrite_unlocked
    	     0.83%       ls  libc-2.12.90.so  [.] __memcpy_sse2
    
    	#
    	# (For a higher level overview, try: perf report --sort comm,dso)
    	#
    [acme at felicio linux]$
    
    It still has the build-ids for DSOs in the maps with hits:
    
    [acme at felicio linux]$ perf buildid-list
    77b05e00e64e4de1c9347d83879779b540d69f00 [kernel.kallsyms]
    09c4a431a4a8b648fcfc2c2bdda70f56050ddff1 /bin/ls
    af75ea9ad951d25e0f038901a11b3846dccb29a4 /lib64/libc-2.12.90.so
    [acme at felicio linux]$
    
    That can be used in another machine to resolve kernel symbols.
    
    Cc: Eugene Teo <eugeneteo at kernel.org>
    Cc: Frederic Weisbecker <fweisbec at gmail.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Jesper Juhl <jj at chaosbits.net>
    Cc: Marcus Meissner <meissner at suse.de>
    Cc: Mike Galbraith <efault at gmx.de>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Peter Zijlstra <peterz at infradead.org>
    Cc: Sarah Sharp <sarah.a.sharp at linux.intel.com>
    Cc: Stephane Eranian <eranian at google.com>
    Cc: Tejun Heo <tj at kernel.org>
    Cc: Tom Zanussi <tzanussi at gmail.com>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
    
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>

commit 88b2a9a3d98a19496d64aadda7158c0ad51cbe7d
Author: John Fastabend <john.r.fastabend at intel.com>
Date:   Mon Nov 15 20:29:21 2010 +0000

    ipv6: fix missing in6_ifa_put in addrconf
    
    Fix ref count bug introduced by
    
    commit 2de795707294972f6c34bae9de713e502c431296
    Author: Lorenzo Colitti <lorenzo at google.com>
    Date:   Wed Oct 27 18:16:49 2010 +0000
    
    ipv6: addrconf: don't remove address state on ifdown if the address
    is being kept
    
    Fix logic so that addrconf_ifdown() decrements the inet6_ifaddr
    refcnt correctly with in6_ifa_put().
    
    Reported-by: Stephen Hemminger <shemminger at vyatta.com>
    Signed-off-by: John Fastabend <john.r.fastabend at intel.com>
    Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit df4b2a30e0b9e553abfd63ee75dbbd66be80f01a
Author: Axel Lin <axel.lin at gmail.com>
Date:   Thu Nov 18 22:05:43 2010 -0500

    EDAC, MCE: Fix edac_init_mce_inject error handling
    
    Otherwise, variable i will be -1 inside the latest iteration of the
    while loop.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Signed-off-by: Borislav Petkov <borislav.petkov at amd.com>

commit f570e1dd8469d39420f406a4f5442c270b1e759e
Author: Tracey Dent <tdent48227 at gmail.com>
Date:   Sun Nov 7 09:43:33 2010 -0500

    EDAC: Remove deprecated kbuild goal definitions
    
    Change EDAC's Makefile to use <modules>-y instead of
    <modules>-objs because -objs is deprecated and not mentioned in
    Documentation/kbuild/makefiles.txt.
    
     [bp: Fixup commit message]
     [bp: Fixup indentation]
    
    Signed-off-by: Tracey Dent <tdent48227 at gmail.com>
    Signed-off-by: Borislav Petkov <borislav.petkov at amd.com>

commit 13a2e06c5898d27aadabfdb9830169101b21432f
Author: Axel Lin <axel.lin at gmail.com>
Date:   Mon Nov 22 08:20:54 2010 +0800

    ASoC: stac9766 - set reg_cache_default to stac9766_reg
    
    Looks like this is missing during multi-component conversion.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 8575d93386d6ce9a3d4961134018d4e6c6bed618
Author: Vasiliy Kulikov <segoon at openwall.com>
Date:   Sun Nov 21 20:40:21 2010 +0300

    ASoC: s3c24xx: test wrong variable
    
    After clk_get() mclk is checked three times instead of mout_epll
    and sclk_spdif checks.
    
    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 9a1f8b34aa539000da17a06235e4bec254d0bfb5
Author: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Date:   Fri Sep 24 10:16:44 2010 -0300

    [media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions
    
    The argument isn't used anymore by the functions, remove it.
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

commit aa2d8cbe169b7328eeabc9e2debccf5aee6f9199
Author: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Date:   Sat Oct 23 09:13:37 2010 -0300

    [media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)
    
    With the v4l2_i2c_new_subdev* functions now supporting loading modules
    based on modaliases, replace the hardcoded module name passed to those
    functions by NULL in the cafe-ccic, via-camera and s5p-fimc drivers.
    
    All corresponding I2C modules have been checked, and all of them include
    a module aliases table with names corresponding to what the drivers
    modified here use.
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

commit 9b4320b77bab4031649c484da1c595f39c2e43cd
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date:   Tue Nov 9 14:29:05 2010 -0300

    [media] Fix Kconfig errors due to two visible menus
    
    Use the new visible Kconfig keyword to avoid producing error for two menus
    that are visible only if Tuner/frontend customise options are enabled.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

commit c38bd4ffc7f24a99a14f9c776276e816f5de2509
Author: Arnaud Lacombe <lacombar at gmail.com>
Date:   Sat Nov 6 18:30:27 2010 -0300

    i2c/algos: convert Kconfig to use the menu's `visible' keyword
    
    Signed-off-by: Arnaud Lacombe <lacombar at gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

commit 37e3273ee52fb995c1f531fa1d98d190cc35e1bc
Author: Arnaud Lacombe <lacombar at gmail.com>
Date:   Sat Nov 6 18:30:26 2010 -0300

    media/video: convert Kconfig to use the menu's `visible' keyword
    
    Signed-off-by: Arnaud Lacombe <lacombar at gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

commit dfc518dd6b5c5e00f98906eaa5c7d716d856c098
Author: Arnaud Lacombe <lacombar at gmail.com>
Date:   Sat Nov 6 18:30:25 2010 -0300

    Revert "i2c: Fix Kconfig dependencies"
    
    This reverts commit 0a57274ea026c2b7670683947b6cc08b195148cf.
    
    Signed-off-by: Arnaud Lacombe <lacombar at gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

commit 09899c93b183870b122c94317f63344df43368e9
Author: Arnaud Lacombe <lacombar at gmail.com>
Date:   Sat Nov 6 18:30:24 2010 -0300

    kconfig: regen parser
    
    Signed-off-by: Arnaud Lacombe <lacombar at gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

commit da79de97d254145dcb7c08c978b1093eac15ec9c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Nov 22 11:12:46 2010 +0000

    drm/i915/sdvo: Only enable HDMI encodings only if the commandset is supported
    
    As we conflated intel_sdvo->is_hdmi with both having HDMI support on the
    ADD along with having HDMI support on the monitor, we would attempt to
    use HDMI encodings even if the interface did not support those commands.
    
    Reported-by: Simon Farnsworth <simon.farnsworth at onelan.co.uk>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Tested-by: Simon Farnsworth <simon.farnsworth at onelan.co.uk>
    Reviewed-by: Simon Farnsworth <simon.farnsworth at onelan.co.uk>

commit 86e187ff9bce9fbed7bfed92ae34f491cf1af50f
Author: Arnaud Lacombe <lacombar at gmail.com>
Date:   Sat Nov 6 18:30:23 2010 -0300

    kconfig: add an option to determine a menu's visibility
    
    This option is aimed to add the possibility to control a menu's visibility
    without adding dependency to the expression to all the submenu.
    
    Signed-off-by: Arnaud Lacombe <lacombar at gmail.com>
    Acked-by: Mauro Carvalho Chehab <mchehab at redhat.com>
    Tested-by: Mauro Carvalho Chehab <mchehab at redhat.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

commit b0c4d4ee4e4f13fa3f017c00319a18c1ea31b7d7
Author: Russell King <rmk+kernel at arm.linux.org.uk>
Date:   Mon Nov 22 12:00:59 2010 +0000

    ARM: avoid marking decompressor .stack section as having contents
    
    The .stack section doesn't contain any contents, and doesn't require
    initialization either.  Rather than marking the output section with
    'NOLOAD' but still having it exist in the object files, mark it with
    %nobits which avoids the assembler marking the section with 'CONTENTS'.
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 07a8cdd2bb17a4da68136d963b8bc71959bd31a5
Author: Anand Gadiyar <gadiyar at ti.com>
Date:   Thu Nov 18 18:54:17 2010 +0530

    usb: musb: do not use dma for control transfers
    
    The Inventra DMA engine used with the MUSB controller in many
    SoCs cannot use DMA for control transfers on EP0, but can use
    DMA for all other transfers.
    
    The USB core maps urbs for DMA if hcd->self.uses_dma is true.
    (hcd->self.uses_dma is true for MUSB as well).
    
    Split the uses_dma flag into two - one that says if the
    controller needs to use PIO for control transfers, and
    another which says if the controller uses DMA (for all
    other transfers).
    
    Also, populate this flag for all MUSB by default.
    
    (Tested on OMAP3 and OMAP4 boards, with EHCI and MUSB HCDs
    simultaneously in use).
    
    Signed-off-by: Maulik Mankad <x0082077 at ti.com>
    Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
    Signed-off-by: Anand Gadiyar <gadiyar at ti.com>
    Cc: Oliver Neukum <oliver at neukum.org>
    Cc: Alan Stern <stern at rowland.harvard.edu>
    Cc: Praveena NADAHALLY <praveen.nadahally at stericsson.com>
    Cc: Ajay Kumar Gupta <ajay.gupta at ti.com>
    Signed-off-by: Felipe Balbi <balbi at ti.com>

commit bb324b08165d5656d221af013ed9994a54e455be
Author: Ajay Kumar Gupta <ajay.gupta at ti.com>
Date:   Mon Nov 22 14:22:41 2010 +0530

    usb: musb: gadget: fix compilation warning
    
    Fixes below compilation warning when musb driver is compiled for
    PIO mode:
    
    drivers/usb/musb/musb_gadget.c: In function 'musb_g_rx':
    drivers/usb/musb/musb_gadget.c:840:
    		warning: label 'exit' defined but not used
    
    Signed-off-by: Ajay Kumar Gupta <ajay.gupta at ti.com>
    Signed-off-by: Felipe Balbi <balbi at ti.com>

commit e75df37165c639b06213ec88b4763c3e50a7f079
Author: Ming Lei <tom.leiming at gmail.com>
Date:   Tue Nov 16 23:37:37 2010 +0800

    usb: musb: clear RXCSR_AUTOCLEAR before PIO read
    
    If RXCSR_AUTOCLEAR flag is not cleard before PIO reading, one packet
    may be recieved by musb fifo, but no chance to notify
    software, so cause packet loss, follows the detailed process:
    
    	- PIO read one packet
    	- musb fifo auto clear the MUSB_RXCSR_RXPKTRDY
    	- musb continue to recieve the next packet, and MUSB_RXCSR_RXPKTRDY
    	is set
    	- software clear the MUSB_RXCSR_RXPKTRDY, so there is no chance for
    	musb to notify software that the 2nd recieved packet.
    
    The patch does fix the g_ether issue below:
    
    	- use fifo_mode 3 to enable double buffer
    	- 'ping -s 1024 IP_OF_BEAGLE_XM'
    	- one usb packet of 512 byte is lost, so ping failed,
    	which can be observed by wireshark
    
    note:
    	Beagle xm takes musb rtl1.8 and may fallback to pio mode
    	for unaligned buffer.
    
    Signed-off-by: Ming Lei <tom.leiming at gmail.com>
    Signed-off-by: Felipe Balbi <balbi at ti.com>

commit 92d2711f5dc15bf956546923a5718e74853f9912
Author: Hema Kalliguddi <hemahk at ti.com>
Date:   Mon Nov 15 04:24:01 2010 -0600

    usb: musb: unmap dma buffer when switching to PIO
    
    Buffer is mapped to dma when dma channel is
    allocated. If, for some reason, dma channel
    programming fails, musb code will fallback
    to PIO mode to transfer that request. In
    that case, we need to unmap the buffer
    back to CPU.
    
    MUSB RTL1.8 and above cannot handle buffers
    which are not 32bit aligned. That happens to
    every request sent by g_ether gadget
    driver. Since the buffer sent was unaligned,
    we need to fallback to PIO.
    
    Because of that, g_ether was failing due
    to missing buffer unmapping.
    
    With this patch and [1] g_ether works fine
    with all MUSB revisions.
    
    Verified with OMAP3630 board, which has
    MUSB RTL1.8 using g_ether and g_zero.
    
    [1] http://www.spinics.net/lists/linux-usb/msg38400.html
    
    Signed-off-by: Hema HK <hemahk at ti.com>
    Signed-off-by: Felipe Balbi <balbi at ti.com>

commit 01e0f1378c47947b825eac05c98697ab1be1c86f
Author: Kailang Yang <kailang at realtek.com>
Date:   Mon Nov 22 10:59:36 2010 +0100

    ALSA: hda - Fixed ALC887-VD initial error
    
    ALC887-VD is like ALC888-VD. It can not be initialized as ALC882.
    
    Signed-off-by: Kailang Yang <kailang at realtek.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 1beded5d9ce90256e4a7e7b0e96c317eafe1c513
Author: Takashi Iwai <tiwai at suse.de>
Date:   Mon Nov 22 08:58:13 2010 +0100

    ALSA: atmel - Fix the return value in error path
    
    In the commit c0763e687d0283d0db507813ca4462aa4073c5b5
        ALSA: snd-atmel-abdac: test wrong variable
    the return value via PTR_ERR() had to be fixed as well.
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 673f7a8984c3a9e2cb1108ce221da1ebbd9e5d09
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Sun Nov 21 14:01:14 2010 -0500

    ALSA: hda: Use hp-laptop quirk to enable headphones automute for Asus A52J
    
    BugLink: https://launchpad.net/bugs/677652
    
    The original reporter states that, in 2.6.35, headphones do not appear
    to work, nor does inserting them mute the A52J's onboard speakers.  Upon
    inspecting the codec dump, it appears that the newly committed hp-laptop
    quirk will suffice to enable this basic functionality.  Testing was done
    with an alsa-driver build from 2010-11-21.
    
    Reported-and-tested-by: Joan Creus
    Cc: <stable at kernel.org> [2.6.35+]
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit c0763e687d0283d0db507813ca4462aa4073c5b5
Author: Vasiliy Kulikov <segoon at openwall.com>
Date:   Sun Nov 21 20:40:07 2010 +0300

    ALSA: snd-atmel-abdac: test wrong variable
    
    After clk_get() pclk is checked second time instead of sample_clk check.
    
    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 78ac07b0d2b09b1ccb7a41a2e25f71d60b652920
Author: Andreas Mohr <andi at lisas.de>
Date:   Sun Nov 21 12:09:32 2010 +0100

    ALSA: azt3328: period bug fix (for PA), add missing ACK on stop timer
    
    . Fix PulseAudio "ALSA driver bug" issue
      (if we have two alternated areas within a 64k DMA buffer, then max
      period size should obviously be 32k only).
      Back references:
       http://pulseaudio.org/wiki/AlsaIssues
       http://fedoraproject.org/wiki/Features/GlitchFreeAudio
    . In stop timer function, need to supply ACK in the timer control byte.
    . Minor log output correction
    
    When I did my first PA testing recently, the period size bug resulted
    in quite precisely observeable half-period-based playback distortion.
    
    PA-based operation is quite a bit more underrun-prone (despite its
    zero-copy optimizations etc.) than raw ALSA with this rather spartan
    sound hardware implementation on my puny Athlon.
    
    Note that even with this patch, azt3328 still doesn't work for both
    cases yet, PA tsched=0 and tsched
    (on tsched=0 it will playback tiny fragments of periods, leading to tiny
    stuttering sounds with some pauses in between, whereas with
    timer-scheduled operation playback works fine - minus some quite increased
    underrun trouble on PA vs. ALSA, that is).
    
    Signed-off-by: Andreas Mohr <andi at lisas.de>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit a0e90acc657990511c83bc69965bfd3c63386d45
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Sat Nov 20 10:20:35 2010 -0500

    ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup
    
    BugLink: https://launchpad.net/bugs/677830
    
    The original reporter states that the subwoofer does not mute when
    inserting headphones.  We need an entry for his machine's SSID in the
    subwoofer pin fixup list, so add it there (verified using hda_analyzer).
    
    Reported-and-tested-by: i-NoD
    Cc: <stable at kernel.org>
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 4ab0fbd3a29067e1540f05093ae4ed07645d18c8
Merge: f3c91c1deaf8493526d8216be94c33e963f00962 3561d43fd289f590fdae672e5eb831b8d5cf0bf6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Nov 22 08:47:43 2010 +0000

    Merge remote branch 'linus' into drm-intel-fixes

commit 5dbea6b1f2113f764999b39fd3d79b1354c193d9
Author: Joe Perches <joe at perches.com>
Date:   Mon Nov 15 12:14:02 2010 -0800

    ALSA: sound/pci/asihpi/hpioctl.c: Remove unnecessary casts of pci_get_drvdata
    
    Signed-off-by: Joe Perches <joe at perches.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit c80c1d542744dd7851cc8da748c6ada99680fb4d
Author: Joe Perches <joe at perches.com>
Date:   Sun Nov 14 19:05:02 2010 -0800

    ALSA: sound/core/pcm_lib.c: Remove unnecessary semicolons
    
    Signed-off-by: Joe Perches <joe at perches.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 2fb50f135adba59edf2359effcce83eb17025793
Author: Joe Perches <joe at perches.com>
Date:   Fri Nov 12 13:38:04 2010 -0800

    ALSA: sound/ppc: Use printf extension %pR for struct resource
    
    Using %pR standardizes the struct resource output.
    
    Signed-off-by: Joe Perches <joe at perches.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 0613a59456980161d0cd468bae6c63d772743102
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Mon Nov 1 01:14:51 2010 -0400

    ALSA: ac97: Apply quirk for Dell Latitude D610 binding Master and Headphone controls
    
    BugLink: https://launchpad.net/bugs/669279
    
    The original reporter states: "The Master mixer does not change the
    volume from the headphone output (which is affected by the headphone
    mixer). Instead it only seems to control the on-board speaker volume.
    This confuses PulseAudio greatly as the Master channel is merged into
    the volume mix."
    
    Fix this symptom by applying the hp_only quirk for the reporter's SSID.
    The fix is applicable to all stable kernels.
    
    Reported-and-tested-by: Ben Gamari <bgamari at gmail.com>
    Cc: <stable at kernel.org> [2.6.32+]
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 45f49bce99d008d6864a20324548f35936ba46fb
Author: Chris Mason <chris.mason at oracle.com>
Date:   Sun Nov 21 22:27:44 2010 -0500

    Btrfs: avoid NULL pointer deref in try_release_extent_buffer
    
    If we fail to find a pointer in the radix tree, don't try
    to deref the NULL one we do have.
    
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit a1b075d28da563c5e2325577f282c042494254ba
Author: Josef Bacik <josef at redhat.com>
Date:   Fri Nov 19 20:36:11 2010 +0000

    Btrfs: make btrfs_add_nondir take parent inode as an argument
    
    Everybody who calls btrfs_add_nondir just passes in the dentry of the new file
    and then dereference dentry->d_parent->d_inode, but everybody who calls
    btrfs_add_nondir() are already passed the parent's inode.  So instead of
    dereferencing dentry->d_parent, just make btrfs_add_nondir take the dir inode as
    an argument and pass that along so we don't have to worry about d_parent.
    Thanks,
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 495e86779f4f319828bc10dfc0c9ac2161868077
Author: Josef Bacik <josef at redhat.com>
Date:   Fri Nov 19 20:36:10 2010 +0000

    Btrfs: hold i_mutex when calling btrfs_log_dentry_safe
    
    Since we walk up the path logging all of the parts of the inode's path, we need
    to hold i_mutex to make sure that the inode is not renamed while we're logging
    everything.  btrfs_log_dentry_safe does dget_parent and all of that jazz, but we
    may get unexpected results if the rename changes the inode's location while
    we're higher up the path logging those dentries, so do this for safety reasons.
    Thanks,
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 6a912213046ecb6511fdf35531a0c7de3de963c9
Author: Josef Bacik <josef at redhat.com>
Date:   Sat Nov 20 09:48:00 2010 +0000

    Btrfs: use dget_parent where we can UPDATED
    
    There are lots of places where we do dentry->d_parent->d_inode without holding
    the dentry->d_lock.  This could cause problems with rename.  So instead we need
    to use dget_parent() and hold the reference to the parent as long as we are
    going to use it's inode and then dput it at the end.
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Cc: raven at themaw.net
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 76195853903ca613ba722203db9b747d70478fc7
Author: Josef Bacik <josef at redhat.com>
Date:   Fri Nov 19 02:18:02 2010 +0000

    Btrfs: fix more ESTALE problems with NFS
    
    When creating new inodes we don't setup inode->i_generation.  So if we generate
    an fh with a newly created inode we save the generation of 0, but if we flush
    the inode to disk and have to read it back when getting the inode on the server
    we'll have the right i_generation, so gens wont match and we get ESTALE.  This
    patch properly sets inode->i_generation when we create the new inode and now I'm
    no longer getting ESTALE.  Thanks,
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 2ede0daf01549cecf4bb0962c46dc47382047523
Author: Josef Bacik <josef at redhat.com>
Date:   Wed Nov 17 18:54:54 2010 +0000

    Btrfs: handle NFS lookups properly
    
    People kept reporting NFS issues, specifically getting ESTALE alot.  I figured
    out how to reproduce the problem
    
    SERVER
    mkfs.btrfs /dev/sda1
    mount /dev/sda1 /mnt/btrfs-test
    <add /mnt/btrfs-test to /etc/exports>
    btrfs subvol create /mnt/btrfs-test/foo
    service nfs start
    
    CLIENT
    mount server:/mnt/btrfs /mnt/test
    cd /mnt/test/foo
    ls
    
    SERVER
    echo 3 > /proc/sys/vm/drop_caches
    
    CLIENT
    ls			<-- get an ESTALE here
    
    This is because the standard way to lookup a name in nfsd is to use readdir, and
    what it does is do a readdir on the parent directory looking for the inode of
    the child.  So in this case the parent being / and the child being foo.  Well
    subvols all have the same inode number, so doing a readdir of / looking for
    inode 256 will return '.', which obviously doesn't match foo.  So instead we
    need to have our own .get_name so that we can find the right name.
    
    Our .get_name will either lookup the inode backref or the root backref,
    whichever we're looking for, and return the name we find.  Running the above
    reproducer with this patch results in everything acting the way its supposed to.
    Thanks,
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 0410c94aff109c02b6774a0ed00114987cda7ce5
Author: Mariusz Kozlowski <mk at lab.zgora.pl>
Date:   Sat Nov 20 12:03:07 2010 +0000

    btrfs: make 1-bit signed fileds unsigned
    
    Fixes these sparse warnings:
    fs/btrfs/ctree.h:811:17: error: dubious one-bit signed bitfield
    fs/btrfs/ctree.h:812:20: error: dubious one-bit signed bitfield
    fs/btrfs/ctree.h:813:19: error: dubious one-bit signed bitfield
    
    Signed-off-by: Mariusz Kozlowski <mk at lab.zgora.pl>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit f209561ad83c5ffd561dc4bc3a3c90b704fe9231
Author: Li Zefan <lizf at cn.fujitsu.com>
Date:   Fri Nov 19 02:05:24 2010 +0000

    btrfs: Show device attr correctly for symlinks
    
    Symlinks and files of other types show different device numbers, though
    they are on the same partition:
    
     $ touch tmp; ln -s tmp tmp2; stat tmp tmp2
       File: `tmp'
       Size: 0         	Blocks: 0          IO Block: 4096   regular empty file
     Device: 15h/21d	Inode: 984027      Links: 1
     --- snip ---
       File: `tmp2' -> `tmp'
       Size: 3         	Blocks: 0          IO Block: 4096   symbolic link
     Device: 13h/19d	Inode: 984028      Links: 1
    
    Reported-by: Toke Høiland-Jørgensen <toke at toke.dk>
    Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 5f3888ff6f0b9dce60705765752b788a92557644
Author: Li Zefan <lizf at cn.fujitsu.com>
Date:   Fri Nov 19 01:36:34 2010 +0000

    btrfs: Set file size correctly in file clone
    
    Set src_offset = 0, src_length = 20K, dest_offset = 20K. And the
    original filesize of the dest file 'file2' is 30K:
    
      # ls -l /mnt/file2
      -rw-r--r-- 1 root root 30720 Nov 18 16:42 /mnt/file2
    
    Now clone file1 to file2, the dest file should be 40K, but it
    still shows 30K:
    
      # ls -l /mnt/file2
      -rw-r--r-- 1 root root 30720 Nov 18 16:42 /mnt/file2
    
    Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 2a6b8daedaf3682bed3fc1d4e2390491f6e19c49
Author: Li Zefan <lizf at cn.fujitsu.com>
Date:   Fri Nov 19 01:36:10 2010 +0000

    btrfs: Check if dest_offset is block-size aligned before cloning file
    
    We've done the check for src_offset and src_length, and We should
    also check dest_offset, otherwise we'll corrupt the destination
    file:
    
      (After cloning file1 to file2 with unaligned dest_offset)
      # cat /mnt/file2
      cat: /mnt/file2: Input/output error
    
    Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 0de90876c6cb774d4a424dafc1fc9ec50071b81b
Author: Josef Bacik <josef at redhat.com>
Date:   Fri Nov 19 13:40:41 2010 +0000

    Btrfs: handle the space_cache option properly
    
    When I added the clear_cache option I screwed up and took the break out of
    the space_cache case statement, so whenever you mount with space_cache you also
    get clear_cache, which does you no good if you say set space_cache in fstab so
    it always gets set.  This patch adds the break back in properly.
    
    Signed-off-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 6f33434850ed87dc5e56b60ebbad3d3cf405f296
Author: Arne Jansen <sensille at gmx.net>
Date:   Fri Nov 12 23:17:56 2010 +0000

    btrfs: Fix early enospc because 'unused' calculated with wrong sign.
    
    'unused' calculated with wrong sign in reserve_metadata_bytes().
    This might have lead to unwanted over-reservations.
    
    Signed-off-by: Arne Jansen <sensille at gmx.net>
    Reviewed-by: Josef Bacik <josef at redhat.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit e65e1535542931e51189832264cd282e5899e4b9
Author: Miao Xie <miaox at cn.fujitsu.com>
Date:   Mon Nov 22 03:04:43 2010 +0000

    btrfs: fix panic caused by direct IO
    
    btrfs paniced when we write >64KB data by direct IO at one time.
    
    Reproduce steps:
     # mkfs.btrfs /dev/sda5 /dev/sda6
     # mount /dev/sda5 /mnt
     # dd if=/dev/zero of=/mnt/tmpfile bs=100K count=1 oflag=direct
    
    Then btrfs paniced:
    mapping failed logical 1103155200 bio len 69632 len 12288
    ------------[ cut here ]------------
    kernel BUG at fs/btrfs/volumes.c:3010!
    [SNIP]
    Pid: 1992, comm: btrfs-worker-0 Not tainted 2.6.37-rc1 #1 D2399/PRIMERGY
    RIP: 0010:[<ffffffffa03d1462>]  [<ffffffffa03d1462>] btrfs_map_bio+0x202/0x210 [btrfs]
    [SNIP]
    Call Trace:
     [<ffffffffa03ab3eb>] __btrfs_submit_bio_done+0x1b/0x20 [btrfs]
     [<ffffffffa03a35ff>] run_one_async_done+0x9f/0xb0 [btrfs]
     [<ffffffffa03d3d20>] run_ordered_completions+0x80/0xc0 [btrfs]
     [<ffffffffa03d45a4>] worker_loop+0x154/0x5f0 [btrfs]
     [<ffffffffa03d4450>] ? worker_loop+0x0/0x5f0 [btrfs]
     [<ffffffffa03d4450>] ? worker_loop+0x0/0x5f0 [btrfs]
     [<ffffffff81083216>] kthread+0x96/0xa0
     [<ffffffff8100cec4>] kernel_thread_helper+0x4/0x10
     [<ffffffff81083180>] ? kthread+0x0/0xa0
     [<ffffffff8100cec0>] ? kernel_thread_helper+0x0/0x10
    
    We fix this problem by splitting bios when we submit bios.
    
    Reported-by: Tsutomu Itoh <t-itoh at jp.fujitsu.com>
    Signed-off-by: Miao Xie <miaox at cn.fujitsu.com>
    Tested-by: Tsutomu Itoh <t-itoh at jp.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 88f794ede7fadd4b63135b94d1561c1f2d5eb5f5
Author: Miao Xie <miaox at cn.fujitsu.com>
Date:   Mon Nov 22 03:02:55 2010 +0000

    btrfs: cleanup duplicate bio allocating functions
    
    extent_bio_alloc() and compressed_bio_alloc() are similar, cleanup
    similar source code.
    
    Signed-off-by: Miao Xie <miaox at cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 0c56fa9662927354255f2f64617d1de61fc03db9
Author: Miao Xie <miaox at cn.fujitsu.com>
Date:   Mon Nov 22 03:01:39 2010 +0000

    btrfs: fix free dip and dip->csums twice
    
    bio_endio() will free dip and dip->csums, so dip and dip->csums twice will
    be freed twice. Fix it.
    
    Signed-off-by: Miao Xie <miaox at cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit 784b4e29a26617589edd290dd2919735e190c06e
Author: Chris Mason <chris.mason at oracle.com>
Date:   Sun Nov 21 22:20:49 2010 -0500

    Btrfs: add migrate page for metadata inode
    
    Migrate page will directly call the btrfs btree writepage function,
    which isn't actually allowed.
    
    Our writepage assumes that you have locked the extent_buffer and
    flagged the block as written.  Without doing these steps, we can
    corrupt metadata blocks.
    
    A later commit will remove the btree writepage function since
    it is really only safely used internally by btrfs.  We
    use writepages for everything else.
    
    Signed-off-by: Chris Mason <chris.mason at oracle.com>

commit f24d86f1a49505cdea56728b853a5d0a3f8e3d11
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Nov 19 23:27:04 2010 +0000

    drm/radeon/kms: fix resume regression for some r5xx laptops
    
    I had removed this when I switched the atom indirect io methods
    to use the io bar rather than the mmio bar, but it appears it's
    still needed.
    
    Reported-by: Mark Lord <kernel at teksavvy.com>
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 791cfe2684a74ed7155254816ff9e89e6064277c
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sun Nov 21 10:58:05 2010 -0500

    drm/radeon/kms: fix regression in rs4xx i2c setup
    
    typo in my last i2c rework.
    
    Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=23222
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 3561d43fd289f590fdae672e5eb831b8d5cf0bf6
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Nov 21 15:18:56 2010 -0800

    Linux 2.6.37-rc3

commit 1142b71d85894dcff1466dd6c871ea3c89e0352c
Author: Will Deacon <will.deacon at arm.com>
Date:   Fri Nov 19 13:18:31 2010 +0100

    ARM: 6489/1: thumb2: fix incorrect optimisation in usracc
    
    Commit 8b592783 added a Thumb-2 variant of usracc which, when it is
    called with \rept=2, calls usraccoff once with an offset of 0 and
    secondly with a hard-coded offset of 4 in order to avoid incrementing
    the pointer again. If \inc != 4 then we will store the data to the wrong
    offset from \ptr. Luckily, the only caller that passes \rept=2 to this
    function is __clear_user so we haven't been actively corrupting user data.
    
    This patch fixes usracc to pass \inc instead of #4 to usraccoff
    when it is called a second time.
    
    Cc: <stable at kernel.org>
    Reported-by: Tony Thompson <tony.thompson at arm.com>
    Acked-by: Catalin Marinas <catalin.marinas at arm.com>
    Signed-off-by: Will Deacon <will.deacon at arm.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 8fbb97a2bc9b8c91b5a4588ba80709e48dad3f16
Author: Linus Walleij <linus.walleij at stericsson.com>
Date:   Fri Nov 19 10:16:05 2010 +0100

    ARM: 6488/1: nomadik: prevent sched_clock() wraparound
    
    The current implementation of sched_clock() for the Nomadik
    family is based on the clock source that will wrap around without
    any compensation. Currently on the Ux500 after 1030 seconds.
    
    Utilize cnt32_to_63 to expand the sched_clock() counter to 63
    bits and introduce a keepwarm() timer to assure that sched clock
    and this cnt32_to_63 is called atleast once every half period.
    
    When I print out the actual wrap-around time, and using
    a year (3600*24*365 seconds) as minumum wrap limit I get an
    actual wrap-around of:
    sched_clock: using 55 bits @ 8333125 Hz wrap in 416 days
    
    Signed-off-by: Linus Walleij <linus.walleij at stericsson.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 963fec4e0f4993486ee91edfafba0c972834d8c3
Author: Anand Gadiyar <gadiyar at ti.com>
Date:   Wed Nov 17 10:08:49 2010 +0100

    ARM: 6484/1: fix compile warning in mm/init.c
    
    Commit 7c63984b86 (ARM: do not define VMALLOC_END relative to PAGE_OFFSET)
    changed VMALLOC_END to be an explicit value. Before this, it was
    relative to PAGE_OFFSET and therefore converted to unsigned long
    as PAGE_OFFSET is an unsigned long. This introduced the following
    build warning. Fix this by changing the explicit defines of
    VMALLOC_END to be unsigned long.
    
      CC      arch/arm/mm/init.o
    arch/arm/mm/init.c: In function 'mem_init':
    arch/arm/mm/init.c:606: warning: format '%08lx' expects type 'long unsigned int', but argument 12 has type 'unsigned int'
    
    Signed-off-by: Anand Gadiyar <gadiyar at ti.com>
    Acked-by: Uwe Kleine-K <u.kleine-koenig at pengutronix.dee>
    Acked-by: Nicolas Pitre <nicolas.pitre at linaro.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit ffc43ef31395063d32e72de0a9c3d061347c3b94
Author: Per Fransson <per.xx.fransson at stericsson.com>
Date:   Mon Nov 15 14:31:17 2010 +0100

    ARM: 6473/1: Small update to ux500 specific L2 cache code
    
    This change updates the ux500 specific outer cache code to use
    the new *_relaxed() I/O accessors.
    
    Signed-off-by: Per Fransson <per.xx.fransson at stericsson.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit ddab1a3b30452bf6d2a2780dbb5fd962a85bec48
Author: Nicolas Kaiser <nikai at nikai.net>
Date:   Thu Nov 18 14:24:02 2010 +0000

    SuperH IrDA: correct Baud rate error correction
    
    It looks to me as if the second value of rate_err_array is intended
    to be a decimal 625. However, with a leading 0 it becomes an octal
    constant, and as such evaluates to a decimal 405.
    
    Signed-off-by: Nicolas Kaiser <nikai at nikai.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 33ac0b84eecaf5e7ee3baa3ef8294e8d8d267cd6
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Nov 21 10:06:48 2010 -0800

    atl1c: Fix hardware type check for enabling OTP CLK
    
    Commit 496c185c9495629ef1c65387cb2594578393cfe0 "atl1c: Add support
    for Atheros AR8152 and AR8152" added the condition:
    
                 if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c_b)
    
    for enabling OTP CLK, and the condition:
    
                 if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c)
    
    for disabling OTP CLK.  Since the two previously defined hardware
    types are athr_l1c and athr_l2c, the latter condition appears to be
    the correct one.  Change the former to match.
    
    Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639
Author: Eric Dumazet <eric.dumazet at gmail.com>
Date:   Sat Nov 20 07:46:35 2010 +0000

    net: allow GFP_HIGHMEM in __vmalloc()
    
    We forgot to use __GFP_HIGHMEM in several __vmalloc() calls.
    
    In ceph, add the missing flag.
    
    In fib_trie.c, xfrm_hash.c and request_sock.c, using vzalloc() is
    cleaner and allows using HIGHMEM pages as well.
    
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit a6c36ee677607b02d8ecc88e8a12785418b88107
Author: Simon Horman <horms at verge.net.au>
Date:   Sun Nov 21 09:58:04 2010 -0800

    bonding: change list contact to netdev at vger.kernel.org
    
    bonding-devel at lists.sourceforge.net seems only receive spam
    and discussion seems to already occur on netdev at vger.kernel.org.
    
    Signed-off-by: Simon Horman <horms at verge.net.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ab08853fab2093e5c6f5de56827a4c93dce4b055
Author: Anupam Chanda <anupamc at vmware.com>
Date:   Sun Nov 21 09:54:21 2010 -0800

    e1000: fix screaming IRQ
    
    VMWare reports that the e1000 driver has a bug when bringing down the
    interface, such that interrupts are not disabled in the hardware but the
    driver stops reporting that it consumed the interrupt.
    
    The fix is to set the driver's "down" flag later in the routine,
    after all the timers and such have exited, preventing the interrupt
    handler from being called and exiting early without handling the
    interrupt.
    
    CC: Anupam Chanda <anupamc at vmware.com>
    CC: stable kernel <stable at kernel.org>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c0ba10b512eb2e2a3888b6e6cc0e089f5e7a191b
Author: Russell King <rmk+kernel at arm.linux.org.uk>
Date:   Sun Nov 21 14:42:47 2010 +0000

    ARM: improve compiler's ability to optimize page tables
    
    Allow the compiler to better optimize the page table walking code
    by avoiding over-complex pmd_addr_end() calculations.  These
    calculations prevent the compiler spotting that we'll never iterate
    over the PMD table, causing it to create double nested loops where
    a single loop will do.
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit f3c91c1deaf8493526d8216be94c33e963f00962
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Nov 21 09:56:00 2010 +0000

    drm/i915: Only save/restore cursor regs if !KMS
    
    Under KMS, restoring the cursor is handled upon modeswitch in order to
    avoid enabling an undefined set of registers. At the moment, the cursor
    is restored before the aperture and modes are fully setup causing some
    invalid access during resume, such as:
    
      PGTBL_ER: 0x00040000
        Invalid GTT entry during Cursor Fetch
    
    Fix this by only performing cursor register save/restore under UMS where
    it is done in the correct sequence.
    
    Reported-by: Arkadiusz Miskiewicz <arekm at maven.pl>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit d1d788302e8c76e5138dfa61f4a5eee4f72a748f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Nov 21 09:23:48 2010 +0000

    drm/i915: Prevent integer overflow when validating the execbuffer
    
    Commit 2549d6c2 removed the vmalloc used for temporary storage of the
    relocation lists used during execbuffer. However, our use of vmalloc was
    being protected by an integer overflow check which we do want to
    preserve!
    
    Reported-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit d2a817130cdc142f1c80a8e60eca824a321926af
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Fri Nov 19 23:27:06 2010 -0800

    xen: re-enable boot-time ballooning
    
    Now that the balloon driver doesn't stumble over non-RAM pages, we
    can enable the extra space for ballooning.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit 66946f676776a6ef333db1cf7453ecf8a66c90df
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Tue Sep 14 10:32:32 2010 -0700

    xen/balloon: make sure we only include remaining extra ram
    
    If the user specifies mem= on the kernel command line, some or all
    of the extra memory E820 region may be clipped away, so make sure
    we don't try to add more extra memory than exists in E820.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit 2f70e0acd496398671606767122846278126a88b
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Thu Sep 2 23:11:17 2010 -0700

    xen/balloon: the balloon_lock is useless
    
    The balloon_lock is useless, since it protects nothing against nothing.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit 9be4d4575906af9698de660e477f949a076c87e1
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Tue Aug 31 15:01:16 2010 -0700

    xen: add extra pages to balloon
    
    Add extra pages in the pseudo-physical address space to the balloon
    so we can extend into them later.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit b86db4744230c94e480de56f1b7f31117edbf193
Merge: 76db8ac45fc738f7d7664fe9b56d15c594a45228 e681c047e47c0abe67bf95857f23814372793cb0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Nov 19 19:46:45 2010 -0800

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Add EXT4_IOC_TRIM ioctl to handle batched discard
      fs: Do not dispatch FITRIM through separate super_operation
      ext4: ext4_fill_super shouldn't return 0 on corruption
      jbd2: fix /proc/fs/jbd2/<dev> when using an external journal
      ext4: missing unlock in ext4_clear_request_list()
      ext4: fix setting random pages PageUptodate

commit e681c047e47c0abe67bf95857f23814372793cb0
Author: Lukas Czerner <lczerner at redhat.com>
Date:   Fri Nov 19 21:47:07 2010 -0500

    ext4: Add EXT4_IOC_TRIM ioctl to handle batched discard
    
    Filesystem independent ioctl was rejected as not common enough to be in
    core vfs ioctl. Since we still need to access to this functionality this
    commit adds ext4 specific ioctl EXT4_IOC_TRIM to dispatch
    ext4_trim_fs().
    
    It takes fstrim_range structure as an argument. fstrim_range is definec in
    the include/linux/fs.h and its definition is as follows.
    
    struct fstrim_range {
    	__u64 start;
    	__u64 len;
    	__u64 minlen;
    }
    
    start	- first Byte to trim
    len	- number of Bytes to trim from start
    minlen	- minimum extent length to trim, free extents shorter than this
      number of Bytes will be ignored. This will be rounded up to fs
      block size.
    
    After the FITRIM is done, the number of actually discarded Bytes is stored
    in fstrim_range.len to give the user better insight on how much storage
    space has been really released for wear-leveling.
    
    Signed-off-by: Lukas Czerner <lczerner at redhat.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 93bb41f4f8b89ac8b4d0a734bc59634cb0a29a89
Author: Lukas Czerner <lczerner at redhat.com>
Date:   Fri Nov 19 21:18:35 2010 -0500

    fs: Do not dispatch FITRIM through separate super_operation
    
    There was concern that FITRIM ioctl is not common enough to be included
    in core vfs ioctl, as Christoph Hellwig pointed out there's no real point
    in dispatching this out to a separate vector instead of just through
    ->ioctl.
    
    So this commit removes ioctl_fstrim() from vfs ioctl and trim_fs
    from super_operation structure.
    
    Signed-off-by: Lukas Czerner <lczerner at redhat.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4
Author: Sarah Sharp <sarah.a.sharp at linux.intel.com>
Date:   Tue Nov 16 15:58:52 2010 -0800

    xhci: Don't let the USB core disable SuperSpeed ports.
    
    Disabling SuperSpeed ports is a Very Bad Thing (TM).  It disables
    SuperSpeed terminations, which means that devices will never connect at
    SuperSpeed on that port.  For USB 2.0/1.1 ports, disabling the port meant
    that the USB core could always get a connect status change later.  That's
    not true with USB 3.0 ports.
    
    Do not let the USB core disable SuperSpeed ports.  We can't rely on the
    device speed in the port status registers, since that isn't valid until
    there's a USB device connected to the port.  Instead, we use the port
    speed array that's created from the Extended Capabilities registers.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp at linux.intel.com>
    Tested-by: Don Zickus <dzickus at redhat.com>
    Cc: stable at kernel.org

commit da6699ce4a889c3795624ccdcfe7181cc89f18e8
Author: Sarah Sharp <sarah.a.sharp at linux.intel.com>
Date:   Tue Oct 26 16:47:13 2010 -0700

    xhci: Setup array of USB 2.0 and USB 3.0 ports.
    
    An xHCI host controller contains USB 2.0 and USB 3.0 ports, which can
    occur in any order in the PORTSC registers.  We cannot read the port speed
    bits in the PORTSC registers at init time to determine the port speed,
    since those bits are only valid when a USB device is plugged into the
    port.
    
    Instead, we read the "Supported Protocol Capability" registers in the xHC
    Extended Capabilities space.  Those describe the protocol, port offset in
    the PORTSC registers, and port count.  We use those registers to create
    two arrays of pointers to the PORTSC registers, one for USB 3.0 ports, and
    another for USB 2.0 ports.  A third array keeps track of the port protocol
    major revision, and is indexed with the internal xHCI port number.
    
    This commit is a bit big, but it should be queued for stable because the "Don't
    let the USB core disable SuperSpeed ports" patch depends on it.  There is no
    other way to determine which ports are SuperSpeed ports without this patch.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp at linux.intel.com>
    Tested-by: Don Zickus <dzickus at redhat.com>
    Cc: stable at kernel.org

commit 7a3783efffc7bc2e702d774e47fad5b8e37e9ad1
Author: Paul Zimmerman <Paul.Zimmerman at synopsys.com>
Date:   Wed Nov 17 16:26:50 2010 -0800

    xhci: Fix reset-device and configure-endpoint commands
    
    We have been having problems with the USB-IF Gold Tree tests when plugging
    and unplugging devices from the tree. I have seen that the reset-device
    and configure-endpoint commands, which are invoked from
    xhci_discover_or_reset_device() and xhci_configure_endpoint(), will sometimes
    time out.
    
    After much debugging, I determined that the commands themselves do not actually
    time out, but rather their completion events do not get delivered to the right
    place.
    
    This happens when the command ring has just wrapped around, and it's enqueue
    pointer is left pointing to the link TRB. xhci_discover_or_reset_device() and
    xhci_configure_endpoint() use the enqueue pointer directly as their command
    TRB pointer, without checking whether it's pointing to the link TRB.
    
    When the completion event arrives, if the command TRB is pointing to the link
    TRB, the check against the command ring dequeue pointer in
    handle_cmd_in_cmd_wait_list() fails, so the completion inside the command does
    not get signaled.
    
    The patch below fixes the timeout problem for me.
    
    This should be queued for the 2.6.35 and 2.6.36 stable trees.
    
    Signed-off-by: Paul Zimmerman <paulz at synopsys.com>
    Signed-off-by: Sarah Sharp <sarah.a.sharp at linux.intel.com>
    Cc: stable at kernel.org

commit 76db8ac45fc738f7d7664fe9b56d15c594a45228
Merge: caf8394524fdc039b090cd3af99157e9e76f4f06 3105c19c450ac7c18ab28c19d364b588767261b3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Nov 19 15:32:22 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: fix readdir EOVERFLOW on 32-bit archs
      ceph: fix frag offset for non-leftmost frags
      ceph: fix dangling pointer
      ceph: explicitly specify page alignment in network messages
      ceph: make page alignment explicit in osd interface
      ceph: fix comment, remove extraneous args
      ceph: fix update of ctime from MDS
      ceph: fix version check on racing inode updates
      ceph: fix uid/gid on resent mds requests
      ceph: fix rdcache_gen usage and invalidate
      ceph: re-request max_size if cap auth changes
      ceph: only let auth caps update max_size
      ceph: fix open for write on clustered mds
      ceph: fix bad pointer dereference in ceph_fill_trace
      ceph: fix small seq message skipping
      Revert "ceph: update issue_seq on cap grant"

commit caf8394524fdc039b090cd3af99157e9e76f4f06
Merge: 6656b3fc8aba2eb7ca00c06c7fe4917938b0b652 0302b8622ce696af1cda22fcf207d3793350e896
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Nov 19 15:25:59 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (31 commits)
      net: fix kernel-doc for sk_filter_rcu_release
      be2net: Fix to avoid firmware update when interface is not open.
      netfilter: fix IP_VS dependencies
      net: irda: irttp: sync error paths of data- and udata-requests
      ipv6: Expose reachable and retrans timer values as msecs
      ipv6: Expose IFLA_PROTINFO timer values in msecs instead of jiffies
      3c59x: fix build failure on !CONFIG_PCI
      ipg.c: remove id [SUNDANCE, 0x1021]
      net: caif: spi: fix potential NULL dereference
      ath9k_htc: Avoid setting QoS control for non-QoS frames
      net: zero kobject in rx_queue_release
      net: Fix duplicate volatile warning.
      MAINTAINERS: Add stmmac maintainer
      bonding: fix a race in IGMP handling
      cfg80211: fix can_beacon_sec_chan, reenable HT40
      gianfar: fix signedness issue
      net: bnx2x: fix error value sign
      8139cp: fix checksum broken
      r8169: fix checksum broken
      rds: Integer overflow in RDS cmsg handling
      ...

commit ed919b0125b26dcc052e44836f66e7e1f5c49c7e
Author: Ohad Ben-Cohen <ohad at wizery.com>
Date:   Fri Nov 19 09:29:09 2010 +0200

    mmc: sdio: fix runtime PM anomalies by introducing MMC_CAP_POWER_OFF_CARD
    
    Some board/card/host configurations are not capable of powering off the
    card after boot.
    
    To support such configurations, and to allow smoother transition to
    runtime PM behavior, MMC_CAP_POWER_OFF_CARD is added, so hosts need to
    explicitly indicate whether it's OK to power off their cards after boot.
    
    SDIO core will enable runtime PM for a card only if that cap is set.
    As a result, the card will be powered down after boot, and will only
    be powered up again when a driver is loaded (and then it's up to the
    driver to decide whether power will be kept or not).
    
    This will prevent sdio_bus_probe() failures with setups that do not
    support powering off the card.
    
    Reported-and-tested-by: Daniel Drake <dsd at laptop.org>
    Reported-and-tested-by: Arnd Hannemann <arnd at arndnet.de>
    Signed-off-by: Ohad Ben-Cohen <ohad at wizery.com>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit 4d0812c37f2f6cf6fc7ca086b5a5e572cbbe7f6d
Author: Ohad Ben-Cohen <ohad at wizery.com>
Date:   Sun Nov 14 12:40:33 2010 +0200

    mmc: sdio: fix nasty oops in mmc_sdio_detect
    
    Power off the card in mmc_sdio_detect __before__ a potential error
    handler, which completely removes the card, executes, and only if the
    card was successfully powered on beforehand.
    
    While we're at it, use the _sync variant of the runtime PM put API, in
    order to ensure that the card is left powered off in case an error
    occurred, and the card is going to be removed.
    
    Reproduced and tested on the OLPC XO-1.5.
    
    Reported-by: Daniel Drake <dsd at laptop.org>
    Signed-off-by: Ohad Ben-Cohen <ohad at wizery.com>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit 6656b3fc8aba2eb7ca00c06c7fe4917938b0b652
Merge: 33e0d57f5d2f079104611be9f3fccc27ef2c6b24 b1353e4f40f6179ab26a3bb1b2e1fe29ffe534f5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Nov 19 11:59:49 2010 -0800

    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:
      sata_via: apply magic FIFO fix to vt6420 too

commit 33e0d57f5d2f079104611be9f3fccc27ef2c6b24
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Nov 19 11:54:40 2010 -0800

    Revert "kernel: make /proc/kallsyms mode 400 to reduce ease of attacking"
    
    This reverts commit 59365d136d205cc20fe666ca7f89b1c5001b0d5a.
    
    It turns out that this can break certain existing user land setups.
    Quoth Sarah Sharp:
    
     "On Wednesday, I updated my branch to commit 460781b from linus' tree,
      and my box would not boot.  klogd segfaulted, which stalled the whole
      system.
    
      At first I thought it actually hung the box, but it continued booting
      after 5 minutes, and I was able to log in.  It dropped back to the
      text console instead of the graphical bootup display for that period
      of time.  dmesg surprisingly still works.  I've bisected the problem
      down to this commit (commit 59365d136d205cc20fe666ca7f89b1c5001b0d5a)
    
      The box is running klogd 1.5.5ubuntu3 (from Jaunty).  Yes, I know
      that's old.  I read the bit in the commit about changing the
      permissions of kallsyms after boot, but if I can't boot that doesn't
      help."
    
    So let's just keep the old default, and encourage distributions to do
    the "chmod -r /proc/kallsyms" in their bootup scripts.  This is not
    worth a kernel option to change default behavior, since it's so easily
    done in user space.
    
    Reported-and-bisected-by: Sarah Sharp <sarah.a.sharp at linux.intel.com>
    Cc: Marcus Meissner <meissner at suse.de>
    Cc: Tejun Heo <tj at kernel.org>
    Cc: Eugene Teo <eugeneteo at kernel.org>
    Cc: Jesper Juhl <jj at chaosbits.net>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 864ee6cb22fd64c1f4fba8ea3f390ffd8816b563
Merge: 973d168de251d46605dc00d2c7f83848a5af9fb9 de391d12500ede13faa7ecadbe900a8de1f76cfa
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Nov 19 10:31:04 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: fix typo in keycode validation supporting large scancodes
      Input: aiptek - tighten up permissions on sysfs attributes
      Input: sysrq - pass along lone Alt + SysRq

commit 973d168de251d46605dc00d2c7f83848a5af9fb9
Merge: 764bc5691765470b486ec70916935c771d7f5bb1 16c59ef33b389217c29122235e475557bc1412a1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Nov 19 10:28:13 2010 -0800

    Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel
    
    * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
      drm/i915: Disable FBC on Ironlake to save 1W
      drm/i915: Take advantage of auto-polling CRT hotplug detection on PCH hardware
      drm/i915/crt: Introduce struct intel_crt
      drm/i915: Do not hold mutex when faulting in user addresses
      drm: radeon: fix error value sign
      drm/radeon/kms: fix and unify tiled buffer alignment checking for r6xx/7xx
      drm/i915: Retire any pending operations on the old scanout when switching
      drm/i915: Fix I2C adapter registration

commit 764bc5691765470b486ec70916935c771d7f5bb1
Merge: 589136bfa784a4558b397f017ca2f06f0ca9080e 164bcb94bc821fcbac752e809b4ac7c6f15d13b5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri Nov 19 10:27:57 2010 -0800

    Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (40 commits)
      drm/radeon/kms: i2c s/sprintf/snprintf/g for safety
      drm/radeon/kms: fix i2c pad masks on rs4xx
      drm/ttm: Fix up a theoretical deadlock
      drm/radeon/kms: fix tiling info on evergreen
      drm/radeon/kms: fix alignment when allocating buffers
      drm/vmwgfx: Fix up an error path during bo creation
      drm/radeon/kms: register an i2c adapter name for the dp aux bus
      drm/radeon/kms/atom: add proper external encoders support
      drm/radeon/kms/atom: cleanup and unify DVO handling
      drm/radeon/kms: properly power up/down the eDP panel as needed (v4)
      drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode()
      drm/radeon/kms: turn the backlight off explicitly for dpms
      drm/radeon/kms: fix typo in r600 cs checker
      drm: radeon: fix error value sign
      drm/radeon/kms: fix and unify tiled buffer alignment checking for r6xx/7xx
      nouveau: Acknowledge HPD irq in handler, not bottom half
      drm/nouveau: Fix a few confusions between "chipset" and "card_type".
      drm/nouveau: don't expose backlight control when available through ACPI
      drm/nouveau/pm: improve memtiming mappings
      drm/nouveau: Make PCIE GART size depend on the available RAMIN space.
      ...

commit b1353e4f40f6179ab26a3bb1b2e1fe29ffe534f5
Author: Tejun Heo <tj at kernel.org>
Date:   Fri Nov 19 15:29:19 2010 +0100

    sata_via: apply magic FIFO fix to vt6420 too
    
    vt6420 has the same FIFO overflow problem as vt6421 when combined with
    certain devices.  This patch applies the magic fix to vt6420 too.
    
    Signed-off-by: Tejun Heo <tj at kernel.org>
    Reported-by: Martin Qvist <q at maq.dk>
    Reported-by: Peter Zijlstra <peterz at infradead.org>
    Cc: Joseph Chan <JosephChan at via.com.tw>
    Cc: stable at kernel.org
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Fri Nov 19 09:30:18 2010 -0800

    staging: fix winbond build, needs delay.h
    
    winbond drivers use msleep() and delay(), so include linux/delay.h
    in a common header file to prevent build errors.
    
    drivers/staging/winbond/phy_calibration.c:987: error: implicit declaration of function 'msleep'
    drivers/staging/winbond/phy_calibration.c:1556: error: implicit declaration of function 'udelay'
    drivers/staging/winbond/reg.c:894: error: implicit declaration of function 'msleep'
    drivers/staging/winbond/reg.c:1178: error: implicit declaration of function 'udelay'
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 0302b8622ce696af1cda22fcf207d3793350e896
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Thu Nov 18 13:02:37 2010 +0000

    net: fix kernel-doc for sk_filter_rcu_release
    
    Fix kernel-doc warning for sk_filter_rcu_release():
    
    Warning(net/core/filter.c:586): missing initial short description on line:
     * 	sk_filter_rcu_release: Release a socket filter by rcu_head
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Cc:	"David S. Miller" <davem at davemloft.net>
    Cc:	netdev at vger.kernel.org
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit d9efd2af461abb7b54c49c1b7e654d496dd1d379
Author: Sarveshwar Bandi <Sarveshwar.Bandi at emulex.com>
Date:   Thu Nov 18 23:44:45 2010 +0000

    be2net: Fix to avoid firmware update when interface is not open.
    
    Since interrupts are enabled only when open is called on the interface,
    Attempting a firmware update operation when interface is down could lead to
    partial success or failure of operation. This fix fails the request if
    netif_running is false.
    
    Signed-off-by: Sarveshwar Bandi <Sarveshwar.Bandi at emulex.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 5a9ae68a349aa076bc8557ee2fcf865574459282
Author: Darrick J. Wong <djwong at us.ibm.com>
Date:   Fri Nov 19 09:56:44 2010 -0500

    ext4: ext4_fill_super shouldn't return 0 on corruption
    
    At the start of ext4_fill_super, ret is set to -EINVAL, and any failure path
    out of that function returns ret.  However, the generic_check_addressable
    clause sets ret = 0 (if it passes), which means that a subsequent failure (e.g.
    a group checksum error) returns 0 even though the mount should fail.  This
    causes vfs_kern_mount in turn to think that the mount succeeded, leading to an
    oops.
    
    A simple fix is to avoid using ret for the generic_check_addressable check,
    which was last changed in commit 30ca22c70e3ef0a96ff84de69cd7e8561b416cb2.
    
    Signed-off-by: Darrick J. Wong <djwong at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 1b1d76e2df2a0aa965d6a227db7061d3fff029b1
Author: Dan Carpenter <error27 at gmail.com>
Date:   Thu Nov 18 06:58:04 2010 +0300

    UBI: release locks in check_corruption
    
    Commit 45aafd32996e27 "UBI: tighten the corrupted PEB criteria"
    introduced some return paths that didn't release the ubi->buf_mutex
    
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>

commit 14870b457524e745f1a118e17873d104b1a47b70
Author: Abhijith Das <adas at redhat.com>
Date:   Thu Nov 18 11:24:24 2010 -0500

    GFS2: Userland expects quota limit/warn/usage in 512b blocks
    
    Userland programs using the quotactl() syscall assume limit/warn/usage
    block counts in 512b basic blocks which were instead being read/written
    in fs blocksize in gfs2. With this patch, gfs2 correctly interacts with
    the syscall using 512b blocks.
    
    Signed-off-by: Abhi Das <adas at redhat.com>
    Reviewed-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>

commit 2811fe2beb7cb9f34eef4bc9627dcabb401bc05e
Author: Axel Lin <axel.lin at gmail.com>
Date:   Fri Nov 19 15:48:06 2010 +0800

    ASoC: uda134x - set reg_cache_default to uda134x_reg
    
    After checking the code in 2.6.36,
    I found this is missing during multi-component conversion.
    
    Signed-off-by: Axel Lin <axel.lin at gmail.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 16c59ef33b389217c29122235e475557bc1412a1
Author: Alex Shi <alex.shi at intel.com>
Date:   Fri Nov 19 09:33:55 2010 +0000

    drm/i915: Disable FBC on Ironlake to save 1W
    
    Frame buffer compression is broken on Ironlake due to buggy hardware.
    Currently it is disabled through chicken bits, but it still consumes
    over 1W more than if we simply never attempt to enable the FBC code
    paths.
    
    Signed-off-by: Alex Shi <alex.shi at intel.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Cc: stable at kernel.org

commit e7dbb2f2f8ac843ab5e4d6a8e9a71d16089d324b
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Nov 16 16:03:53 2010 +0800

    drm/i915: Take advantage of auto-polling CRT hotplug detection on PCH hardware
    
    Both IBX and CPT have an automatic hotplug detection mode which appears to work reliably enough
    that we can dispense with the manual force hotplug trigger stuff. This means that
    hotplug detection is as simple as reading the current hotplug register values.
    
    The first time the hotplug detection is activated, the code synchronously waits for a hotplug
    sequence in case the hardware hasn't bothered to do a detection cycle since being initialized.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit c9a1c4cded955176479a28556f546d3d015aee91
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Nov 16 10:58:37 2010 +0000

    drm/i915/crt: Introduce struct intel_crt
    
    We will use this structure in future patches to store CRT specific
    information on the encoder.
    
    Split out and tweaked from a patch by Keith Packard.
    
    Signed-off-by: Keith Packard <keithp at kithp.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit 51311d0a5c69adaec582080ad8d9b174a44dfd7a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 17 09:10:42 2010 +0000

    drm/i915: Do not hold mutex when faulting in user addresses
    
    Linus Torvalds found that it was rather trivial to trigger a system
    freeze:
    
      In fact, with lockdep, I don't even need to do the sysrq-d thing: it
      shows the bug as it happens. It's the X server taking the same lock
      recursively.
    
      Here's the problem:
    
        =============================================
        [ INFO: possible recursive locking detected ]
        2.6.37-rc2-00012-gbdbd01a #7
        ---------------------------------------------
        Xorg/2816 is trying to acquire lock:
         (&dev->struct_mutex){+.+.+.}, at: [<ffffffff812c626c>] i915_gem_fault+0x50/0x17e
    
        but task is already holding lock:
         (&dev->struct_mutex){+.+.+.}, at: [<ffffffff812c403b>] i915_mutex_lock_interruptible+0x28/0x4a
    
        other info that might help us debug this:
        2 locks held by Xorg/2816:
         #0:  (&dev->struct_mutex){+.+.+.}, at: [<ffffffff812c403b>] i915_mutex_lock_interruptible+0x28/0x4a
         #1:  (&mm->mmap_sem){++++++}, at: [<ffffffff81022d4f>] page_fault+0x156/0x37b
    
    This recursion was introduced by rearranging the locking to avoid the
    double locking on the fast path (4f27b5d and fbd5a26d) and the
    introduction of the prefault to encourage the fast paths (b5e4f2b). In
    order to undo the problem, we rearrange the code to perform the access
    validation upfront, attempt to prefault and then fight for control of the
    mutex.  the best case scenario where the mutex is uncontended the
    prefaulting is not wasted.
    
    Reported-and-tested-by: Linus Torvalds <torvalds at linux-foundation.org>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit b5d827b641b192ceb6968c21feb544c744e43108
Author: Ian Campbell <ian.campbell at citrix.com>
Date:   Mon Dec 7 17:10:27 2009 -0800

    xen: make evtchn's name less generic
    
    Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit dfcd6e438927ad8c54278e5b1a34a4fe76e57ad2
Merge: d53e4307c2f3856167407a1d9b8f8fa001286066 f278ea849e15147269190e943937fa82e66078b1
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Fri Nov 19 16:43:23 2010 +0900

    Merge branch 'common/clkfwk' into sh-fixes-for-linus

commit f278ea849e15147269190e943937fa82e66078b1
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Fri Nov 19 16:40:35 2010 +0900

    sh: clkfwk: Build fix for non-legacy CPG changes.
    
    The disabling of the init op for non-legacy clocks neglected to do the
    same in the core clock framework, resulting in a build failure. Fix it
    up.
    
    Reported-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 67cb40560940ba36de22d66f0d5d8efe235c8bb1
Merge: bc7fc5e33e1a093e5f9e196595843bb096471586 70697d540c0598ad023a391d4c895044db9a6624
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Thu Nov 18 22:43:38 2010 -0800

    Merge branch 'xen/dev-evtchn' into upstream/evtchn
    
    * xen/dev-evtchn:
      xen/evtchn: add missing static
      xen/evtchn: Fix name of Xen event-channel device
      xen/evtchn: don't do unbind_from_irqhandler under spinlock
      xen/evtchn: remove spurious barrier
      xen/evtchn: ports start enabled
      xen/evtchn: dynamically allocate port_user array
      xen/evtchn: track enabled state for each port

commit bc7fc5e33e1a093e5f9e196595843bb096471586
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Thu Nov 18 22:32:17 2010 -0800

    xen/evtchn: the evtchn device is non-seekable
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit 9045d47ea362e6a3727ee3f1b69a1b656976772e
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date:   Thu Nov 18 17:14:46 2010 -0800

    Revert "xen/privcmd: create address space to allow writable mmaps"
    
    This reverts commit 24a89b5be4cf2b7f1b49b56b6cb4a7b71fccf241.
    
    We should no longer need an address space now that we're correctly
    setting VM_PFNMAP on our vmas.
    
    Conflicts:
    
    	drivers/xen/xenfs/super.c
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

commit 226291aa4641fa13cb5dec3bcb3379faa83009e2
Author: dann frazier <dann.frazier at canonical.com>
Date:   Thu Nov 18 15:03:09 2010 -0700

    ocfs2_connection_find() returns pointer to bad structure
    
    If ocfs2_live_connection_list is empty, ocfs2_connection_find() will return
    a pointer to the LIST_HEAD, cast as a ocfs2_live_connection. This can cause
    an oops when ocfs2_control_send_down() dereferences c->oc_conn:
    
    Call Trace:
      [<ffffffffa00c2a3c>] ocfs2_control_message+0x28c/0x2b0 [ocfs2_stack_user]
      [<ffffffffa00c2a95>] ocfs2_control_write+0x35/0xb0 [ocfs2_stack_user]
      [<ffffffff81143a88>] vfs_write+0xb8/0x1a0
      [<ffffffff8155cc13>] ? do_page_fault+0x153/0x3b0
      [<ffffffff811442f1>] sys_write+0x51/0x80
      [<ffffffff810121b2>] system_call_fastpath+0x16/0x1b
    
    Fix by explicitly returning NULL if no match is found.
    
    Signed-off-by: dann frazier <dann.frazier at canonical.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 164bcb94bc821fcbac752e809b4ac7c6f15d13b5
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Nov 18 11:37:18 2010 -0500

    drm/radeon/kms: i2c s/sprintf/snprintf/g for safety
    
    As per advice from Jean Delvare.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Acked-by: Jean Delvare <khali at linux-fr.org>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit be66305718bee9927e6acc6b75618ce3cd745718
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Nov 18 17:18:08 2010 -0500

    drm/radeon/kms: fix i2c pad masks on rs4xx
    
    These got lost in the last i2c cleanup.  Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=23222
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 589136bfa784a4558b397f017ca2f06f0ca9080e
Merge: 5d3efe0735350ca9329259f34ac6a84b36dd83f2 23e701e6208191ad103517ae7a700f2dc59ab2ec
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 18 15:01:43 2010 -0800

    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:
      [libata] remove SCSI host lock and serial number usage from ata_scsi_queuecmd

commit 5d3efe0735350ca9329259f34ac6a84b36dd83f2
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Thu Nov 18 12:27:37 2010 -0800

    MAINTAINERS: update documentation entries
    
    Update kernel-doc and Documentation maintainers info.
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f830673f6aa28741ff6993deade587c8550c1dd3
Author: Andres Salomon <dilinger at queued.net>
Date:   Thu Nov 18 12:27:36 2010 -0800

    Documentation/development-process: more staging info
    
    Document things that I would've liked to have known when submitting a driver
    to gregkh for staging.
    
    Signed-off-by: Andres Salomon <dilinger at queued.net>
    Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e4fabad30eaba5bb78cd8d47885f1b705a0918a0
Author: Andres Salomon <dilinger at queued.net>
Date:   Thu Nov 18 12:27:35 2010 -0800

    Documentation/development-process: use -next trees instead of staging
    
    This is confusing, as we have "staging" trees for drivers/staging.  Call
    them -next trees.
    
    Signed-off-by: Andres Salomon <dilinger at queued.net>
    Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f99e0e98f95bbe8833bd96c314b71ef859851bc5
Author: Hans J. Koch <hjk at hansjkoch.de>
Date:   Thu Nov 18 12:27:34 2010 -0800

    Documentation: change email address for Hans Koch
    
    My old mail address doesn't exist anymore. This changes all occurrences
    to my new address.
    
    Signed-off-by: Hans J. Koch <hjk at hansjkoch.de>
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ebde7b062cd9e2ea968c93f23f73dd28c0a192d1
Author: Bernhard Walle <walle at corscience.de>
Date:   Thu Nov 18 12:27:33 2010 -0800

    Documentation/gpio.txt: explain poll/select usage
    
    Add a bit more information how to use poll(2) on GPIO value files
    correctly. For me it was not clear that I need to poll(2) for
    POLLPRI|POLLERR or select(2) for exceptfds.
    
    Signed-off-by: Bernhard Walle <walle at corscience.de>
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 09c9feb94672bdb3ca6d424a292ffc26eff8ca0b
Author: Dan Carpenter <error27 at gmail.com>
Date:   Thu Nov 18 12:27:32 2010 -0800

    Documentation: make configfs example code simpler, clearer
    
    If "p" is NULL then it will cause an oops when we pass it to
    simple_strtoul().  In this case "p" can not be NULL so I removed the
    check.  I also changed the check a little to make it more explicit that
    we are testing whether p points to the NUL char.
    
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Acked-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2b35f4d9cab365d37c7b34ce51e1c1144c312d05
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Thu Nov 18 12:27:31 2010 -0800

    kernel-doc: escape xml for structs
    
    scripts/kernel-doc was leaving unescaped '<', '>', and '&' in
    generated xml output for structs.  This causes xml parser errors.
    Convert these characters to "&lt;", "&gt;", and "&amp;" as needed
    to prevent errors.
    
    Most of the conversion was already done; complete it just before
    output.
    
    Documentation/DocBook/device-drivers.xml:41883: parser error : StartTag: invalid element name
    #define INPUT_KEYMAP_BY_INDEX	(1 << 0)
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a2a2f55291918f6cf9287d7beaecc7bc007a9f1c
Author: Milton Miller <miltonm at bga.com>
Date:   Wed Nov 17 22:20:11 2010 -0600

    ocfs2: char is not always signed
    
    Commit 1c66b360fe262 (Change some lock status member in ocfs2_lock_res
    to char.)  states that these fields need to be signed due to comparision
    to -1, but only changed the type from unsigned char to char.   However, it
    is a compiler option if char is a signed or unsigned type.  Change these
    fields to signed char so the code will work with all compilers.
    
    Signed-off-by: Milton Miller <miltonm at bga.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 1989a80a60d2f620bad99196d6c1801c2afd7c71
Author: Tristan Ye <tristan.ye at oracle.com>
Date:   Mon Nov 15 21:39:09 2010 +0800

    Ocfs2: Stop tracking a negative dentry after dentry_iput().
    
    I suddenly hit the problem during 2.6.37-rc1 regression test, which was
    introduced by commit '5e98d492406818e6a94c0ba54c61f59d40cefa4a'(Track
    negative entries v3), following scenario reproduces the issue easily:
    
    Node A			Node B
    ================	============
    $touch 	testfile
    			$ls testfile
    $rm -rf testfile
    $touch 	testfile
    			$ls testfile
    			ls: cannot access testfile: No such file or directory
    
    This patch stops tracking the dentry which was negativated by a inode deletion,
    so as to force the revaliation in next lookup, in case we'll touch the inode
    again in the same node.
    
    It didn't hurt the performance of multiple lookup for none-existed files anyway,
    while regresses a bit in the first try after a file deletion.
    
    Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 1cf257f511918ba5b2eabd64d9acd40f1d7866ef
Author: Jiri Slaby <jslaby at suse.cz>
Date:   Sat Nov 6 10:06:52 2010 +0100

    ocfs2: fix memory leak
    
    Stanse found that o2hb_heartbeat_group_make_item leaks some memory on
    fail paths. Fix the paths by adding a new label and jump there.
    
    Signed-off-by: Jiri Slaby <jslaby at suse.cz>
    Cc: Mark Fasheh <mfasheh at suse.com>
    Cc: Joel Becker <joel.becker at oracle.com>
    Cc: ocfs2-devel at oss.oracle.com
    Cc: Alexander Viro <viro at zeniv.linux.org.uk>
    Cc: linux-fsdevel at vger.kernel.org
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit a48a982a6bd3896274dd643397c72da9258411e2
Author: David Sterba <dsterba at suse.cz>
Date:   Tue Nov 2 23:36:02 2010 +0100

    fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock
    
    coccinelle check scripts/coccinelle/locks/call_kern.cocci found that
    in fs/ocfs2/dlm/dlmdomain.c an allocation with GFP_KERNEL is done
    with locks held:
    
    dlm_query_region_handler
      spin_lock(dlm_domain_lock)
        dlm_match_regions
          kmalloc(GFP_KERNEL)
    
    Change it to GFP_ATOMIC.
    
    Signed-off-by: David Sterba <dsterba at suse.cz>
    CC: Joel Becker <joel.becker at oracle.com>
    CC: Mark Fasheh <mfasheh at suse.com>
    CC: ocfs2-devel at oss.oracle.com
    
    --
    Exists in v2.6.37-rc1 and current linux-next.
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit dba4490d22a496f9b7c21919cf3effbed5851213
Author: Patrick McHardy <kaber at trash.net>
Date:   Thu Nov 18 08:20:57 2010 +0000

    netfilter: fix IP_VS dependencies
    
    When NF_CONNTRACK is enabled, IP_VS uses conntrack symbols.
    Therefore IP_VS can't be linked statically when conntrack
    is built modular.
    
    Reported-by: Justin P. Mattock <justinmattock at gmail.com>
    Tested-by: Justin P. Mattock <justinmattock at gmail.com>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 925e277f5221defdc53cbef1ac3ed1803fa32357
Author: Wolfram Sang <w.sang at pengutronix.de>
Date:   Tue Nov 16 09:40:02 2010 +0000

    net: irda: irttp: sync error paths of data- and udata-requests
    
    irttp_data_request() returns meaningful errorcodes, while irttp_udata_request()
    just returns -1 in similar situations. Sync the two and the loglevels of the
    accompanying output.
    
    Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
    Cc: Samuel Ortiz <sameo at linux.intel.com>
    Cc: David Miller <davem at davemloft.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 18a31e1e282f9ed563b131526a88162ccbe04ee3
Author: Thomas Graf <tgraf at infradead.org>
Date:   Wed Nov 17 04:12:02 2010 +0000

    ipv6: Expose reachable and retrans timer values as msecs
    
    Expose reachable and retrans timer values in msecs instead of jiffies.
    Both timer values are already exposed as msecs in the neighbour table
    netlink interface.
    
    The creation timestamp format with increased precision is kept but
    cleaned up.
    
    Signed-off-by: Thomas Graf <tgraf at infradead.org>
    Cc: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 07bfa524d4c67acbb6b6fbdd1dea923d07853c04
Merge: 93908d192686d8285dd6441ff855df92a40103d2 3bf30b56c4f0a1c4fae34050b7db4527c92891e8
Author: David S. Miller <davem at davemloft.net>
Date:   Thu Nov 18 11:56:09 2010 -0800

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 2811036a19624168ff9342bb85421dbbb1d2ac0d
Author: Youquan Song <youquan.song at linux.intel.com>
Date:   Thu Nov 18 18:28:20 2010 -0500

    Fix build failure at cx25821-video driver
    
    Kernel build fail for cx25821-video has depends on smp_lock.h header
    file, but the dependency is removed in recent commit 451a3c24b013.
    
    Signed-off-by: Youquan Song <youquan.song at intel.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a3a972a053010bfd61c13cfa4ce688d4eebd9a19
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Nov 18 11:21:04 2010 -0800

    Staging: line6: fix up my fixup for some sysfs attribute permissions
    
    They should be writable by root, not readable.
    Doh, stupid me with the wrong flags.
    
    Reported-by: Jonathan Cameron <jic23 at cam.ac.uk>
    Cc: Markus Grabner <grabner at icg.tugraz.at>
    Cc: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit a3d13107012ea614184d3c58bb7b579905d5da11
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Nov 18 11:21:04 2010 -0800

    Staging: zram: fix up my fixup for some sysfs attribute permissions
    
    They should be writable by root, not readable.
    Doh, stupid me with the wrong flags.
    
    Reported-by: Jonathan Cameron <jic23 at cam.ac.uk>
    Cc: Nitin Gupta <ngupta at vflare.org>
    Cc: Pekka Enberg <penberg at cs.helsinki.fi>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 926c11151e3b82e4facbf2bd2bea15f0ca0ac6f9
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Nov 18 11:21:04 2010 -0800

    Staging: udlfb: fix up my fixup for some sysfs attribute permissions
    
    They should be writable by root, not readable.
    Doh, stupid me with the wrong flags.
    
    Reported-by: Jonathan Cameron <jic23 at cam.ac.uk>
    Cc: Bernie Thompson <bernie at plugable.com>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 4d7bc388b44e42a1feafa35e50eef4f24d6ca59d
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Nov 18 11:21:04 2010 -0800

    Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions
    
    They should be writable by root, not readable.
    Doh, stupid me with the wrong flags.
    
    Reported-by: Jonathan Cameron <jic23 at cam.ac.uk>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit c9e51d9e4bee3da47623622884f4828e079a0581
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Nov 18 11:21:04 2010 -0800

    Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions
    
    They should be writable by root, not readable.
    Doh, stupid me with the wrong flags.
    
    Reported-by: Jonathan Cameron <jic23 at cam.ac.uk>
    Acked-by: Jonathan Cameron <jic23 at cam.ac.uk>
    Cc: Barry Song <Barry.Song at analog.com>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 2a767fda5d0d8dcff465724dfad6ee131489b3f2
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Nov 18 11:21:04 2010 -0800

    Staging: frontier: fix up my fixup for some sysfs attribute permissions
    
    They should be writable by root, not readable.
    Doh, stupid me with the wrong flags.
    
    Reported-by: Jonathan Cameron <jic23 at cam.ac.uk>
    Cc: David Taht <d at teklibre.com>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 515b4987ccd097cdf5416530b05fdf9e01afe95a
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Nov 18 11:21:04 2010 -0800

    Staging: asus_oled: fix up my fixup for some sysfs attribute permissions
    
    They should be writable by root, not readable.
    Doh, stupid me with the wrong flags.
    
    Reported-by: Jonathan Cameron <jic23 at cam.ac.uk>
    Cc: Jakub Schmidtke <sjakub at gmail.com>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 93908d192686d8285dd6441ff855df92a40103d2
Author: Thomas Graf <tgraf at infradead.org>
Date:   Wed Nov 17 01:44:24 2010 +0000

    ipv6: Expose IFLA_PROTINFO timer values in msecs instead of jiffies
    
    IFLA_PROTINFO exposes timer related per device settings in jiffies.
    Change it to expose these values in msecs like the sysctl interface
    does.
    
    I did not find any users of IFLA_PROTINFO which rely on any of these
    values and even if there are, they are likely already broken because
    there is no way for them to reliably convert such a value to another
    time format.
    
    Signed-off-by: Thomas Graf <tgraf at infradead.org>
    Cc: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ed1d77b18c9f4ff06d5b42c65041aa55a1447053
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 18 10:56:29 2010 -0800

    hardirq.h: needs sched.h if using BKL
    
    This really isn't the right thing to do, and strictly speaking we should
    have the BKL depth count in the thread info right next to the preempt
    count.  The two really do go together.
    
    However, since that would involve a patch to all architectures, and the
    BKL is finally going away, it's simply not worth the effort to do the
    RightThing(tm).  Just re-instate the <linux/sched.h> include that we
    used to get accidentally from the smp_lock.h one.
    
    This is all fallout from the same old "BKL: remove extraneous #include
    <smp_lock.h>" commit.
    
    Reported-by: Ingo Molnar <mingo at elte.hu>
    Tested-by: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: Arnd Bergmann <arnd at arndb.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d530db0db90378b5674cb78d9c0cfcc83f851a5e
Author: Namhyung Kim <namhyung at gmail.com>
Date:   Tue Nov 16 05:27:51 2010 +0000

    3c59x: fix build failure on !CONFIG_PCI
    
    VORTEX_PCI() could return NULL so it needs to be casted before
    accessing any member of struct pci_dev. This fixes following
    build failure. Likewise VORTEX_EISA() was changed also.
    
      CC [M]  drivers/net/3c59x.o
    drivers/net/3c59x.c: In function 'acpi_set_WOL':
    drivers/net/3c59x.c:3211:39: warning: dereferencing 'void *' pointer
    drivers/net/3c59x.c:3211:39: error: request for member 'current_state' in something not a structure or union
    make[3]: *** [drivers/net/3c59x.o] Error 1
    make[2]: *** [drivers/net/3c59x.o] Error 2
    make[1]: *** [sub-make] Error 2
    make: *** [all] Error 2
    
    Signed-off-by: Namhyung Kim <namhyung at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 1aa46ec91cfd3cc4ab19780f664a3d089bb67173
Author: Ken Kawasaki <ken_kawasaki at spring.nifty.jp>
Date:   Sat Nov 13 13:42:08 2010 +0000

    ipg.c: remove id [SUNDANCE, 0x1021]
    
    ipg.c:
      The id [SUNDANCE, 0x1021] (=[0x13f0, 0x1021]) is defined
      at dl2k.h and ipg.c.
      But this device works better with dl2k driver.
    
      This problem is similar with the commit
      [25cca5352712561fba97bd37c495593d641c1d39
      ipg: Remove device claimed by dl2k from pci id table]
      at 11 Feb 2010.
    
    Signed-off-by: Ken Kawasaki <ken_kawasaki at spring.nifty.jp>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 8ea91226eccf6c8ab9c55054b24c21021d4d9d19
Author: Vasiliy Kulikov <segoon at openwall.com>
Date:   Thu Nov 18 10:35:58 2010 -0800

    net: caif: spi: fix potential NULL dereference
    
    alloc_netdev() is not checked here for NULL return value.  dev is
    check instead.  It might lead to NULL dereference of ndev.
    
    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3bf30b56c4f0a1c4fae34050b7db4527c92891e8
Author: Rajkumar Manoharan <rmanoharan at atheros.com>
Date:   Thu Nov 18 12:19:52 2010 +0530

    ath9k_htc: Avoid setting QoS control for non-QoS frames
    
    Setting tid information in the TX header is required only for QoS
    frames. Not handling this case causes severe data loss with some APs.
    
    Cc: stable at kernel.org
    Signed-off-by: Rajkumar Manoharan <rmanoharan at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit fb3ff69d1397ce4bd2441c87b1daea67cb945ac6
Merge: 2d42dc3feb6649c0e08641b0a6f0e0bad22aeeb2 c8770e7ba63bb5dd8fe5f9d251275a8fa717fb78
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 18 09:45:47 2010 -0800

    Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
    
    * 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: VMX: Fix host userspace gsbase corruption
      KVM: Correct ordering of ldt reload wrt fs/gs reload

commit 7d8e76bf9ac3604897f0ce12e8bf09b68c2a2c89
Author: John Fastabend <john.r.fastabend at intel.com>
Date:   Tue Nov 16 19:42:53 2010 +0000

    net: zero kobject in rx_queue_release
    
    netif_set_real_num_rx_queues() can decrement and increment
    the number of rx queues. For example ixgbe does this as
    features and offloads are toggled. Presumably this could
    also happen across down/up on most devices if the available
    resources changed (cpu offlined).
    
    The kobject needs to be zero'd in this case so that the
    state is not preserved across kobject_put()/kobject_init_and_add().
    
    This resolves the following error report.
    
    ixgbe 0000:03:00.0: eth2: NIC Link is Up 10 Gbps, Flow Control: RX/TX
    kobject (ffff880324b83210): tried to init an initialized object, something is seriously wrong.
    Pid: 1972, comm: lldpad Not tainted 2.6.37-rc18021qaz+ #169
    Call Trace:
     [<ffffffff8121c940>] kobject_init+0x3a/0x83
     [<ffffffff8121cf77>] kobject_init_and_add+0x23/0x57
     [<ffffffff8107b800>] ? mark_lock+0x21/0x267
     [<ffffffff813c6d11>] net_rx_queue_update_kobjects+0x63/0xc6
     [<ffffffff813b5e0e>] netif_set_real_num_rx_queues+0x5f/0x78
     [<ffffffffa0261d49>] ixgbe_set_num_queues+0x1c6/0x1ca [ixgbe]
     [<ffffffffa0262509>] ixgbe_init_interrupt_scheme+0x1e/0x79c [ixgbe]
     [<ffffffffa0274596>] ixgbe_dcbnl_set_state+0x167/0x189 [ixgbe]
    
    Signed-off-by: John Fastabend <john.r.fastabend at intel.com>
    Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ef22b7b65f0eda9015becc7bff225a399914a242
Author: Tetsuo Handa <penguin-kernel at I-love.SAKURA.ne.jp>
Date:   Thu Nov 18 09:40:04 2010 -0800

    net: Fix duplicate volatile warning.
    
    jiffies is defined as "volatile".
    
      extern unsigned long volatile __jiffy_data jiffies;
    
    ACCESS_ONCE() uses "volatile".
    As a result, some compilers warn duplicate `volatile' for ACCESS_ONCE(jiffies).
    
    Signed-off-by: Tetsuo Handa <penguin-kernel at I-love.SAKURA.ne.jp>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b52b97a339c0f2d76dfd6a31466d3f1b05c5cf7e
Author: Giuseppe Cavallaro <peppe.cavallaro at st.com>
Date:   Thu Nov 18 09:32:02 2010 -0800

    MAINTAINERS: Add stmmac maintainer
    
    Add STMMAC to the list of supported Ethernet drivers
    and myself as maintainer.
    
    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro at st.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3006bc38895895f1a0352c2e17e1a503f35f7e2f
Author: Eric Dumazet <eric.dumazet at gmail.com>
Date:   Thu Nov 18 09:30:42 2010 -0800

    bonding: fix a race in IGMP handling
    
    RCU conversion in IGMP code done in net-next-2.6 raised a race in
    __bond_resend_igmp_join_requests().
    
    It iterates in_dev->mc_list without appropriate protection (RTNL, or
    read_lock on in_dev->mc_list_lock).
    
    Another cpu might delete an entry while we use it and trigger a fault.
    
    Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit de391d12500ede13faa7ecadbe900a8de1f76cfa
Author: Mattia Dongili <malattia at linux.it>
Date:   Thu Nov 18 09:06:43 2010 -0800

    Input: fix typo in keycode validation supporting large scancodes
    
    Check the input_keymap_entry keycode size (u32) instead of the device's
    (void*) when validating that keycode value can be stored in the keymap.
    
    Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=22722
    
    Signed-off-by: Mattia Dongili <malattia at linux.it>
    Tested-by: Norbert Preining <preining at logic.at>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 3105c19c450ac7c18ab28c19d364b588767261b3
Author: Sage Weil <sage at newdream.net>
Date:   Thu Nov 18 09:15:07 2010 -0800

    ceph: fix readdir EOVERFLOW on 32-bit archs
    
    One of the readdir filldir_t callers was passing the raw ceph 64-bit ino
    instead of the hashed 32-bit one, producing an EOVERFLOW in the filler
    callback.  Fix this by calling the ceph_vino_to_ino() helper to do the
    conversion.
    
    Reported-by: Jan Smets <jan.smets at alcatel-lucent.com>
    Tested-by: Jan Smets <jan.smets at alcatel-lucent.com>
    Signed-off-by: Sage Weil <sage at newdream.net>

commit 09a02fdb919876c01e8f05960750a418b3f7fa48
Author: Mark Mentovai <mark at moxienet.com>
Date:   Wed Nov 17 16:34:37 2010 -0500

    cfg80211: fix can_beacon_sec_chan, reenable HT40
    
    This follows wireless-testing 9236d838c920e90708570d9bbd7bb82d30a38130
    ("cfg80211: fix extension channel checks to initiate communication") and
    fixes accidental case fall-through. Without this fix, HT40 is entirely
    blocked.
    
    Signed-off-by: Mark Mentovai <mark at moxienet.com>
    Cc: stable at kernel.org
    Acked-by: Luis R. Rodriguez <lrodriguez at atheros.com
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 2d42dc3feb6649c0e08641b0a6f0e0bad22aeeb2
Merge: 70b99eff756e8995b607a9d33f242c1e4f480f32 e3839ed8e89e79202c0402ac46965c0686897890
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 18 08:24:58 2010 -0800

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      kgdb,ppc: Fix regression in evr register handling
      kgdb,x86: fix regression in detach handling
      kdb: fix crash when KDB_BASE_CMD_MAX is exceeded
      kdb: fix memory leak in kdb_main.c

commit 70b99eff756e8995b607a9d33f242c1e4f480f32
Merge: 0a5b871ea4c6bfb2723ac2ffc7ef5c32452abb89 0f6b77ca12bea571e0a97b0588f62aa5f6012d61
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Nov 18 07:38:58 2010 -0800

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Update a BKL related comment
      powerpc/mm: Fix module instruction tlb fault handling on Book-E 64
      powerpc: Fix call to subpage_protection()
      powerpc: Set CONFIG_32BIT on ppc32
      powerpc/mm: Fix build error in setup_initial_memory_limit
      powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG
      powerpc: Fix div64 in bootloader

commit 37db6c8f1d0c4b8f01dc049f3a893b725288660f
Author: Jan Beulich <JBeulich at novell.com>
Date:   Tue Nov 16 08:25:08 2010 +0000

    x86-64: Fix and clean up AMD Fam10 MMCONF enabling
    
    Candidate memory ranges were not calculated properly (start
    addresses got needlessly rounded down, and end addresses didn't
    get rounded up at all), address comparison for secondary CPUs
    was done on only part of the address, and disabled status wasn't
    tracked properly.
    
    Signed-off-by: Jan Beulich <jbeulich at novell.com>
    Acked-by: Yinghai Lu <yinghai at kernel.org>
    Acked-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
    LKML-Reference: <4CE24DF40200007800022737 at vpn.id2.novell.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit de31ec8a31046111befd16a7083e3bdda2ff42cf
Author: Masami Hiramatsu <masami.hiramatsu.pt at hitachi.com>
Date:   Thu Nov 18 19:16:55 2010 +0900

    x86/kprobes: Prevent kprobes to probe on save_args()
    
    Prevent kprobes to probe on save_args() since this function
    will be called from breakpoint exception handler. That will
    cause infinit loop on breakpoint handling.
    
    Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt at hitachi.com>
    Cc: 2nddept-manager at sdl.hitachi.co.jp
    Cc: Ananth N Mavinakayanahalli <ananth at in.ibm.com>
    LKML-Reference: <20101118101655.2779.2816.stgit at ltc236.sdl.hitachi.co.jp>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 94e8ba728640dc01375a14e337f3b892bfacbeeb
Author: Sergio Aguirre <saaguirre at ti.com>
Date:   Tue Nov 16 12:02:47 2010 -0600

    irq_work: Drop cmpxchg() result
    
    The compiler warned us about:
    
     kernel/irq_work.c: In function 'irq_work_run':
     kernel/irq_work.c:148: warning: value computed is not used
    
    Dropping the cmpxchg() result is indeed weird, but correct -
    so annotate away the warning.
    
    Signed-off-by: Sergio Aguirre <saaguirre at ti.com>
    Cc: Huang Ying <ying.huang at intel.com>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    LKML-Reference: <1289930567-17828-1-git-send-email-saaguirre at ti.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 8882135bcd332f294df5455747ea43ba9e6f77ad
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Tue Nov 9 19:01:43 2010 +0100

    perf: Fix owner-list vs exit
    
    Oleg noticed that a perf-fd keeping a reference on the creating task
    leads to a few funny side effects.
    
    There's two different aspects to this:
    
      - kernel based perf-events, these should not take out
        a reference on the creating task and appear on the task's
        event list since they're not bound to fds nor visible
        to userspace.
    
      - fork() and pthread_create(), these can lead to the creating
        task dying (and thus the task's event-list becomming useless)
        but keeping the list and ref alive until the event is closed.
    
    Combined they lead to malfunction of the ptrace hw_tracepoints.
    
    Cure this by not considering kernel based perf_events for the
    owner-list and destroying the owner-list when the owner dies.
    
    Reported-by: Oleg Nesterov <oleg at redhat.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Acked-by: Oleg Nesterov <oleg at redhat.com>
    LKML-Reference: <1289576883.2084.286.camel at laptop>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit d5ad140bc1505a98c0f040937125bfcbb508078f
Author: Nikhil Rao <ncrao at google.com>
Date:   Wed Nov 17 11:42:04 2010 -0800

    sched: Fix idle balancing
    
    An earlier commit reverts idle balancing throttling reset to fix a 30%
    regression in volanomark throughput. We still need to reset idle_stamp
    when we pull a task in newidle balance.
    
    Reported-by: Alex Shi <alex.shi at intel.com>
    Signed-off-by: Nikhil Rao <ncrao at google.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    LKML-Reference: <1290022924-3548-1-git-send-email-ncrao at google.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit b5482cfa1c95a188b3054fa33274806add91bbe5
Author: Alex Shi <alex.shi at intel.com>
Date:   Tue Nov 16 17:34:02 2010 +0800

    sched: Fix volanomark performance regression
    
    Commit fab4762 triggers excessive idle balancing, causing a ~30% loss in
    volanomark throughput. Remove idle balancing throttle reset.
    
    Originally-by: Alex Shi <alex.shi at intel.com>
    Signed-off-by: Mike Galbraith <efault at gmx.de>
    Acked-by: Nikhil Rao <ncrao at google.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    LKML-Reference: <1289928732.5169.211.camel at maggy.simson.net>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit fb762a5b37e74023f1793cdf64e40d4da38b30ec
Author: Jesse Marroquin <jesse.marroquin at maxim-ic.com>
Date:   Wed Nov 17 14:26:40 2010 -0600

    ASoC: Add support for MAX98089 CODEC
    
    This patch adds initial support for the MAX98089 CODEC.
    
    Signed-off-by: Jesse Marroquin <jesse.marroquin at maxim-ic.com>
    Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

commit 8191c9f69202d4dbc66063cb92059b8a58640d34
Author: Dimitri Sivanich <sivanich at sgi.com>
Date:   Tue Nov 16 16:23:52 2010 -0600

    x86: UV: Address interrupt/IO port operation conflict
    
    This patch for SGI UV systems addresses a problem whereby
    interrupt transactions being looped back from a local IOH,
    through the hub to a local CPU can (erroneously) conflict with
    IO port operations and other transactions.
    
    To workaound this we set a high bit in the APIC IDs used for
    interrupts. This bit appears to be ignored by the sockets, but
    it avoids the conflict in the hub.
    
    Signed-off-by: Dimitri Sivanich <sivanich at sgi.com>
    LKML-Reference: <20101116222352.GA8155 at sgi.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    ___
    
     arch/x86/include/asm/uv/uv_hub.h   |    4 ++++
     arch/x86/include/asm/uv/uv_mmrs.h  |   19 ++++++++++++++++++-
     arch/x86/kernel/apic/x2apic_uv_x.c |   25 +++++++++++++++++++++++--
     arch/x86/platform/uv/tlb_uv.c      |    2 +-
     arch/x86/platform/uv/uv_time.c     |    4 +++-
     5 files changed, 49 insertions(+), 5 deletions(-)

commit fcf48a725a176ba12aa7be64c50190deaa2f86df
Merge: 0e2af2a9abf94b408ff70679b692a8644fed4aab 3c502e7a0255d82621ff25d60cc816624830497e
Author: Ingo Molnar <mingo at elte.hu>
Date:   Thu Nov 18 10:37:51 2010 +0100

    Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent

commit 9223081f54e3dc5045fe41a475165d9003c9a779
Author: Yinghai Lu <yinghai at kernel.org>
Date:   Sat Nov 13 10:52:09 2010 -0800

    x86: Use online node real index in calulate_tbl_offset()
    
    Found a NUMA system that doesn't have RAM installed at the first
    socket which hangs while executing init scripts.
    
    bisected it to:
    
     | commit 932967202182743c01a2eee4bdfa2c42697bc586
     | Author: Shaohua Li <shaohua.li at intel.com>
     | Date:   Wed Oct 20 11:07:03 2010 +0800
     |
     |     x86: Spread tlb flush vector between nodes
    
    It turns out when first socket is not online it could have cpus on
    node1 tlb_offset set to bigger than NUM_INVALIDATE_TLB_VECTORS.
    
    That could affect systems like 4 sockets, but socket 2 doesn't
    have installed, sockets 3 will get too big tlb_offset.
    
    Need to use real online node idx.
    
    Signed-off-by: Yinghai Lu <yinghai at kernel.org>
    Acked-by: Shaohua Li <shaohua.li at intel.com>
    Cc: Linus Torvalds <torvalds at linux-foundation.org>
    LKML-Reference: <4CDEDE59.40603 at kernel.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 96e612ffc301372d3a3b94e2cb5d1e0c1c207dd1
Author: Tetsuo Handa <penguin-kernel at I-love.SAKURA.ne.jp>
Date:   Tue Nov 16 13:45:16 2010 +0900

    x86, asm: Fix binutils 2.15 build failure
    
    Add parentheses around one pushl_cfi argument.
    
    Commit df5d1874 "x86: Use {push,pop}{l,q}_cfi in more places"
    caused GNU assembler 2.15 (Debian Sarge) to fail. It is still
    failing as of commit 07bd8516 "x86, asm: Restore parentheses
    around one pushl_cfi argument". This patch solves build failure
    with GNU assembler 2.15.
    
    Signed-off-by: Tetsuo Handa <penguin-kernel at I-love.SAKURA.ne.jp>
    Acked-by: Jan Beulich <jbeulich at novell.com>
    Cc: heukelum at fastmail.fm
    Cc: hpa at linux.intel.com
    LKML-Reference: <201011160445.oAG4jGif079860 at www262.sakura.ne.jp>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 0e2af2a9abf94b408ff70679b692a8644fed4aab
Author: Rakib Mullick <rakib.mullick at gmail.com>
Date:   Fri Nov 12 09:50:54 2010 -0500

    x86, hw_nmi: Move backtrace_mask declaration under ARCH_HAS_NMI_WATCHDOG
    
    backtrace_mask has been used under the code context of
    ARCH_HAS_NMI_WATCHDOG. So put it into that context.
    We were warned by the following warning:
    
      arch/x86/kernel/apic/hw_nmi.c:21: warning: ‘backtrace_mask’ defined but not used
    
    Signed-off-by: Rakib Mullick <rakib.mullick at gmail.com>
    Signed-off-by: Don Zickus <dzickus at redhat.com>
    LKML-Reference: <1289573455-3410-2-git-send-email-dzickus at redhat.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit a89d4bd055718d3b4ddb380ee22951a1300b4096
Merge: e53beacd23d9cb47590da6a7a7f6d417b941a994 91e86e560d0b3ce4c5fc64fd2bbb99f856a30a4e
Author: Ingo Molnar <mingo at elte.hu>
Date:   Thu Nov 18 08:07:36 2010 +0100

    Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

commit 89c8fb7a0156f19237880c4ea576eb5add8c0d60
Author: Vicente Jimenez Aguilar <googuy at gmail.com>
Date:   Thu Nov 18 15:01:54 2010 +0900

    fbdev: Update documentation index file.
    
    This is a simple update of the file Documentation/fb/00-INDEX based on
    the directory content.
    
    Signed-off-by: Vicente Jimenez Aguilar <googuy at gmail.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 4d048435e9864998f6a6ad16422393d42322716d
Author: Magnus Damm <damm at opensource.se>
Date:   Wed Nov 17 11:44:00 2010 +0000

    ARM: mach-shmobile: sh7372 USB0/IIC1 MSTP fix
    
    Fix a MSTP assignment problem in the sh7372 clock
    framework code. The USB drivers should attach to
    MSTP322 not MSTP33 where IIC1 is located.
    
    Signed-off-by: Magnus Damm <damm at opensource.se>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit d53e4307c2f3856167407a1d9b8f8fa001286066
Author: Giuseppe CAVALLARO <peppe.cavallaro at st.com>
Date:   Wed Nov 17 06:50:17 2010 +0000

    sh: Use GCC __builtin_prefetch() to implement prefetch().
    
    GCC's __builtin_prefetch() was introduced a long time ago, all
    supported GCC versions have it. So this patch is to use it for
    implementing the prefetch on SH2A and SH4.
    
    The current  prefetch implementation is almost equivalent with
    __builtin_prefetch.
    The third parameter in the __builtin_prefetch is the locality
    that it's not supported on SH architectures.  It has been set
    to three and it should be verified if it's suitable for SH2A
    as well. I didn't test on this architecture.
    
    The builtin usage should be more efficient that an __asm__
    because less barriers, and because the compiler doesn't see the
    inst as a "black box" allowing better code generation.
    
    This has been already done on other architectures (see the commit:
    0453fb3c528c5eb3483441a466b24a4cb409eec5).
    
    Many thanks to Christian Bruel <christain.bruel at st.com> for his
    support on evaluate the impact of the gcc built-in on SH4 arch.
    
    No regressions found while testing with LMbench on STLinux targets.
    
    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro at st.com>
    Signed-off-by: Stuart Menefy <stuart.menefy at st.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 95ccb0f3bdc4438bf470c25450e6a8a6090ca253
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Thu Nov 11 10:04:53 2010 +0100

    drm/ttm: Fix up a theoretical deadlock
    
    A process suspended waiting for a higher sequence or no sequence to unreserve,
    a bo may be beaten to the reservation by a process with a lower sequence.
    In that case the first process should give up trying to reserve and
    return -EAGAIN. In order for that to happen, we must wake waiting processes
    when we change sequence, so that they have a chance to detect the new
    sequence.
    
    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 9a03d3487abe89e3650bb2533c5d909143955499
Merge: 1aa52bd3bc839064d5a3e4de406850f4a3aa5378 ab838338a2a9e0cb8346eb0cab9977be13e8dce5
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Nov 18 14:57:28 2010 +1000

    Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-fixes
    
    * 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next: (25 commits)
      nouveau: Acknowledge HPD irq in handler, not bottom half
      drm/nouveau: Fix a few confusions between "chipset" and "card_type".
      drm/nouveau: don't expose backlight control when available through ACPI
      drm/nouveau/pm: improve memtiming mappings
      drm/nouveau: Make PCIE GART size depend on the available RAMIN space.
      drm/nouveau: Return error from nouveau_gpuobj_new if we're out of RAMIN.
      drm/nouveau: Fix compilation issues in nouveau_pm when CONFIG_HWMON is not set
      drm/nouveau: Don't use load detection for connector polling.
      drm/nv10-nv20: Fix instability after MPLL changes.
      drm/nv50: implement possible workaround for NV86 PGRAPH TLB flush hang
      drm/nouveau: Don't poll LVDS outputs.
      drm/nouveau: Use "force" to decide if analog load detection is ok or not.
      drm/nv04: Fix scanout over the 16MB mark.
      drm/nouveau: fix nv40 pcie gart size
      drm/nva3: fix overflow in fixed point math used for pll calculation
      drm/nv10: Balance RTs expected to be accessed simultaneously by the 3d engine.
      drm/nouveau: Expose some BO usage flags to userspace.
      drm/nouveau: Reduce severity of the unknown getparam error.
      drm/nouveau: Avoid lock dependency between ramht and ramin spinlocks.
      drm/nouveau: Some random cleanups.
      ...

commit 1aa52bd3bc839064d5a3e4de406850f4a3aa5378
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Nov 17 12:11:03 2010 -0500

    drm/radeon/kms: fix tiling info on evergreen
    
    We aren't currently using tiling in userspace on evergreen,
    but the info we currently return for the tiling info query
    (gb_addr_config) is no adequate for userspace tiling alignment
    calculations.  It does not contain the bank info.  Create a custom
    tiling info dword with all the necessary info (num channels,
    num banks, group size, row size).
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 268b2510de14f62134d87ba9b4981816192db386
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Nov 17 19:00:26 2010 -0500

    drm/radeon/kms: fix alignment when allocating buffers
    
    We were previously dropping alignment requests on the floor
    when allocating buffers so we always ended up page aligned.
    Certain tiling modes on 6xx+ require larger alignment which
    wasn't happening before.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: Jerome Glisse <j.glisse at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 2f5993cca67f9c80dcd390feef13695ca072b8a5
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Wed Nov 17 13:24:48 2010 +0100

    drm/vmwgfx: Fix up an error path during bo creation
    
    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit a5193fe50e7f21c26d22c17c8196420fac1a3ca7
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Nov 17 17:56:49 2010 -0500

    drm/radeon/kms: register an i2c adapter name for the dp aux bus
    
    This causes the connector to not be added since i2c init fails
    for the adapter.  Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=31688
    
    Noticed by Ari Savolainen.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: Ari Savolainen <ari.m.savolainen at gmail.com>
    Cc: Jean Delvare <khali at linux-fr.org>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 3e4b99828d1c8abefefd37474503605c811c1b51
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 16 12:09:42 2010 -0500

    drm/radeon/kms/atom: add proper external encoders support
    
    These are external encoder chips connected via DVO or DP.
    The actual external encoder programming is handled by the
    kms encoder functions for primary encoder.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 99999aaa091bdb3e16b5eed22f3a9a567f84f0fe
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 16 12:09:41 2010 -0500

    drm/radeon/kms/atom: cleanup and unify DVO handling
    
    Handle all the various asic family specific things for DVO.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 8b834852d705af75ba942b040ca28533329ff13c
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Nov 17 02:54:42 2010 -0500

    drm/radeon/kms: properly power up/down the eDP panel as needed (v4)
    
    The eDP panel must be powered up for aux transactions, so power it
    up for detect and mode probe functions, otherwise power it up or
    down based on dpms.
    
    v2:
    - only mess with eDP panel on DCE4+
    - only mess with eDP panel on eDP connectors, not all DP connectors
    v3:
    - be extra careful to only mess with eDP panels on eDP connectors
    v4:
    - avoid possible null derefernce if a connector has not been
    assigned to the encoder
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit c7a71fc761551dc8be8543f14a90d08cda4e77f9
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Nov 17 02:49:40 2010 -0500

    drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode()
    
    If there was no connector mapped to the encoder, atombios_get_encoder_mode()
    returned 0 which is the id for DP.  Return something sane instead based on
    the encoder id.  This avoids hitting the DP paths on non-DP encoders.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Cc: stable at kernel.org
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit ba251bde9ab8bdce8fbd3f60dbb71b36cc4c9adf
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 16 12:09:39 2010 -0500

    drm/radeon/kms: turn the backlight off explicitly for dpms
    
    Seems some newer systems require this explicitly.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit d33ef52d9db8a36900dd53f2e32db9a521ace259
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 16 16:53:14 2010 -0500

    drm/radeon/kms: fix typo in r600 cs checker
    
    Looks like a typo in:
    drm/radeon/r600: fix tiling issues in CS checker.
    (f30df2fad0c901e74ac9a52a488a54c69a373a41)
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 21e2eae4daaecf2f2a391e4f4b596c800f198edf
Author: Vasiliy Kulikov <segoon at openwall.com>
Date:   Sun Nov 14 23:08:27 2010 +0300

    drm: radeon: fix error value sign
    
    enable_vblank implementations should use negative result to indicate error.
    radeon_enable_vblank() returns EINVAL in this case.  Change this to -EINVAL.
    
    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 16790569eddf4d406a16a65f4750f405fa669c52
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sun Nov 14 20:24:35 2010 -0500

    drm/radeon/kms: fix and unify tiled buffer alignment checking for r6xx/7xx
    
    Tiled buffers have the same alignment requirements regardless of
    whether the surface is for db, cb, or textures.  Previously, the
    calculations where inconsistent for each buffer type.
    
    - Unify the alignment calculations in a common function
    - Standardize the alignment units (pixels for pitch/height/depth,
    bytes for base)
    - properly check the buffer base alignments
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit ab838338a2a9e0cb8346eb0cab9977be13e8dce5
Author: Andy Lutomirski <luto at mit.edu>
Date:   Tue Nov 16 18:40:52 2010 -0500

    nouveau: Acknowledge HPD irq in handler, not bottom half
    
    The old code generated an interrupt storm bad enough to completely
    take down my system.
    
    Signed-off-by: Andy Lutomirski <luto at mit.edu>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit c1b60ece91460214b5135360a375f3f6fbb59608
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Thu Nov 11 00:56:37 2010 +0100

    drm/nouveau: Fix a few confusions between "chipset" and "card_type".
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 5bead799d3f8f1500c4b59301b8a2732a92f559f
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Thu Nov 4 09:56:12 2010 +1000

    drm/nouveau: don't expose backlight control when available through ACPI
    
    Avoid confusing userspace by not publishing backlight controls if ACPI
    equivalents are available.
    
    Reported-by: Aaron Sowry <aaron at aeneby.se>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit cac8f05b4294d18cfa940511c286ca03aa6590ad
Author: Roy Spliet <r.spliet at student.tudelft.nl>
Date:   Wed Oct 20 01:09:56 2010 +0200

    drm/nouveau/pm: improve memtiming mappings
    
    Improvements:
     - Fix bug in switch statement
     - Add parts of 0x10022c, 0x10023c
     - Clean up 0x100234
     - Comment out assumption in 0x100228 until verified
    
    Signed-off-by: Roy Spliet <r.spliet at student.tudelft.nl>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 9d5a6c4353eeac1e0095e731a0a746254f23af83
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Mon Nov 1 18:08:26 2010 +0100

    drm/nouveau: Make PCIE GART size depend on the available RAMIN space.
    
    Reported-by: Tomas Miljenovic <tomasmiljenovic at gmail.com>
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit dd661e5f4e87609e7a9b4cbdff305dca7f494e7b
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Mon Nov 1 18:06:28 2010 +0100

    drm/nouveau: Return error from nouveau_gpuobj_new if we're out of RAMIN.
    
    Reported-by: Tomas Miljenovic <tomasmiljenovic at gmail.com>
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit b54262f3c828ee17e27632d0d60255281c02e1a5
Author: Martin Peres <martin.peres at ensi-bourges.fr>
Date:   Tue Oct 26 12:48:28 2010 +0200

    drm/nouveau: Fix compilation issues in nouveau_pm when CONFIG_HWMON is not set
    
    Signed-off-by: Martin Peres <martin.peres at ensi-bourges.fr>
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 84b8081c2baf84b52ac9bf79f07edcea975ab0b5
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Tue Oct 26 02:17:56 2010 +0200

    drm/nouveau: Don't use load detection for connector polling.
    
    Analog output polling makes GL programs jerky when pageflip is being
    used because it's carried out with the mode_config mutex held.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 63d6fd32889c46fa40cd1631fb2a0162187311ab
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Mon Oct 25 02:13:21 2010 +0200

    drm/nv10-nv20: Fix instability after MPLL changes.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 56ac7475350ee646f5f7316abcdf65d3be94da1c
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Fri Oct 22 10:26:24 2010 +1000

    drm/nv50: implement possible workaround for NV86 PGRAPH TLB flush hang
    
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 06ef3e61dd44f76fef89d8e7ad5d6c845f3f345e
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Sat Oct 23 23:12:37 2010 +0200

    drm/nouveau: Don't poll LVDS outputs.
    
    Reported-by: Xavier Chantry <chantry.xavier at gmail.com>
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 01db363979e96115a895f35c823303660f0f328d
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Thu Oct 21 17:43:08 2010 +0200

    drm/nouveau: Use "force" to decide if analog load detection is ok or not.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 5794b5fdb579abf7be2c27c6e0d6106f391a26e4
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Fri Oct 22 04:39:14 2010 +0200

    drm/nv04: Fix scanout over the 16MB mark.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 3c29f9e74591d2f365b159cf59193b19a2f65640
Author: Lucas Stach <dev at lynxeye.de>
Date:   Fri Oct 15 22:22:59 2010 +0200

    drm/nouveau: fix nv40 pcie gart size
    
    Nouveau sets the PCIE GART size to 64MiB for all cards before nv50,
    but nv40 has enough RAMIN space to support 512MiB GART size. This
    patch fixes this value to make use of this hardware capability.
    
    Signed-off-by: Lucas Stach <dev at lynxeye.de>
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 2a56a0b913a8d7314c2c10fdd57d667b599232b4
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Fri Oct 1 14:39:37 2010 +1000

    drm/nva3: fix overflow in fixed point math used for pll calculation
    
    And a slight tweak which gets us closer to VBIOS-calculated numbers.
    
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 699ddfd98061b725c52fd34ff1c4346e5b4824d4
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Sun Oct 10 06:07:32 2010 +0200

    drm/nv10: Balance RTs expected to be accessed simultaneously by the 3d engine.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit f13b32630dda7e583a84a8c535880cff7e4a9bdd
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Sun Oct 10 06:01:08 2010 +0200

    drm/nouveau: Expose some BO usage flags to userspace.
    
    This will be needed for Z compression and to take smarter placement
    decisions.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Acked-by: Ben Skeggs <bskeggs at redhat.com>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 1397b42b5a2e5b3b982078c89f3594c123e3c2b3
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Tue Oct 12 03:17:43 2010 +0200

    drm/nouveau: Reduce severity of the unknown getparam error.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Acked-by: Ben Skeggs <bskeggs at redhat.com>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 7bb94d26ad62ca1d6b5e11db6e26425785cc46ac
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Mon Oct 11 03:37:32 2010 +0200

    drm/nouveau: Avoid lock dependency between ramht and ramin spinlocks.
    
    The ramht code called some gpuobj functions with the HARDIRQ-safe
    RAMHT spinlock held, this could potentially lead to a dead lock
    because ramin_lock is HARDIRQ-unsafe.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit cbab95db84f2a444d99bec77bac8b9b6ef20d11c
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Mon Oct 11 03:43:58 2010 +0200

    drm/nouveau: Some random cleanups.
    
    Remove some unused/duplicated definitions and make sparse happy again.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 5eb94fbba39e71f04d629f8197343273b56e25eb
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Thu Oct 7 03:33:15 2010 +0200

    drm/nv11: Fix bad PLL detection false positive.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 327ceae6643ddafb0c514183f00e7fc8ca6b6e99
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Sun Oct 10 05:21:59 2010 +0200

    drm/nv04-nv40: Fall back to panel rescaling if we have no usable native mode.
    
    This allows the user to set a mode larger than the native one, useful
    if we had trouble finding the actual native mode (e.g. because it goes
    above the hardware bandwidth limits).
    
    Reported-by: Grzesiek Sójka <pld at pfu.pl>
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 1f5bd44354c878cf8bb0e28a7cb27677e3640c45
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Sat Oct 2 16:00:35 2010 +0200

    drm/nouveau: Reject modes exceeding the integrated TMDS maximum bandwidth.
    
    Reported-by: Grzesiek Sójka <pld at pfu.pl>
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 907af60b93045ae33b450553167aa8f684252de3
Author: Francisco Jerez <currojerez at riseup.net>
Date:   Sat Oct 9 04:02:09 2010 +0200

    drm/nouveau: Fix sleep while atomic in the semaphore code.
    
    Signed-off-by: Francisco Jerez <currojerez at riseup.net>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit da3bd8203082794d26de3a0a6a7d1ee639d07eb1
Author: Jiri Slaby <jslaby at suse.cz>
Date:   Tue Oct 5 15:07:33 2010 +0200

    drm/nouveau: ratelimit IRQ messages
    
    There are two messages in the ISR of nouveau which might be printed out
    hundred times in a second. Ratelimit them. (We need to move
    nouveau_ratelimit to the top of the file.)
    
    Signed-off-by: Jiri Slaby <jslaby at suse.cz>
    Reviewed-by: Marcin Slusarz <marcin.slusarz at gmail.com>
    Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

commit 0f6b77ca12bea571e0a97b0588f62aa5f6012d61
Author: Alessio Igor Bogani <abogani at texware.it>
Date:   Tue Nov 16 07:55:16 2010 +0000

    powerpc: Update a BKL related comment
    
    The commit 5e3d20a remove bkl from startup code so setup_arch() it isn't called
    with bkl held anymore. Update the comment on top of that function.
    Fix also a typo.
    
    This work was supported by a hardware donation from the CE Linux Forum.
    
    Signed-off-by: Alessio Igor Bogani <abogani at texware.it>
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

commit 82ae5eaffad40a6d4738e8a57e48dd0d903a9ef0
Author: Kumar Gala <galak at kernel.crashing.org>
Date:   Wed Nov 17 07:20:32 2010 +0000

    powerpc/mm: Fix module instruction tlb fault handling on Book-E 64
    
    We were seeing oops like the following when we did an rmmod on a module:
    
    Unable to handle kernel paging request for instruction fetch
    Faulting instruction address: 0x8000000000008010
    Oops: Kernel access of bad area, sig: 11 [#1]
    SMP NR_CPUS=2 P5020 DS
    last sysfs file: /sys/devices/qman-portals.2/qman-pool.9/uevent
    Modules linked in: qman_tester(-)
    NIP: 8000000000008010 LR: c000000000074858 CTR: 8000000000008010
    REGS: c00000002e29bab0 TRAP: 0400   Not tainted
    (2.6.34.6-00744-g2d21f14)
    MSR: 0000000080029000 <EE,ME,CE>  CR: 24000448  XER: 00000000
    TASK = c00000007a8be600[4987] 'rmmod' THREAD: c00000002e298000 CPU: 1
    GPR00: 8000000000008010 c00000002e29bd30 8000000000012798 c00000000035fb28
    GPR04: 0000000000000002 0000000000000002 0000000024022428 c000000000009108
    GPR08: fffffffffffffffe 800000000000a618 c0000000003c13c8 0000000000000000
    GPR12: 0000000022000444 c00000000fffed00 0000000000000000 0000000000000000
    GPR16: 00000000100c0000 0000000000000000 00000000100dabc8 0000000010099688
    GPR20: 0000000000000000 00000000100cfc28 0000000000000000 0000000010011a44
    GPR24: 00000000100017b2 0000000000000000 0000000000000000 0000000000000880
    GPR28: c00000000035fb28 800000000000a7b8 c000000000376d80 c0000000003cce50
    NIP [8000000000008010] .test_exit+0x0/0x10 [qman_tester]
    LR [c000000000074858] .SyS_delete_module+0x1f8/0x2f0
    Call Trace:
    [c00000002e29bd30] [c0000000000748b4] .SyS_delete_module+0x254/0x2f0 (unreliable)
    [c00000002e29be30] [c000000000000580] syscall_exit+0x0/0x2c
    Instruction dump:
    XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
    38600000 4e800020 60000000 60000000 <4e800020> 60000000 60000000 60000000
    ---[ end trace 4f57124939a84dc8 ]---
    
    This appears to be due to checking the wrong permission bits in the
    instruction_tlb_miss handling if the address that faulted was in vmalloc
    space.  We need to look at the supervisor execute (_PAGE_BAP_SX) bit and
    not the user bit (_PAGE_BAP_UX/_PAGE_EXEC).
    
    Also removed a branch level since it did not appear to be used.
    
    Reported-by: Jeffrey Ladouceur <Jeffrey.Ladouceur at freescale.com>
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

commit 1c2c25c78740b2796c7c06640784cb6732fa4907
Author: Michael Neuling <mikey at neuling.org>
Date:   Wed Nov 17 16:32:59 2010 +0000

    powerpc: Fix call to subpage_protection()
    
    In:
      powerpc/mm: Fix pgtable cache cleanup with CONFIG_PPC_SUBPAGE_PROT
      commit d28513bc7f675d28b479db666d572e078ecf182d
      Author: David Gibson <david at gibson.dropbear.id.au>
    
    subpage_protection() was changed to to take an mm rather a pgdir but it
    didn't change calling site in hashpage_preload().  The change wasn't
    noticed at compile time since hashpage_preload() used a void* as the
    parameter to subpage_protection().
    
    This is obviously wrong and can trigger the following crash when
    CONFIG_SLAB, CONFIG_DEBUG_SLAB, CONFIG_PPC_64K_PAGES
    CONFIG_PPC_SUBPAGE_PROT are enabled.
    
    Freeing unused kernel memory: 704k freed
    Unable to handle kernel paging request for data at address 0x6b6b6b6b6b6c49b7
    Faulting instruction address: 0xc0000000000410f4
    cpu 0x2: Vector: 300 (Data Access) at [c00000004233f590]
        pc: c0000000000410f4: .hash_preload+0x258/0x338
        lr: c000000000041054: .hash_preload+0x1b8/0x338
        sp: c00000004233f810
       msr: 8000000000009032
       dar: 6b6b6b6b6b6c49b7
     dsisr: 40000000
      current = 0xc00000007e2c0070
      paca    = 0xc000000007fe0500
        pid   = 1, comm = init
    enter ? for help
    [c00000004233f810] c000000000041020 .hash_preload+0x184/0x338 (unreliable)
    [c00000004233f8f0] c00000000003ed98 .update_mmu_cache+0xb0/0xd0
    [c00000004233f990] c000000000157754 .__do_fault+0x48c/0x5dc
    [c00000004233faa0] c000000000158fd0 .handle_mm_fault+0x508/0xa8c
    [c00000004233fb90] c0000000006acdd4 .do_page_fault+0x428/0x6ac
    [c00000004233fe30] c000000000005260 handle_page_fault+0x20/0x74
    
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

commit 234a71a7d64832e4aa8d9b5c80133480b86f6de3
Author: kerstin jonsson <kerstin.jonsson at ericsson.com>
Date:   Fri Oct 22 00:17:55 2010 +0000

    powerpc: Set CONFIG_32BIT on ppc32
    
    commit ffe8018c3424892c9590048fc36caa6c3e0c8a76 of the -mm tree
    fixes the initramfs size calculation for e.g. s390 but breaks it
    for 32bit architectures which do not define CONFIG_32BIT.
    
    This patch fix the problem for PPC32 which will elsewise end up
    with a __initramfs_size of 0.
    
    Signed-off-by: Kerstin Jonsson <kerstin.jonsson at ericsson.com>
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

commit 4a89261b02d421cc1bcadaaebb90bb7919db0854
Author: Kumar Gala <galak at kernel.crashing.org>
Date:   Wed Nov 10 12:29:49 2010 +0000

    powerpc/mm: Fix build error in setup_initial_memory_limit
    
    arch/powerpc/mm/tlb_nohash.c: In function 'setup_initial_memory_limit':
    arch/powerpc/mm/tlb_nohash.c:588:29: error: 'ppc64_memblock_base' undeclared (first use in this function)
    arch/powerpc/mm/tlb_nohash.c:588:29: note: each undeclared identifier is reported only once for each function it appears in
    
    Due to a copy/paste typo with the following commit:
    
    	commit cd3db0c4ca3d237e7ad20f7107216e575705d2b0
    	Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    	Date:   Tue Jul 6 15:39:02 2010 -0700
    
    	    memblock: Remove rmo_size, burry it in arch/powerpc where it belongs
    
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

commit 01cf6fe8553b0ac649f3323d8da69b51cad8c468
Author: Nishanth Aravamudan <nacc at us.ibm.com>
Date:   Thu Oct 14 14:48:52 2010 +0000

    powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG
    
    EEH and pci_dlpar #undef DEBUG, but I think they were added before the
    ability to control this from Kconfig. It's really annoying to only get
    some of the debug messages from these files. Leave the lpar.c #undef
    alone as it produces so much output as to make the kernel unusable.
    Update the Kconfig text to indicate this particular quirk :)
    
    Signed-off-by: Nishanth Aravamudan <nacc at us.ibm.com>
    Acked-by: Michael Ellerman <michael at ellerman.id.au>
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

commit acbfd58e8a1f24ef644a90a90825c3f435b990f5
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date:   Thu Nov 18 14:39:24 2010 +1100

    powerpc: Fix div64 in bootloader
    
    The code is missing a fix that went into the main kernel variant
    (we should try to share that code again at some stage)
    
    Reported-by: Albert Cahalan <acahalan at gmail.com>
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

commit b432b4b3440a34c1430fcd66bab783640724bd28
Author: kishore kadiyala <kishore.kadiyala at ti.com>
Date:   Wed Nov 17 22:35:32 2010 -0500

    mmc: omap4: hsmmc: Fix improper card detection while booting
    
    While booting OMAP4 ES2.0 boards, cards on MMC1 and MMC2 controllers
    are not getting detected sometimes.
    
    During reset of command/data line, wrong pointer to base address
    was passed while read operation to SYSCTL register, thus impacting
    the updated reset logic.
    
    Passing the correct base address fixes the issue.
    
    Signed-off-by: Kishore Kadiyala <kishore.kadiyala at ti.com>
    Acked-by: Felipe Balbi <balbi at ti.com>
    Acked-by: Madhusudhan Chikkature <madhu.cr at ti.com>
    Acked-by: Tony Lindgren <tony at atomide.com>
    Signed-off-by: Chris Ball <cjb at laptop.org>

commit 0587aa3d11f9769a301b21bff2c3ed8365606b8d
Author: yangsheng <sheng.yang at oracle.com>
Date:   Wed Nov 17 21:46:26 2010 -0500

    jbd2: fix /proc/fs/jbd2/<dev> when using an external journal
    
    In jbd2_journal_init_dev(), we need make sure the journal structure is
    fully initialzied before calling jbd2_stats_proc_init().
    
    Reviewed-by: Andreas Dilger <andreas.dilger at oracle.com>
    Signed-off-by: yangsheng <sheng.yang at oracle.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit f4c8cc652d9f70680dd91be60a7a455040d0a282
Author: Dan Carpenter <error27 at gmail.com>
Date:   Wed Nov 17 21:46:25 2010 -0500

    ext4: missing unlock in ext4_clear_request_list()
    
    If the the li_request_list was empty then it returned with the lock
    held.  Instead of adding a "goto unlock" I just removed that special
    case and let it go past the empty list_for_each_safe().
    
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 08da1193d2c8c7a25d0cef7f85d0b9f1ad7c583a
Author: Markus Trippelsdorf <markus at trippelsdorf.de>
Date:   Wed Nov 17 21:46:06 2010 -0500

    ext4: fix setting random pages PageUptodate
    
    ext4_end_bio calls put_page and kmem_cache_free before calling
    SetPageUpdate(). This can result in setting the PageUptodate bit on
    random pages and causes the following BUG:
    
     BUG: Bad page state in process rm  pfn:52e54
     page:ffffea0001222260 count:0 mapcount:0 mapping:          (null) index:0x0
     arch kernel: page flags: 0x4000000000000008(uptodate)
    
    Fix the problem by moving put_io_page() after the SetPageUpdate() call.
    
    Thanks to Hugh Dickins for analyzing this problem.
    
    Reported-by: Markus Trippelsdorf <markus at trippelsdorf.de>
    Tested-by: Markus Trippelsdorf <markus at trippelsdorf.de>
    Signed-off-by: Markus Trippelsdorf <markus at trippelsdorf.de>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 0a5b871ea4c6bfb2723ac2ffc7ef5c32452abb89
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Nov 17 18:36:25 2010 -0800

    hardirq.h: remove now-empty #ifdef/#endif pair
    
    Commit 451a3c24b013 ("BKL: remove extraneous #include <smp_lock.h>")
    removed the #include line that was the only thing that was surrounded by
    the #ifdef/#endif.
    
    So now that #ifdef is guarding nothing at all. Just remove it.
    
    Reported-by: Byeong-ryeol Kim <brofkims at gmail.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7957f0a857754c555e07f58a3fb83ac29501478c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Nov 17 14:58:36 2010 -0800

    Fix build failure due to hwirq.h needing smp_lock.h
    
    Arnd Bergmann did an automated scripting run to find left-over instances
    of <linux/smp_lock.h>, and had made it trigger it on the normal BKL use
    of lock_kernel and unlock_lernel (and apparently release_kernel_lock and
    reacquire_kernel_lock too, used by the scheduler).
    
    That resulted in commit 451a3c24b013 ("BKL: remove extraneous #include
    <smp_lock.h>").
    
    However, hardirq.h was the only remaining user of the old
    'kernel_locked()' interface, and Arnd's script hadn't checked for that.
    So depending on your configuration and what header files had been
    included, you would get errors like "implicit declaration of function
    'kernel_locked'" during the build.
    
    The right fix is not to just re-instate the smp_lock.h include - it is
    to just remove 'kernel_locked()' entirely, since the only use was this
    one special low-level detail.  Just make hardirq.h do it directly.
    
    In fact this simplifies and clarifies the code, because some trivial
    analysis makes it clear that hardirq.h only ever used _one_ of the two
    definitions of kernel_locked(), so we can remove the other one entirely.
    
    Reported-by: Zimny Lech <napohybelskurwysynom2010 at gmail.com>
    Reported-and-acked-by: Randy Dunlap <randy.dunlap at oracle.com>
    Acked-by: Arnd Bergmann <arnd at arndb.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c8770e7ba63bb5dd8fe5f9d251275a8fa717fb78
Author: Avi Kivity <avi at redhat.com>
Date:   Thu Nov 11 12:37:26 2010 +0200

    KVM: VMX: Fix host userspace gsbase corruption
    
    We now use load_gs_index() to load gs safely; unfortunately this also
    changes MSR_KERNEL_GS_BASE, which we managed separately.  This resulted
    in confusion and breakage running 32-bit host userspace on a 64-bit kernel.
    
    Fix by
    - saving guest MSR_KERNEL_GS_BASE before we we reload the host's gs
    - doing the host save/load unconditionally, instead of only when in guest
      long mode
    
    Things can be cleaned up further, but this is the minmal fix for now.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 0a77fe4c188e25917799f2356d4aa5e6d80c39a2
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Oct 19 18:48:35 2010 +0200

    KVM: Correct ordering of ldt reload wrt fs/gs reload
    
    If fs or gs refer to the ldt, they must be reloaded after the ldt.  Reorder
    the code to that effect.
    
    Userspace code that uses the ldt with kvm is nonexistent, so this doesn't fix
    a user-visible bug.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 28cb6ccd2c7e86b3a4db94c7062cd27937bed424
Author: Nicolas Kaiser <nikai at nikai.net>
Date:   Mon Nov 15 10:59:42 2010 +0000

    gianfar: fix signedness issue
    
    irq_of_parse_and_map() has an unsigned return type.
    Testing for a negative error value doesn't work here.
    
    Signed-off-by: Nicolas Kaiser <nikai at nikai.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 870634b0b641271acb2e22df06ddda0c794b89a3
Author: Vasiliy Kulikov <segoon at openwall.com>
Date:   Sun Nov 14 10:08:34 2010 +0000

    net: bnx2x: fix error value sign
    
    bnx2x_init_one() should return negative value on error.
    By mistake it returns ENODEV instead of -ENODEV.
    
    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
    Acked-by: Eilon Greenstein <eilong at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 24b7ea9f6c9787fad885442ed0cc010f1aa69cca
Author: Shan Wei <shanwei at cn.fujitsu.com>
Date:   Wed Nov 17 11:55:08 2010 -0800

    8139cp: fix checksum broken
    
    I am not family with RealTek RTL-8139C+ series 10/100 PCI Ethernet driver.
    I try to guess the meaning of RxProtoIP and IPFail.
    RxProtoIP stands for received IPv4 packet that upper protocol is not tcp and udp.
    !(status & IPFail) is true means that driver correctly to check checksum in IPv4 header.
    
    If these are right, driver will set ip_summed with CHECKSUM_UNNECESSARY for other
    upper protocol, e.g. sctp, igmp protocol. This will cause protocol stack ignores
    checksum check for packets with invalid checksum.
    
    This patch is only compile-test.
    
    Signed-off-by: Shan Wei <shanwei at cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit d5d3ebe3be5c5123f2d444e186717f45284151e2
Author: Shan Wei <shanwei at cn.fujitsu.com>
Date:   Fri Nov 12 00:15:25 2010 +0000

    r8169: fix checksum broken
    
    If r8196 received packets with invalid sctp/igmp(not tcp, udp) checksum, r8196 set skb->ip_summed
    wit CHECKSUM_UNNECESSARY. This cause that upper protocol don't check checksum field.
    
    I am not family with r8196 driver. I try to guess the meaning of RxProtoIP and IPFail.
    RxProtoIP stands for received IPv4 packet that upper protocol is not tcp and udp.
    !(opts1 & IPFail) is true means that driver correctly to check checksum in IPv4 header.
    
    If it's right, I think we should not set ip_summed wit CHECKSUM_UNNECESSARY for my sctp packets
    with invalid checksum.
    
    If it's not right, please tell me.
    
    Signed-off-by: Shan Wei <shanwei at cn.fujitsu.com>
    Acked-by: Francois Romieu <romieu at fr.zoreil.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 218854af84038d828a32f061858b1902ed2beec6
Author: Dan Rosenberg <drosenberg at vsecurity.com>
Date:   Wed Nov 17 06:37:16 2010 +0000

    rds: Integer overflow in RDS cmsg handling
    
    In rds_cmsg_rdma_args(), the user-provided args->nr_local value is
    restricted to less than UINT_MAX.  This seems to need a tighter upper
    bound, since the calculation of total iov_size can overflow, resulting
    in a small sock_kmalloc() allocation.  This would probably just result
    in walking off the heap and crashing when calling rds_rdma_pages() with
    a high count value.  If it somehow doesn't crash here, then memory
    corruption could occur soon after.
    
    Signed-off-by: Dan Rosenberg <drosenberg at vsecurity.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 73e1cc4a4a02cfd2d520355de56ce1dafa11dd59
Author: Yong Wang <yong.y.wang at linux.intel.com>
Date:   Wed Nov 17 21:02:13 2010 +0800

    staging: spectra: fix build error
    
    blk_queue_ordered() has been deprecated and replaced with
    blk_queue_flush() by Tejun. However, use of blk_queue_ordered()
    in spectra nand driver has not been converted yet and thus results
    in the following build error.
    
    drivers/staging/spectra/ffsport.c: In function SBD_setup_device:
    drivers/staging/spectra/ffsport.c:659: error: implicit declaration of function blk_queue_ordered
    drivers/staging/spectra/ffsport.c:659: error: QUEUE_ORDERED_DRAIN_FLUSH undeclared (first use in this function)
    drivers/staging/spectra/ffsport.c:659: error: (Each undeclared identifier is reported only once
    drivers/staging/spectra/ffsport.c:659: error: for each function it appears in.)
    
    Signed-off-by: Yong Wang <yong.y.wang at intel.com>
    Cc: Tejun Heo <tj at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit e3839ed8e89e79202c0402ac46965c0686897890
Author: Dongdong Deng <dongdong.deng at windriver.com>
Date:   Tue Nov 16 16:02:00 2010 -0600

    kgdb,ppc: Fix regression in evr register handling
    
    Commit ff10b88b5a05c8f1646dd15fb9f6093c1384ff6d (kgdb,ppc: Individual
    register get/set for ppc) introduced a problem where memcpy was used
    incorrectly to read and write the evr registers with a kernel that
    has:
    
    CONFIG_FSL_BOOKE=y
    CONFIG_SPE=y
    CONFIG_KGDB=y
    
    This patch also fixes the following compilation problems:
    
    arch/powerpc/kernel/kgdb.c: In function 'dbg_get_reg':
    arch/powerpc/kernel/kgdb.c:341: error: passing argument 2 of 'memcpy' makes pointer from integer without a cast
    arch/powerpc/kernel/kgdb.c: In function 'dbg_set_reg':
    arch/powerpc/kernel/kgdb.c:366: error: passing argument 1 of 'memcpy' makes pointer from integer without a cast
    
    [jason.wessel at windriver.com: Remove void * casts and fix patch header]
    Reported-by: Milton Miller <miltonm at bga.com>
    Signed-off-by: Dongdong Deng <dongdong.deng at windriver.com>
    Acked-by: Kumar Gala <galak at kernel.crashing.org>
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
    CC: linuxppc-dev at lists.ozlabs.org

commit 10a6e67648d4b47769953bd24759ba9609bf00df
Author: Jason Wessel <jason.wessel at windriver.com>
Date:   Mon Nov 15 08:07:35 2010 -0600

    kgdb,x86: fix regression in detach handling
    
    The fix from ba773f7c510c0b252145933926c636c439889207
    (x86,kgdb: Fix hw breakpoint regression) was not entirely complete.
    
    The kgdb_remove_all_hw_break() function also needs to call the
    hw_break_release_slot() or else a breakpoint can get activated again
    after the debugger has detached.
    
    The kgdb test suite exposes the behavior in the form of either a hang
    or repetitive failure.  The kernel config that exposes the problem
    contains all of the following:
    
    CONFIG_DEBUG_RODATA=y
    CONFIG_KGDB_TESTS=y
    CONFIG_KGDB_TESTS_ON_BOOT=y
    CONFIG_KGDB_TESTS_BOOT_STRING="V1F100"
    
    Reported-by: Frederic Weisbecker <fweisbec at gmail.com>
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
    Tested-by: Frederic Weisbecker <fweisbec at gmail.com>

commit 5450d904054b4ed582793ad6ecb5469f03cc4c46
Author: Jovi Zhang <bookjovi at gmail.com>
Date:   Wed Nov 10 07:22:18 2010 -0600

    kdb: fix crash when KDB_BASE_CMD_MAX is exceeded
    
    When the number of dyanmic kdb commands exceeds KDB_BASE_CMD_MAX, the
    kernel will fault.
    
    Signed-off-by: Jovi Zhang <bookjovi at gmail.com>
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>

commit 85e76ab50aecbdc9011806f2f8943450ccb0d93c
Author: Jovi Zhang <bookjovi at gmail.com>
Date:   Wed Nov 10 07:22:18 2010 -0600

    kdb: fix memory leak in kdb_main.c
    
    Call kfree in the error path as well as the success path in kdb_ll().
    
    Signed-off-by: Jovi Zhang <bookjovi at gmail.com>
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>

commit bedad0ca3fb2ba52c347b54a97b78d32e406dd96
Author: Chris Paulson-Ellis <chris at edesix.com>
Date:   Tue Nov 16 12:27:09 2010 +0000

    ASoC: davinci: fixes for multi-component
    
    Multi-component commit f0fba2ad broke a few things which this patch should
    fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
    good if those with access to other Davinci boards could test.
    
    --
    
    The multi-component commit put the initialisation of
    snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
    McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
    The initialisation had to be moved from the probe function in these drivers
    because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
    
    Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
    davinci-pcm.c) before hw_params is called. I have moved the initialisation to
    a new snd_soc_dai_ops.startup function in each of these drivers. This fix
    indicates that all platforms that use davinci-pcm must have been broken and
    need to test with this fix.
    
    --
    
    The multi-component commit also changed the McBSP driver name from
    "davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
    level references to the driver name. This change is understandable, as there
    is a similarly named "davinci-mcasp&