Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 22, 2015
  1. Merge tag 'for-linus-4.1b-rc4-tag' of git://…

    Pull two xen bugfixes from David Vrabel:
     - fix ARM build regression.
     - fix VIRQ_CONSOLE related oops.
    * tag 'for-linus-4.1b-rc4-tag' of git://
      xen/events: don't bind non-percpu VIRQs with percpu chip
      xen/arm: Define xen_arch_suspend()
  2. Merge tag 'for-linus' of git://

    Pull KVM fixes from Paolo Bonzini:
     "This includes a fix for two oopses, one on PPC and on x86.
      The rest is fixes for bugs with newer Intel processors"
    * tag 'for-linus' of git://
      kvm/fpu: Enable eager restore kvm FPU for MPX
      Revert "KVM: x86: drop fpu_activate hook"
      kvm: fix crash in kvm_vcpu_reload_apic_access_page
      KVM: MMU: fix SMAP virtualization
      KVM: MMU: fix CR4.SMEP=1, CR0.WP=0 with shadow pages
      KVM: MMU: fix smap permission check
      KVM: PPC: Book3S HV: Fix list traversal in error case
  3. Merge branch 'for-linus' of git://…

    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://
      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
  4. Merge tag 'sound-4.1-rc5' of git://…

    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://
      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
  5. Merge branch 'for-rc' of git://…

    Pull thermal fixes from Zhang Rui:
     "Three fixes for Armada (380) and TI (dra7 and OMAP5) thermal soc
    * 'for-rc' of git://
      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
  6. Merge tag 'for-linus' of git://…

    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.
       - 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://
      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
  7. Merge tag 'mmc-4.1-rc3' of git://

    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://
      mmc: atmel-mci: fix bad variable type for clkdiv
  8. Merge branch 'for-linus' of git://…

    Pull HID fixes from Jiri Kosina:
     "Bugfixes for HID subsystem that should go in 4.1.  Important
       - 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
       - 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://
      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
  9. Merge git://

    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://
      crypto: algif_aead - fix invalid sgl linking
Commits on May 21, 2015
  1. Merge tag 'clk-fixes-for-linus' of git://…

    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://
      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
  2. Merge tag 'hwmon-for-linus-v4.1-rc5' of git://…

    Pull hwmon fixlet from Guenter Roeck:
     "Update location of Jean Delvare's hwmon quilt tree"
    * tag 'hwmon-for-linus-v4.1-rc5' of git://
      hwmon: Update the location of my quilt tree
Commits on May 20, 2015
  1. @dledford

    IB/cma: Fix broken AF_IB UD support

    Matthew Finlay authored dledford committed
    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: Hari Shankar <>
    Signed-off-by: Matt Finlay <>
    Acked-by: Sean Hefty <>
    Signed-off-by: Doug Ledford <>
  2. @dledford

    ib/cm: Change reject message type when destroying cm_id

    Ted Kim authored dledford committed
    Problem reported by: Ted Kim <>:
    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: Ted Kim <>
    Signed-off-by: Sean Hefty <>
  3. @bonzini

    kvm/fpu: Enable eager restore kvm FPU for MPX

    Liang Li authored bonzini committed
    The MPX feature requires eager KVM FPU restore support. We have verified
    that MPX cannot work correctly with the current lazy KVM FPU restore
    mechanism. Eager KVM FPU restore should be enabled if the MPX feature is
    exposed to VM.
    Signed-off-by: Yang Zhang <>
    Signed-off-by: Liang Li <>
    [Also activate the FPU on AMD processors. - Paolo]
    Signed-off-by: Paolo Bonzini <>
  4. @bonzini

    Revert "KVM: x86: drop fpu_activate hook"

    bonzini authored
    This reverts commit 4473b57.  We'll
    use the hook again.
    Signed-off-by: Paolo Bonzini <>
  5. @bonzini

    kvm: fix crash in kvm_vcpu_reload_apic_access_page

    Andrea Arcangeli authored bonzini committed
    memslot->userfault_addr is set by the kernel with a mmap executed
    from the kernel but the userland can still munmap it and lead to the
    below oops after memslot->userfault_addr points to a host virtual
    address that has no vma or mapping.
    [  327.538306] BUG: unable to handle kernel paging request at fffffffffffffffe
    [  327.538407] IP: [<ffffffff811a7b55>] put_page+0x5/0x50
    [  327.538474] PGD 1a01067 PUD 1a03067 PMD 0
    [  327.538529] Oops: 0000 [#1] SMP
    [  327.538574] Modules linked in: macvtap macvlan xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ipt_REJECT iptable_filter ip_tables tun bridge stp llc rpcsec_gss_krb5 nfsv4 dns_resolver nfs fscache xprtrdma ib_isert iscsi_target_mod ib_iser libiscsi scsi_transport_iscsi ib_srpt target_core_mod ib_srp scsi_transport_srp scsi_tgt ib_ipoib rdma_ucm ib_ucm ib_uverbs ib_umad rdma_cm ib_cm iw_cm ipmi_devintf iTCO_wdt iTCO_vendor_support intel_powerclamp coretemp dcdbas intel_rapl kvm_intel kvm crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel lrw gf128mul glue_helper ablk_helper cryptd pcspkr sb_edac edac_core ipmi_si ipmi_msghandler acpi_pad wmi acpi_power_meter lpc_ich mfd_core mei_me
    [  327.539488]  mei shpchp nfsd auth_rpcgss nfs_acl lockd grace sunrpc mlx4_ib ib_sa ib_mad ib_core mlx4_en vxlan ib_addr ip_tunnel xfs libcrc32c sd_mod crc_t10dif crct10dif_common crc32c_intel mgag200 syscopyarea sysfillrect sysimgblt i2c_algo_bit drm_kms_helper ttm drm ahci i2c_core libahci mlx4_core libata tg3 ptp pps_core megaraid_sas ntb dm_mirror dm_region_hash dm_log dm_mod
    [  327.539956] CPU: 3 PID: 3161 Comm: qemu-kvm Not tainted 3.10.0-240.el7.userfault19.4ca4011.x86_64.debug #1
    [  327.540045] Hardware name: Dell Inc. PowerEdge R420/0CN7CM, BIOS 2.1.2 01/20/2014
    [  327.540115] task: ffff8803280ccf00 ti: ffff880317c58000 task.ti: ffff880317c58000
    [  327.540184] RIP: 0010:[<ffffffff811a7b55>]  [<ffffffff811a7b55>] put_page+0x5/0x50
    [  327.540261] RSP: 0018:ffff880317c5bcf8  EFLAGS: 00010246
    [  327.540313] RAX: 00057ffffffff000 RBX: ffff880616a20000 RCX: 0000000000000000
    [  327.540379] RDX: 0000000000002014 RSI: 00057ffffffff000 RDI: fffffffffffffffe
    [  327.540445] RBP: ffff880317c5bd10 R08: 0000000000000103 R09: 0000000000000000
    [  327.540511] R10: 0000000000000000 R11: 0000000000000000 R12: fffffffffffffffe
    [  327.540576] R13: 0000000000000000 R14: ffff880317c5bd70 R15: ffff880317c5bd50
    [  327.540643] FS:  00007fd230b7f700(0000) GS:ffff880630800000(0000) knlGS:0000000000000000
    [  327.540717] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    [  327.540771] CR2: fffffffffffffffe CR3: 000000062a2c3000 CR4: 00000000000427e0
    [  327.540837] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    [  327.540904] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    [  327.540974] Stack:
    [  327.541008]  ffffffffa05d6d0c ffff880616a20000 0000000000000000 ffff880317c5bdc0
    [  327.541093]  ffffffffa05ddaa2 0000000000000000 00000000002191bf 00000042f3feab2d
    [  327.541177]  00000042f3feab2d 0000000000000002 0000000000000001 0321000000000000
    [  327.541261] Call Trace:
    [  327.541321]  [<ffffffffa05d6d0c>] ? kvm_vcpu_reload_apic_access_page+0x6c/0x80 [kvm]
    [  327.543615]  [<ffffffffa05ddaa2>] vcpu_enter_guest+0x3f2/0x10f0 [kvm]
    [  327.545918]  [<ffffffffa05e2f10>] kvm_arch_vcpu_ioctl_run+0x2b0/0x5a0 [kvm]
    [  327.548211]  [<ffffffffa05e2d02>] ? kvm_arch_vcpu_ioctl_run+0xa2/0x5a0 [kvm]
    [  327.550500]  [<ffffffffa05ca845>] kvm_vcpu_ioctl+0x2b5/0x680 [kvm]
    [  327.552768]  [<ffffffff810b8d12>] ? creds_are_invalid.part.1+0x12/0x50
    [  327.555069]  [<ffffffff810b8d71>] ? creds_are_invalid+0x21/0x30
    [  327.557373]  [<ffffffff812d6066>] ? inode_has_perm.isra.49.constprop.65+0x26/0x80
    [  327.559663]  [<ffffffff8122d985>] do_vfs_ioctl+0x305/0x530
    [  327.561917]  [<ffffffff8122dc51>] SyS_ioctl+0xa1/0xc0
    [  327.564185]  [<ffffffff816de829>] system_call_fastpath+0x16/0x1b
    [  327.566480] Code: 0b 31 f6 4c 89 e7 e8 4b 7f ff ff 0f 0b e8 24 fd ff ff e9 a9 fd ff ff 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 <48> f7 07 00 c0 00 00 55 48 89 e5 75 2a 8b 47 1c 85 c0 74 1e f0
    Signed-off-by: Andrea Arcangeli <>
    Signed-off-by: Paolo Bonzini <>
  6. @Pinglinux

    HID: wacom: fix an Oops caused by wacom_wac_finger_count_touches

    Pinglinux authored Jiri Kosina committed
    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: Tasos Sahanidis <>
    Signed-off-by: Ping Cheng <>
    Signed-off-by: Jiri Kosina <>
  7. @tiwai

    ALSA: hda - Disable widget power-saving for ALC292 & co

    tiwai 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: Jonathan McDowell <>
    Signed-off-by: Takashi Iwai <>
  8. @tiwai

    ALSA: hda - Reduce verbs by node power-saves

    tiwai 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
    [d545a57: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: Takashi Iwai <>
  9. @arndb @tiwai

    ALSA: sound/atmel/ac97c.c: remove unused variable

    arndb authored tiwai committed
    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: Arnd Bergmann <>
    Acked-by: Alexander Stein <>
    Signed-off-by: Takashi Iwai <>
Commits on May 19, 2015
  1. @dvrabel

    xen/events: don't bind non-percpu VIRQs with percpu chip

    dvrabel authored
    A non-percpu VIRQ (e.g., VIRQ_CONSOLE) may be freed on a different
    VCPU than it is bound to.  This can result in a race between
    handle_percpu_irq() and removing the action in __free_irq() because
    handle_percpu_irq() does not take desc->lock.  The interrupt handler
    sees a NULL action and oopses.
    Only use the percpu chip/handler for per-CPU VIRQs (like VIRQ_TIMER).
      # cat /proc/interrupts | grep virq
       40:      87246          0  xen-percpu-virq      timer0
       44:          0          0  xen-percpu-virq      debug0
       47:          0      20995  xen-percpu-virq      timer1
       51:          0          0  xen-percpu-virq      debug1
       69:          0          0   xen-dyn-virq      xen-pcpu
       74:          0          0   xen-dyn-virq      mce
       75:         29          0   xen-dyn-virq      hvc_console
    Signed-off-by: David Vrabel <>
    Cc: <>
  2. Merge tag 'nfs-for-4.1-2' of git://…

    Pull two NFS client bugfixes from Trond Myklebust:
     "Highlights include:
       - fix a Linux-4.1 regression affecting stat()
       - take an extra reference to fl->fl_file when running a setlk"
    * tag 'nfs-for-4.1-2' of git://
      nfs: take extra reference to fl->fl_file when running a setlk
      nfs: stat(2) fails during cthon04 basic test5 on NFSv4.0
  3. Merge tag 'powerpc-4.1-4' of git://…

    Pull powerpc fixes from Michael Ellerman:
     - THP/hugetlb fixes from Aneesh.
     - MCE fix from Daniel.
     - TOC fix from Anton.
    * tag 'powerpc-4.1-4' of git://
      powerpc: Align TOC to 256 bytes
      powerpc/mce: fix off by one errors in mce event handling
      powerpc/mm: Return NULL for not present hugetlb page
      powerpc/thp: Serialize pmd clear against a linux page table walk.
  4. Merge tag 'pwm/for-4.1-rc5' of git://…

    Pull pwm fix from Thierry Reding:
     "A single fix to make the Pistachio driver respect the limits imposed
      by hardware"
    * tag 'pwm/for-4.1-rc5' of git://
      pwm: img: Impose upper and lower timebase steps value
  5. watchdog: fix double lock in watchdog_nmi_enable_all

    Michal Hocko authored committed
    Commit ab992dc ("watchdog: Fix merge 'conflict'") has introduced an
    obvious deadlock because of a typo.  watchdog_proc_mutex should be
    unlocked on exit.
    Thanks to Miroslav Benes who was staring at the code with me and noticed
    Signed-off-by: Michal Hocko <>
    Duh-by: Peter Zijlstra <>
    Signed-off-by: Linus Torvalds <>
  6. @thierryreding

    pwm: img: Impose upper and lower timebase steps value

    Naidu Tellapati authored thierryreding committed
    The PWM hardware on Pistachio platform has a maximum timebase steps
    value to 255. To fix it, let's introduce a compatible-specific
    data structure to contain the SoC-specific details and use it to
    specify a maximum timebase.
    Also, let's limit the minimum timebase to 16 steps, to allow a sane
    range of duty cycle steps.
    Fixes: 277bb6a ("pwm: Imagination Technologies PWM DAC driver")
    Signed-off-by: Naidu Tellapati <>
    Signed-off-by: Ezequiel Garcia <>
    Signed-off-by: Thierry Reding <>
  7. @tiwai

    ALSA: usb-audio: Add quirk for MS LifeCam Studio

    tiwai authored
    Microsoft LifeCam Studio (045e:0772) needs a similar quirk for
    suppressing the wrong sample rate inquiry.
    Cc: <>
    Signed-off-by: Takashi Iwai <>
  8. s390/mm: correct return value of pmd_pfn

    Martin Schwidefsky authored
    Git commit 152125b
    "s390/mm: implement dirty bits for large segment table entries"
    broke the pmd_pfn function, it changed the return value from
    'unsigned long' to 'int'. This breaks all machine configurations
    with memory above the 8TB line.
    Cc: # 3.17+
    Signed-off-by: Martin Schwidefsky <>
  9. @korochen @tiwai

    ALSA: pcm: Modify double acknowledged interrupts check condition

    korochen authored tiwai committed
    Currently in snd_pcm_update_hw_ptr0 during interrupt,
    we consider there were double acknowledged interrupts when:
    1. HW reported pointer is smaller than expected, and
    2. Time from last update time (hdelta) is over half a buffer time.
    However, when HW reported pointer is only a few bytes smaller than
    expected, and when hdelta is just a little larger than half a buffer time
    (e.g. ping-pong buffer), it wrongly treats this IRQ as double acknowledged.
    The condition #2 uses jiffies, but jiffies is not high resolution
    since it is integer. We should consider jiffies inaccuracy.
    Signed-off-by: Koro Chen <>
    Signed-off-by: Takashi Iwai <>
  10. @jdelvare @groeck

    hwmon: Update the location of my quilt tree

    jdelvare authored groeck committed
    This new location was supposed to be temporary, but a couple years
    have elapsed and it's still there, so apparently it's there to stay.
    Signed-off-by: Jean Delvare <>
    Signed-off-by: Guenter Roeck <>
  11. @zhang-rui

    Merge branch 'fixes' of git://…

    zhang-rui authored
    …/evalenti/linux-soc-thermal into for-rc
Commits on May 18, 2015
  1. Linux 4.1-rc4

  2. watchdog: Fix merge 'conflict'

    Peter Zijlstra authored committed
    Two watchdog changes that came through different trees had a non
    conflicting conflict, that is, one changed the semantics of a variable
    but no actual code conflict happened. So the merge appeared fine, but
    the resulting code did not behave as expected.
    Commit 195daf6 ("watchdog: enable the new user interface of the
    watchdog mechanism") changes the semantics of watchdog_user_enabled,
    which thereafter is only used by the functions introduced by
    b3738d2 ("watchdog: Add watchdog enable/disable all functions").
    There further appears to be a distinct lack of serialization between
    setting and using watchdog_enabled, so perhaps we should wrap the
    {en,dis}able_all() things in watchdog_proc_mutex.
    This patch fixes a s2r failure reported by Michal; which I cannot
    readily explain. But this does make the code internally consistent
    Reported-and-tested-by: Michal Hocko <>
    Signed-off-by: Peter Zijlstra (Intel) <>
    Signed-off-by: Linus Torvalds <>
  3. Merge tag 'for-linus-20150516' of git://

    Pull MTD fixes from Brian Norris:
     "Two MTD fixes for 4.1:
       - readtest: the signal-handling code was clobbering the error codes
         we should be handling/reporting in this test, rendering it useless.
         Noticed by Coverity.
       - the common SPI NOR flash DT binding (merged for 4.1-rc1) is being
         revised, so let's change that before 4.1 is minted"
    * tag 'for-linus-20150516' of git://
      Documentation: dt: mtd: replace "nor-jedec" binding with "jedec, spi-nor"
      mtd: readtest: don't clobber error reports
  4. @dledford

    RDMA/ocrdma: Update ocrdma version number

    Selvin Xavier authored dledford committed
    Updating the driver version to
    Signed-off-by: Selvin Xavier <>
    Signed-off-by: Doug Ledford <>
Something went wrong with that request. Please try again.