Skip to content
  1. Oct 17, 2013
  2. Oct 16, 2013
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux · 34ec4de4
      Linus Torvalds authored
      Pull device tree fixes and reverts from Grant Likely:
       "One bug fix and three reverts.  The reverts back out the slightly
        controversial feeding the entire device tree into the random pool and
        the reserved-memory binding which isn't fully baked yet.  Expect the
        reserved-memory patches at least to resurface for v3.13.
      
        The bug fixes removes a scary but harmless warning on SPARC that was
        introduced in the v3.12 merge window.  v3.13 will contain a proper fix
        that makes the new code work on SPARC.
      
        On the plus side, the diffstat looks *awesome*.  I love removing lines
        of code"
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
        Revert "drivers: of: add initialization code for dma reserved memory"
        Revert "ARM: init: add support for reserved memory defined by device tree"
        Revert "of: Feed entire flattened device tree into the random pool"
        of: fix unnecessary warning on missing /cpus node
      34ec4de4
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · ba0a062e
      Linus Torvalds authored
      Pull DMA-mapping fix from Marek Szyprowski:
       "A bugfix for the IOMMU-based implementation of dma-mapping subsystem
        for ARM architecture"
      
      * 'fixes-for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        ARM: dma-mapping: Always pass proper prot flags to iommu_map()
      ba0a062e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · b83aea88
      Linus Torvalds authored
      Pull kvm fix from Gleb Natapov.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: Enable pvspinlock after jump_label_init() to avoid VM hang
      b83aea88
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.12-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 36704263
      Linus Torvalds authored
      Pull Xen fixes from Stefano Stabellini:
       "A small fix for Xen on x86_32 and a build fix for xen-tpmfront on
        arm64"
      
      * tag 'stable/for-linus-3.12-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen: Fix possible user space selector corruption
        tpm: xen-tpmfront: fix missing declaration of xen_domain
      36704263
  3. Oct 15, 2013
    • Raghavendra K T's avatar
      KVM: Enable pvspinlock after jump_label_init() to avoid VM hang · 3dbef3e3
      Raghavendra K T authored
      We use jump label to enable pv-spinlock. With the changes in (442e0973
      Merge branch 'x86/jumplabel'), the jump label behaviour has changed
      that would result in eventual hang of the VM since we would end up in a
      situation where slow path locks would halt the vcpus but we will not be
      able to wakeup the vcpu by lock releaser using unlock kick.
      
      Similar problem in Xen and more detailed description is available in
      a945928e
      
       (xen: Do not enable spinlocks before jump_label_init()
      has executed)
      
      This patch splits kvm_spinlock_init to separate jump label changes with
      pvops patching and also make jump label enabling after jump_label_init().
      
      Signed-off-by: default avatarRaghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
      Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Reviewed-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
      3dbef3e3
    • Marek Szyprowski's avatar
      Revert "drivers: of: add initialization code for dma reserved memory" · 1931ee14
      Marek Szyprowski authored
      This reverts commit 9d8eab7a
      
      . There is
      still no consensus on the bindings for the reserved memory and various
      drawbacks of the proposed solution has been shown, so the best now is to
      revert it completely and start again from scratch later.
      
      Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
      Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
      1931ee14
    • Marek Szyprowski's avatar
      Revert "ARM: init: add support for reserved memory defined by device tree" · cebf3e40
      Marek Szyprowski authored
      This reverts commit 10bcdfb8
      
      . There is
      no consensus on the bindings for the reserved memory, so the code for
      handing it will be reverted.
      
      Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
      Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
      cebf3e40
    • Linus Torvalds's avatar
      Merge tag 'vfio-v3.12-rc5' of git://github.com/awilliam/linux-vfio · 1e52db69
      Linus Torvalds authored
      Pull vfio fix from Alex Williamson:
       "Fix an incorrect break out of nested loop in iommu mapping code"
      
      * tag 'vfio-v3.12-rc5' of git://github.com/awilliam/linux-vfio:
        VFIO: vfio_iommu_type1: fix bug caused by break in nested loop
      1e52db69
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · ed8ada39
      Linus Torvalds authored
      Pull infiniband updates from Roland Dreier:
       "Last batch of IB changes for 3.12: many mlx5 hardware driver fixes
        plus one trivial semicolon cleanup"
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB: Remove unnecessary semicolons
        IB/mlx5: Ensure proper synchronization accessing memory
        IB/mlx5: Fix alignment of reg umr gather buffers
        IB/mlx5: Fix eq names to display nicely in /proc/interrupts
        mlx5: Fix error code translation from firmware to driver
        IB/mlx5: Fix opt param mask according to firmware spec
        mlx5: Fix opt param mask for sq err to rts transition
        IB/mlx5: Disable atomic operations
        mlx5: Fix layout of struct mlx5_init_seg
        mlx5: Keep polling to reclaim pages while any returned
        IB/mlx5: Avoid async events on invalid port number
        IB/mlx5: Decrease memory consumption of mr caches
        mlx5: Remove checksum on command interface commands
        IB/mlx5: Fix memory leak in mlx5_ib_create_srq
        IB/mlx5: Flush cache workqueue before destroying it
        IB/mlx5: Fix send work queue size calculation
      ed8ada39
    • Roland Dreier's avatar
      Merge branch 'misc' into for-next · 59b5b28d
      Roland Dreier authored
      59b5b28d
    • Joe Perches's avatar
      IB: Remove unnecessary semicolons · 2b50176d
      Joe Perches authored
      
      
      These aren't necessary after switch blocks.
      
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      2b50176d
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · d6099aeb
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Some more ARM fixes, nothing particularly major here.  The biggest
        change is to fix the SMP_ON_UP code so that it works with TI's Aegis
        cores"
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7851/1: check for number of arguments in syscall_get/set_arguments()
        ARM: 7846/1: Update SMP_ON_UP code to detect A9MPCore with 1 CPU devices
        ARM: 7845/1: sharpsl_param.c: fix invalid memory access for pxa devices
        ARM: 7843/1: drop asm/types.h from generic-y
        ARM: 7842/1: MCPM: don't explode if invoked without being initialized first
      d6099aeb
    • Linus Torvalds's avatar
      Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · 4b60667a
      Linus Torvalds authored
      Pull SLAB fix from Pekka Enberg:
       "A regression fix for overly eager slab cache name checks"
      
      * 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
        slab_common: Do not check for duplicate slab names
      4b60667a
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 35f9162d
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These fix two recent bugs in ACPIPHP (ACPI-based PCI hotplug) and
        update a bunch of web links and e-mail addresses in MAINTAINERS, docs
        and Kconfig that either are stale or will expire soon.
      
        Specifics:
      
         - The WARN_ON() in acpiphp_enumerate_slots() triggers as a false
           positive in some cases, so drop it.
      
         - Add a missing pci_dev_put() to an error code path in
           acpiphp_enumerate_slots().
      
         - Replace my old e-mail address that's going to expire with a new
           one.
      
         - Update ACPI web links and git tree information in MAINTAINERS.
      
         - Update links to the Linux-ACPI project's page in MAINTAINERS.
      
         - Update some stale links and e-mail addresses under Documentation
           and in the ACPI Kconfig file"
      
      * tag 'pm+acpi-3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / hotplug / PCI: Drop WARN_ON() from acpiphp_enumerate_slots()
        ACPI / hotplug / PCI: Fix error code path in acpiphp_enumerate_slots()
        ACPI / PM / Documentation: Replace outdated project links and addresses
        MAINTAINERS / ACPI: Update links to the Linux-ACPI project web page
        MAINTAINERS / ACPI: Update links and git tree information
        MAINTAINERS / Documentation: Update Rafael's e-mail address
      35f9162d
  4. Oct 14, 2013