1. 22 May, 2015 7 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 2f8126e3
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
       "Bug fixes.
      
        Three for our crypto code, two for eBPF, and one memory management fix
        to get machines with memory > 8TB working"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/mm: correct return value of pmd_pfn
        s390/crypto: fix stckf loop
        s390/zcrypt: Fix invalid domain handling during ap module unload
        s390/bpf: Fix gcov stack space problem
        s390/zcrypt: fixed ap poll timer behavior
        s390/bpf: Adjust ALU64_DIV/MOD to match interpreter change
      2f8126e3
    • Linus Torvalds's avatar
      Merge tag 'sound-4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 0c68e5bf
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This batch became slightly large, just because I've been on vacation
        for the last two weeks.  Nothing to scare much here, all
        device-specific fixes, mostly small patches.
      
        Majority of patches are for HD-audio, especially Dell machines.  The
        rest are small ASoC fixes for various codecs, and a USB-audio quirk.
      
        One PCM fix is included to ease the faulty condition checks in the
        case of two periods PCM buffers"
      
      * tag 'sound-4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Disable widget power-saving for ALC292 & co
        ALSA: hda - Reduce verbs by node power-saves
        ALSA: sound/atmel/ac97c.c: remove unused variable
        ALSA: usb-audio: Add quirk for MS LifeCam Studio
        ALSA: pcm: Modify double acknowledged interrupts check condition
        ALSA: hda/realtek - ALC292 dock fix for Thinkpad L450
        ALSA: hda - Add Conexant codecs CX20721, CX20722, CX20723 and CX20724
        ALSA: hda - Fix headset mic and mic-in for a Dell desktop
        ASoC: wm8994: correct BCLK DIV 348 to 384
        ASoC: wm8960: fix "RINPUT3" audio route error
        ASoC: dapm: Modify widget stream name according to prefix
        ALSA: hda - Add headset mic quirk for Dell Inspiron 5548
        ASoC: rt5645: Fix mask for setting RT5645_DMIC_2_DP_GPIO12 bit
        ASoC: rt5645: Add ACPI match ID
        ALSA: hda/realtek - Add ALC298 alias name for Dell
        ASoC: uda1380: Avoid accessing i2c bus when codec is disabled
        ALSA: hda/realtek - Fix typo for ALC286/ALC288
        ASoC: mc13783: Fix wrong mask value used in mc13xxx_reg_rmw() calls
        ALSA: hda - Add headphone quirk for Lifebook E752
        ASoC: davinci-mcasp: Correct pm status check in suspend callback
      0c68e5bf
    • Linus Torvalds's avatar
      Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 18658921
      Linus Torvalds authored
      Pull thermal fixes from Zhang Rui:
       "Three fixes for Armada (380) and TI (dra7 and OMAP5) thermal soc
        drivers"
      
      * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        thermal: armada: Update Armada 380 thermal sensor coefficients
        thermal: ti-soc-thermal: OMAP5: Implement Workaround for Errata i813
        thermal: ti-soc-thermal: dra7: Implement Workaround for Errata i814
      18658921
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 83ee4121
      Linus Torvalds authored
      Pull infiniband/rdma fixes from Doug Ledford:
       "This should hopefully be the last request for 4.1-rc for the RDMA
        stack.  It contains some late ocrdma fixes that I'm including because
        they are small and self contained.  It also contains two bug fixes
        that are simple and easily verified.
      
        Summary:
      
         - a number of small, well contained bug fixes for ocrdma driver
      
         - a simple fix for the connection negotiation sequence on IB
      
         - fix for broken AF_IB address on UD queue pair support"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        IB/cma: Fix broken AF_IB UD support
        ib/cm: Change reject message type when destroying cm_id
        RDMA/ocrdma: Update ocrdma version number
        RDMA/ocrdma: Fail connection for MTU lesser than 512
        RDMA/ocrdma: Fix dmac resolution for link local address
        RDMA/ocrdma: Prevent allocation of DPP PDs if FW doesnt support it
        RDMA/ocrdma: Fix the request length for RDMA_QUERY_QP mailbox command to FW.
        RDMA/ocrdma: Use VID 0 if PFC is enabled and vlan is not configured
        RDMA/ocrdma: Fix QP state transition in destroy_qp
        RDMA/ocrdma: Report EQ full fatal error
        RDMA/ocrdma: Fix EQ destroy failure during driver unload
      83ee4121
    • Linus Torvalds's avatar
      Merge tag 'mmc-4.1-rc3' of git://git.linaro.org/people/ulf.hansson/mmc · 97793a81
      Linus Torvalds authored
      Pull MMC fix from Ulf Hansson:
       "One more mmc fix intended for v4.1 rc5:
      
        MMC host:
         - atmel-mci: fix bad variable type for clkdiv"
      
      * tag 'mmc-4.1-rc3' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: atmel-mci: fix bad variable type for clkdiv
      97793a81
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 6efdb114
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
       "Bugfixes for HID subsystem that should go in 4.1.  Important
        highlights:
      
         - the patch that extended support for HID++ protocol for TK820
           touchpad turns out to be causing regressions due to firmware
           issues; patch reverting back to basic support from Benjamin
           Tissoires
      
         - Wacom driver can oops for devices that report non-touch data on
           touch interfaces.  Fix from Ping Cheng
      
         - gpiolib is not mandatory for i2c-hid, so the driver shouldn't fail
           if gpiolib is not enabled.  Fix from Mika Westerberg"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: wacom: fix an Oops caused by wacom_wac_finger_count_touches
        HID: usbhid: Add HID_QUIRK_NOGET for Aten DVI KVM switch
        HID: hid-sensor-hub: Fix debug lock warning
        Revert "HID: logitech-hidpp: support combo keyboard touchpad TK820"
        HID: i2c-hid: Do not fail probing if gpiolib is not enabled
      6efdb114
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · e51a3630
      Linus Torvalds authored
      Pull crypto fix from Herbert Xu:
       "This fixes a the crash in the newly added algif_aead interface when it
        tries to link SG lists"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: algif_aead - fix invalid sgl linking
      e51a3630
  2. 21 May, 2015 2 commits
    • Linus Torvalds's avatar
      Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 3d854120
      Linus Torvalds authored
      Pull clk fixes from Michael Turquette:
       "The first set of clk fixes for 4.1 are all driver bugs, with the
        exception of a single locking fix in the core code.
      
        All driver fixes are for code that was merged recently.  The Samsung
        stuff is mostly fixes around suspend/resume, the Qualcomm fixes are
        for invalid hardware configuration data and the Silicon Labs patches
        are fixes following their move away from platform_data to Device Tree"
      
      * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
        clk: si5351: Do not pass struct clk in platform_data
        clk: si5351: Mention clock-names in the binding documentation
        clk: add missing lock when call clk_core_enable in clk_set_parent
        clk: exynos5420: Restore GATE_BUS_TOP on suspend
        clk: qcom: Fix MSM8916 gfx3d_clk_src configuration
        clk: qcom: Fix MSM8916 venus divider value
        clk: exynos5433: Fix wrong PMS value of exynos5433_pll_rates
        clk: exynos5433: Fix wrong parent clock of sclk_apollo clock
        clk: exynos5433: Fix CLK_PCLK_MONOTONIC_CNT clk register assignment
        clk: exynos5433: Fix wrong offset of PCLK_MSCL_SECURE_SMMU_JPEG
        clk: Use CONFIG_ARCH_EXYNOS instead of CONFIG_ARCH_EXYNOS5433
      3d854120
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.1-rc5' of... · 4cce593f
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixlet from Guenter Roeck:
       "Update location of Jean Delvare's hwmon quilt tree"
      
      * tag 'hwmon-for-linus-v4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: Update the location of my quilt tree
      4cce593f
  3. 20 May, 2015 6 commits
    • Matthew Finlay's avatar
      IB/cma: Fix broken AF_IB UD support · c07678bb
      Matthew Finlay authored
      Support for using UD and AF_IB is currently broken.  The
      IB_CM_SIDR_REQ_RECEIVED message is not handled properly in
      cma_save_net_info() and we end up falling into code that will try and
      process the request as ipv4/ipv6, which will end up failing.
      
      The resolution is to add a check for the SIDR_REQ and call
      cma_save_ib_info() with a NULL path record.  Change cma_save_ib_info()
      to copy the src sib info from the listen_id when the path record is NULL.
      Reported-by: default avatarHari Shankar <Hari.Shankar@netapp.com>
      Signed-off-by: default avatarMatt Finlay <matt@mellanox.com>
      Acked-by: default avatarSean Hefty <sean.hefty@intel.com>
      Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
      c07678bb
    • Ted Kim's avatar
      ib/cm: Change reject message type when destroying cm_id · c29ed5a4
      Ted Kim authored
      Problem reported by: Ted Kim <ted.h.kim@oracle.com>:
      
      We have a case where a Linux system and a non-Linux system are
      trying to interoperate.  The Linux host is the active side and
      starts the connection establishment, but later decides to not go
      through with the connection setup and does rdma_destroy_id().
      
      The rdma_destroy_id() eventually works its way down to cm_destroy_id()
      in core/cm.c, where a REJ is sent. The non-Linux system
      has some trouble recognizing the REJ because of:
      
      A. CM states which can't receive the REJ
      B. Some issues about REJ formatting (missing comm ID)
      
      ISSUE A: That part of the spec says, a Consumer Reject REJ can be
      sent for a connection abort, but it goes further
      and says: can send a REJ message with a "Consumer Reject"
      Reason code if they are in a CM state (i.e. REP
      Rcvd, MRA(REP) Sent, REQ Rcvd, MRA Sent) that allows
      a REJ to be sent (lines 35-38).
      
      Of the states listed there in that sentence, it would
      seem to limit the active side to using the Consumer Reject
      (for the abort case) in just the REP-Rcvd and MRA-REP-Sent
      states. That is basically only after the active side
      sees a REP (or alternatively goes down the state transitions
      to timeout in which case a Timeout REJ is sent).
      
      As a fix, in cm-destroy-id() move the IB-CM-MRA-REQ-RCVD case
      to the same as REQ-SENT.  Essentially, make a REJ sent after
      getting an MRA on active side a timeout rather than Consumer-
      Reject, which is arguably more correct with the CM state
      diagrams previous to getting a REP.
      Signed-off-by: default avatarTed Kim <ted.h.kim@oracle.com>
      Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
      c29ed5a4
    • Ping Cheng's avatar
      HID: wacom: fix an Oops caused by wacom_wac_finger_count_touches · 26ba61f8
      Ping Cheng authored
      We assumed all touch interfaces report touch data. But, Bamboo
      and Intuos non-touch devices report express keys on touch
      interface. We need to check touch_max before counting touches.
      Reported-by: default avatarTasos Sahanidis <tasos@tasossah.com>
      Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      26ba61f8
    • Takashi Iwai's avatar
      ALSA: hda - Disable widget power-saving for ALC292 & co · 219f47e4
      Takashi Iwai authored
      We've got reports that ALC3226 (a Dell variant of ALC292) gives click
      noises at transition from D3 to D0 when the widget power-saving is
      enabled.  Further debugging session showed that avoiding it isn't
      trivial, unfortunately, since paths are basically activated
      dynamically while the pins have been already enabled.
      
      This patch disables the widget power-saving for such codecs.
      Reported-by: default avatarJonathan McDowell <noodles@earth.li>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      219f47e4
    • Takashi Iwai's avatar
      ALSA: hda - Reduce verbs by node power-saves · 48f4b3a2
      Takashi Iwai authored
      The widget (node) power-saves restore the widget states at each
      transition from D3 to D0 on each node.  This was added in the commit
      [d545a57c:ALSA: hda - Sync node attributes at resume from widget
      power saving].  However, the test was rater false-positive; this
      wasn't needed for any codecs.
      
      Since the resync may take significant number of additional verbs to be
      executed, it's better to reduce it.  Let's disable it for now again.
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      48f4b3a2
    • Arnd Bergmann's avatar
      ALSA: sound/atmel/ac97c.c: remove unused variable · 976fa9a3
      Arnd Bergmann authored
      The recently added DT support for the ac97 driver is causing
      a gcc warning:
      
      sound/atmel/ac97c.c: In function 'atmel_ac97c_probe_dt':
      sound/atmel/ac97c.c:919:29: warning: unused variable 'match' [-Wunused-variable]
        const struct of_device_id *match;
      
      The variable is clearly unused, so we can remove it.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarAlexander Stein <alexanders83@web.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      976fa9a3
  4. 19 May, 2015 10 commits
  5. 18 May, 2015 15 commits