Skip to content
  1. Jun 08, 2012
  2. Jun 07, 2012
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 71fae7e7
      Linus Torvalds authored
      Pull hwmon fix from Guenter Roeck:
       "Update e-mail address in MAINTAINERS"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        MAINTAINERS: Update my e-mail address
      71fae7e7
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · ff39d0e8
      Linus Torvalds authored
      Pull ACPI and Power Management changes from Len Brown.
      
      This does an evil merge to fix up what I think is a mismerge by Len to
      the gma500 driver, and restore it to the mainline state.
      
      In that driver, both branches had commented out the call to
      acpi_video_register(), and Len resolved the merge to that commented-out
      version.
      
      However, in mainline, further changes by Alan (commit d839ede4:
      "gma500: opregion and ACPI" to be exact) had re-enabled the ACPI video
      registration, so the current state of the driver seems to want it.
      
      Alan is apparently still feeling the effects of partying with the Queen,
      so he didn't reply to my query, but I'll do the evil merge anyway.
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
        ACPI: fix acpi_bus.h build warnings when ACPI is not enabled
        drivers: acpi: Fix dependency for ACPI_HOTPLUG_CPU
        tools/power turbostat: fix IVB support
        tools/power turbostat: fix un-intended affinity of forked program
        ACPI video: use after input_unregister_device()
        gma500: don't register the ACPI video bus
        acpi_video: Intel video is not always i915
        acpi_video: fix leaking PCI references
        ACPI: Ignore invalid _PSS entries, but use valid ones
        ACPI battery: only refresh the sysfs files when pertinent information changes
      ff39d0e8
    • Linus Torvalds's avatar
      Merge tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · ae501be0
      Linus Torvalds authored
      Pull InfiniBand/RDMA fixes from Roland Dreier:
       "All in hardware drivers:
         - Fix crash in cxgb4
         - Fixes to new ocrdma driver
         - Regression fixes for mlx4"
      
      * tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/mlx4: Fix max_wqe capacity reported from query device
        mlx4_core: Fix setting VL_cap in mlx4_SET_PORT wrapper flow
        IB/mlx4: Fix EQ deallocation in legacy mode
        RDMA/cxgb4: Fix crash when peer address is 0.0.0.0
        RDMA/ocrdma: Remove unnecessary version.h includes
        RDMA/ocrdma: Fix signaled event for SRQ_LIMIT_REACHED
        RDMA/ocrdma: Correct queue free count math
      ae501be0
    • Roland Dreier's avatar
    • Sagi Grimberg's avatar
      IB/mlx4: Fix max_wqe capacity reported from query device · fc2d0044
      Sagi Grimberg authored
      
      
      1. Limit the max number of WQEs per QP reported when querying the
         device, so that ib_create_qp() will not fail for a QP size that the
         device claimed to support due to additional headroom WQEs being
         allocated.
      
      2. Limit qp resources accepted for ib_create_qp() to the limits
         reported in ib_query_device().  In kernel space, make sure that the
         limits returned to the caller following qp creation also lie within
         the reported device limits. For userspace, report as before, and do
         adjustment in libmlx4 (so as not to break ABI).
      
      Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
      Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.co.il>
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      fc2d0044
    • Jack Morgenstein's avatar
      mlx4_core: Fix setting VL_cap in mlx4_SET_PORT wrapper flow · edc4a67e
      Jack Morgenstein authored
      Commit 096335b3
      
       ("mlx4_core: Allow dynamic MTU configuration for
      IB ports") modifies the port VL setting.  This exposes a bug in
      mlx4_common_set_port(), where the VL cap value passed in (inside the
      command mailbox) is incorrectly zeroed-out:
      
      mlx4_SET_PORT modifies the VL_cap field (byte 3 of the mailbox).
      Since the SET_PORT command is paravirtualized on the master as well as
      on the slaves, mlx4_SET_PORT_wrapper() is invoked on the master.  This
      calls mlx4_common_set_port() where mailbox byte 3 gets overwritten by
      code which should only set a single bit in that byte (for the reset
      qkey counter flag) -- but instead overwrites the entire byte.
      
      The result is that when running in SR-IOV mode, the VL_cap will be set
      to zero -- fix this.
      
      Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      edc4a67e
    • Linus Torvalds's avatar
      Merge tag 'md-3.5-fixes' of git://neil.brown.name/md · 374916ed
      Linus Torvalds authored
      Pull two md fixes from NeilBrown:
       "One sparse-warning fix, one bugfix for 3.4-stable"
      
      * tag 'md-3.5-fixes' of git://neil.brown.name/md:
        md: raid1/raid10: fix problem with merge_bvec_fn
        lib/raid6: fix sparse warnings in recovery functions
      374916ed
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 9e68447f
      Linus Torvalds authored
      Pull IOMMU fixes from Joerg Roedel:
       "Two patches are in here which fix AMD IOMMU specific issues.  One
        patch fixes a long-standing warning on resume because the
        amd_iommu_resume function enabled interrupts.  The other patch fixes a
        deadlock in an error-path of the page-fault request handling code of
        the IOMMU driver.
      
      * tag 'iommu-fixes-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/amd: Fix deadlock in ppr-handling error path
        iommu/amd: Cache pdev pointer to root-bridge
      9e68447f
  3. Jun 06, 2012
  4. Jun 05, 2012