1. 05 4月, 2016 7 次提交
  2. 02 4月, 2016 29 次提交
  3. 01 4月, 2016 4 次提交
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 6ddf37da
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Nothing too crazy in here: a bunch of AMD fixes/quirks, two msm fixes,
        some rockchip fixes, and a udl warning fix, along with one locking fix
        for displayport that seems to fix some dodgy monitors"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/udl: Use unlocked gem unreferencing
        drm/dp: move hw_mutex up the call stack
        drm/amdgpu: Don't move pinned BOs
        drm/radeon: Don't move pinned BOs
        drm/radeon: add a dpm quirk for all R7 370 parts
        drm/radeon: add another R7 370 quirk
        drm/rockchip: dw_hdmi: Don't call platform_set_drvdata()
        drm/rockchip: vop: Fix vop crtc cleanup
        drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path
        drm/rockchip: vop: Disable planes when disabling CRTC
        drm/rockchip: vop: Don't reject empty modesets
        drm/rockchip: cancel pending vblanks on close
        drm/rockchip: vop: fix crtc size in plane check
        drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5
        drm/amd: Beef up ACP Kconfig menu text
        drm/msm: fix typo in the !COMMON_CLK case
        drm/msm: fix bug after preclose removal
      6ddf37da
    • L
      Merge tag 'powerpc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 52bef0cb
      Linus Torvalds 提交于
      Pull powerpc fixes from Michael Ellerman:
       - Fixup preempt underflow with huge pages from Sebastian Siewior
       - Fix altivec SPR not being saved from Oliver O'Halloran
       - Correct used_vsr comment from Simon Guo
      
      * tag 'powerpc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc: Correct used_vsr comment
        powerpc/process: Fix altivec SPR not being saved
        powerpc/mm: Fixup preempt underflow with huge pages
      52bef0cb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · dc8a64ee
      Linus Torvalds 提交于
      Pull s390 fixes from Martin Schwidefsky:
       - A proper fix for the locking issue in the dasd driver
       - Wire up the new preadv2 nad pwritev2 system calls
       - Add the mark_rodata_ro function and set DEBUG_RODATA=y
       - A few more bug fixes.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: wire up preadv2/pwritev2 syscalls
        s390/pci: PCI function group 0 is valid for clp_query_pci_fn
        s390/crypto: provide correct file mode at device register.
        s390/mm: handle PTE-mapped tail pages in fast gup
        s390: add DEBUG_RODATA support
        s390: disable postinit-readonly for now
        s390/dasd: reorder lcu and device lock
        s390/cpum_sf: Fix cpu hotplug notifier transitions
        s390/cpum_cf: Fix missing cpu hotplug notifier transition
      dc8a64ee
    • T
      ALSA: timer: Use mod_timer() for rearming the system timer · 4a07083e
      Takashi Iwai 提交于
      ALSA system timer backend stops the timer via del_timer() without sync
      and leaves del_timer_sync() at the close instead.  This is because of
      the restriction by the design of ALSA timer: namely, the stop callback
      may be called from the timer handler, and calling the sync shall lead
      to a hangup.  However, this also triggers a kernel BUG() when the
      timer is rearmed immediately after stopping without sync:
       kernel BUG at kernel/time/timer.c:966!
       Call Trace:
        <IRQ>
        [<ffffffff8239c94e>] snd_timer_s_start+0x13e/0x1a0
        [<ffffffff8239e1f4>] snd_timer_interrupt+0x504/0xec0
        [<ffffffff8122fca0>] ? debug_check_no_locks_freed+0x290/0x290
        [<ffffffff8239ec64>] snd_timer_s_function+0xb4/0x120
        [<ffffffff81296b72>] call_timer_fn+0x162/0x520
        [<ffffffff81296add>] ? call_timer_fn+0xcd/0x520
        [<ffffffff8239ebb0>] ? snd_timer_interrupt+0xec0/0xec0
        ....
      
      It's the place where add_timer() checks the pending timer.  It's clear
      that this may happen after the immediate restart without sync in our
      cases.
      
      So, the workaround here is just to use mod_timer() instead of
      add_timer().  This looks like a band-aid fix, but it's a right move,
      as snd_timer_interrupt() takes care of the continuous rearm of timer.
      Reported-by: NJiri Slaby <jslaby@suse.cz>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      4a07083e