1. 11 Jun, 2013 2 commits
  2. 05 Jun, 2013 7 commits
    • James Hogan's avatar
      KVM: add kvm_para_available to asm-generic/kvm_para.h · 066a1a5f
      James Hogan authored
      According to include/uapi/linux/kvm_para.h architectures should define
      kvm_para_available, so add an implementation to asm-generic/kvm_para.h
      which just returns false.
      
      This fixes intel8x0.c build failure on mips with KVM enabled.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Marcelo Tosatti <mtosatti@redhat.com>
      Cc: Gleb Natapov <gleb@redhat.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
      066a1a5f
    • Linus Torvalds's avatar
      Merge tag 'mmc-fixes-for-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 844ce9f2
      Linus Torvalds authored
      Pull MMC fixes from Chris Ball:
       - sdhci-acpi: Fix initial runtime PM status, add more ACPI IDs
       - atmel-mci, omap_hsmmc: DT handling fixes
       - esdhc-imx: Fix SDIO IRQs, fix multiblock reads (both h/w errata)
      
      * tag 'mmc-fixes-for-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
        mmc: omap_hsmmc: Skip platform_get_resource_byname() for dt case
        mmc: omap_hsmmc: convert to dma_request_slave_channel_compat
        mmc: omap_hsmmc: Fix the DT pbias workaround for MMC controllers 2 to 5
        mmc: sdhci-pci: add more device ids
        mmc: sdhci-acpi: add more device ids
        mmc: sdhci-acpi: fix initial runtime pm status
        mmc: atmel-mci: convert to dma_request_slave_channel_compat()
        mmc: sdhci-esdhc-imx: fix multiblock reads on i.MX53
        mmc: sdhci-esdhc-imx: Fix SDIO interrupts
      844ce9f2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · bb762929
      Linus Torvalds authored
      Pull input fixes from Dmitry Torokhov:
       "Just a 2 small driver fixups here"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: wacom - fix a typo for Cintiq 22HDT
        Input: synaptics - fix sync lost after resume on some laptops
      bb762929
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 8b35c359
      Linus Torvalds authored
      Pull kvm bugfixes from Gleb Natapov:
       "The bulk of the fixes is in MIPS KVM kernel<->userspace ABI.  MIPS KVM
        is new for 3.10 and some problems were found with current ABI.  It is
        better to fix them now and do not have a kernel with broken one"
      
      * 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: Fix race in apic->pending_events processing
        KVM: fix sil/dil/bpl/spl in the mod/rm fields
        KVM: Emulate multibyte NOP
        ARM: KVM: be more thorough when invalidating TLBs
        ARM: KVM: prevent NULL pointer dereferences with KVM VCPU ioctl
        mips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls.
        mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REG
        mips/kvm: Use ARRAY_SIZE() instead of hardcoded constants in kvm_arch_vcpu_ioctl_{s,g}et_regs
        mips/kvm: Fix name of gpr field in struct kvm_regs.
        mips/kvm: Fix ABI for use of 64-bit registers.
        mips/kvm: Fix ABI for use of FPU.
      8b35c359
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes · 6f66f900
      Linus Torvalds authored
      Pull gfs2 fixes from Steven Whitehouse:
       "There are four patches this time.
      
        The first fixes a problem where the wrong descriptor type was being
        written into the log for journaled data blocks.
      
        The second fixes a race relating to the deallocation of allocator
        data.
      
        The third provides a fallback if kmalloc is unable to satisfy a
        request to allocate a directory hash table.
      
        The fourth fixes the iopen glock caching so that inodes are deleted in
        a more timely manner after rmdir/unlink"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
        GFS2: Don't cache iopen glocks
        GFS2: Fall back to vmalloc if kmalloc fails for dir hash tables
        GFS2: Increase i_writecount during gfs2_setattr_size
        GFS2: Set log descriptor type for jdata blocks
      6f66f900
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 8764d861
      Linus Torvalds authored
      Pull fuse fixes from Miklos Szeredi:
       "One patch fixes an Oops introduced in 3.9 with the readdirplus
        feature.  The rest are fixes for async-dio in 3.10"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: fix alignment in short read optimization for async_dio
        fuse: return -EIOCBQUEUED from fuse_direct_IO() for all async requests
        fuse: fix readdirplus Oops in fuse_dentry_revalidate
        fuse: update inode size and invalidate attributes on fallocate
        fuse: truncate pagecache range on hole punch
        fuse: allocate for_background dio requests based on io->async state
      8764d861
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · 1dc735bd
      Linus Torvalds authored
      Pull microblaze fixes from Michal Simek:
       "One is fixing warning reported by sparse and the second warning was
        reported by Geert in his build regressions/improvements status update
        for -rc4."
      
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Use static inline functions in cacheflush.h
        microblaze: Fix sparse warnings
      1dc735bd
  3. 04 Jun, 2013 2 commits
    • Ping Cheng's avatar
      Input: wacom - fix a typo for Cintiq 22HDT · 3bd1f7e2
      Ping Cheng authored
      And make the lines easier to read.
      Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
      Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      3bd1f7e2
    • Eric Miao's avatar
      Input: synaptics - fix sync lost after resume on some laptops · eeb06558
      Eric Miao authored
      In summary, the symptom is intermittent key events lost after resume
      on some machines with synaptics touchpad (seems this is synaptics _only_),
      and key events loss is due to serio port reconnect after psmouse sync lost.
      Removing psmouse and inserting it back during the suspend/resume process
      is able to work around the issue, so the difference between psmouse_connect()
      and psmouse_reconnect() is the key to the root cause of this problem.
      
      After comparing the two different paths, synaptics driver has its own
      implementation of synaptics_reconnect(), and the missing psmouse_probe()
      seems significant, the patch below added psmouse_probe() to the reconnect
      process, and has been verified many times that the issue could not be reliably
      reproduced.
      
      There are two PS/2 commands in psmouse_probe():
      
        1. PSMOUSE_CMD_GETID
        2. PSMOUSE_CMD_RESET_DIS
      
      Only the PSMOUSE_CMD_GETID seems to be significant. The
      PSMOUSE_CMD_RESET_DIS is irrelevant to this issue after trying
      several times.  So we have only implemented this patch to issue
      the PSMOUSE_CMD_GETID so far.
      Tested-by: default avatarDaniel Manrique <daniel.manrique@canonical.com>
      Signed-off-by: default avatarJames M Leddy <james.leddy@canonical.com>
      Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      eeb06558
  4. 03 Jun, 2013 26 commits
  5. 02 Jun, 2013 2 commits
    • Linus Torvalds's avatar
      Linux 3.10-rc4 · d683b96b
      Linus Torvalds authored
      d683b96b
    • Sergei Shtylyov's avatar
      sata_rcar: fix interrupt handling · 52a2a108
      Sergei Shtylyov authored
      The driver's interrupt handling code is too picky in deciding whether it should
      handle an interrupt or not which causes completely unneeded spurious interrupts.
      Thus make sata_rcar_{ata|serr}_interrupt() *void*; add ATA status register read
      to sata_rcar_ata_interrupt() to clear an unexpected ATA interrupt -- it doesn't
      get cleared by writing to the SATAINTSTAT register in the interrupt mode we use.
      
      Also, in sata_rcar_ata_interrupt() we should check SATAINTSTAT register only for
      enabled interrupts and we should clear  only those interrupts  that we have read
      as active first time around, because else we have  a  race and risk clearing  an
      interrupt that  can  occur between read  and write of the  SATAINTSTAT  register
      and never registering it...
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Cc: stable@vger.kernel.org
      52a2a108
  6. 01 Jun, 2013 1 commit
    • Linus Torvalds's avatar
      Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · cc863973
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
       "This patcheset includes fixes for:
      
         - the PCI/LBA which brings back the stifb graphics framebuffer
           console
         - possible memory overflows in parisc kernel init code
         - parport support on older GSC machines
         - avoids that users by mistake enable PARPORT_PC_SUPERIO on parisc
         - MAINTAINERS file list updates for parisc."
      
      * 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: parport0: fix this legacy no-device port driver!
        parport_pc: disable PARPORT_PC_SUPERIO on parisc architecture
        parisc/PCI: lba: fix: convert to pci_create_root_bus() for correct root bus resources (v2)
        parisc/PCI: Set type for LBA bus_num resource
        MAINTAINERS: update parisc architecture file list
        parisc: kernel: using strlcpy() instead of strcpy()
        parisc: rename "CONFIG_PA7100" to "CONFIG_PA7000"
        parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50
        parisc: memory overflow, 'name' length is too short for using
      cc863973