Skip to content
  1. Feb 06, 2016
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 5d6a6a75
      Linus Torvalds authored
      Pull Ceph fixes from Sage Weil:
       "We have a few wire protocol compatibility fixes, ports of a few recent
        CRUSH mapping changes, and a couple error path fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        libceph: MOSDOpReply v7 encoding
        libceph: advertise support for TUNABLES5
        crush: decode and initialize chooseleaf_stable
        crush: add chooseleaf_stable tunable
        crush: ensure take bucket value is valid
        crush: ensure bucket id is valid before indexing buckets array
        ceph: fix snap context leak in error path
        ceph: checking for IS_ERR instead of NULL
      5d6a6a75
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 9b108828
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Fixes all over the place:
      
         - amdkfd: two static checker fixes
         - mst: a bunch of static checker and spec/hw interaction fixes
         - amdgpu: fix Iceland hw properly, and some fiji bugs, along with
           some write-combining fixes.
         - exynos: some regression fixes
         - adv7511: fix some EDID reading issues"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (38 commits)
        drm/dp/mst: deallocate payload on port destruction
        drm/dp/mst: Reverse order of MST enable and clearing VC payload table.
        drm/dp/mst: move GUID storage from mgr, port to only mst branch
        drm/dp/mst: change MST detection scheme
        drm/dp/mst: Calculate MST PBN with 31.32 fixed point
        drm: Add drm_fixp_from_fraction and drm_fixp2int_ceil
        drm/mst: Add range check for max_payloads during init
        drm/mst: Don't ignore the MST PBN self-test result
        drm: fix missing reference counting decrease
        drm/amdgpu: disable uvd and vce clockgating on Fiji
        drm/amdgpu: remove exp hardware support from iceland
        drm/amdgpu: load MEC ucode manually on iceland
        drm/amdgpu: don't load MEC2 on topaz
        drm/amdgpu: drop topaz support from gmc8 module
        drm/amdgpu: pull topaz gmc bits into gmc_v7
        drm/amdgpu: The VI specific EXE bit should only apply to GMC v8.0 above
        drm/amdgpu: iceland use CI based MC IP
        drm/amdgpu: move gmc7 support out of CIK dependency
        drm/amdgpu/gfx7: enable cp inst/reg error interrupts
        drm/amdgpu/gfx8: enable cp inst/reg error interrupts
        ...
      9b108828
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 22f60701
      Linus Torvalds authored
      Pull power management and ACPI fixes from Rafael Wysocki:
       "These are: a fix for a recently introduced false-positive warnings
        about PM domain pointers being changed inappropriately (harmless but
        annoying), an MCH size workaround quirk for one more platform, a
        compiler warning fix (generic power domains framework), an ACPI LPSS
        (Intel SoCs) driver fixup and a cleanup of the ACPI CPPC core code.
      
        Specifics:
      
         - PM core fix to avoid false-positive warnings generated when the
           pm_domain field is cleared for a device that appears to be bound to
           a driver (Rafael Wysocki).
      
         - New MCH size workaround quirk for Intel Haswell-ULT (Josh Boyer).
      
         - Fix for an "unused function" compiler warning in the generic power
           domains framework (Ulf Hansson).
      
         - Fixup for the ACPI driver for Intel SoCs (acpi-lpss) to set the PM
           domain pointer of a device properly in one place that was
           overlooked by a recent PM core update (Andy Shevchenko).
      
         - Removal of a redundant function declaration in the ACPI CPPC core
           code (Timur Tabi)"
      
      * tag 'pm+acpi-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM: Avoid false-positive warnings in dev_pm_domain_set()
        PM / Domains: Silence compiler warning for an unused function
        ACPI / CPPC: remove redundant mbox_send_message() declaration
        ACPI / LPSS: set PM domain via helper setter
        PNP: Add Haswell-ULT to Intel MCH size workaround
      22f60701
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-core' and 'pm-domains' · 79e2f8dd
      Rafael J. Wysocki authored
      * pm-core:
        PM: Avoid false-positive warnings in dev_pm_domain_set()
        ACPI / LPSS: set PM domain via helper setter
      
      * pm-domains:
        PM / Domains: Silence compiler warning for an unused function
      79e2f8dd
    • Rafael J. Wysocki's avatar
      Merge branches 'pnp' and 'acpi-cppc' · 92982304
      Rafael J. Wysocki authored
      * pnp:
        PNP: Add Haswell-ULT to Intel MCH size workaround
      
      * acpi-cppc:
        ACPI / CPPC: remove redundant mbox_send_message() declaration
      92982304
    • Linus Torvalds's avatar
      Merge tag 'media/v4.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · dd6f86af
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       - vb2: fix a vb2_thread regression and DVB read() breakages
       - vsp1: fix compilation and links creation
       - s5k6a3: Fix VIDIOC_SUBDEV_G_FMT ioctl for TRY format
       - exynos4-is: fix a build issue, format negotiation and sensor detection
       - Fix a regression with pvrusb2 and ir-kbd-i2c
       - atmel-isi: fix debug message which only show the first format
       - tda1004x: fix a tuning bug if G_PROPERTY is called too early
       - saa7134-alsa: fix a bug at device unbinding/driver removal
       - Fix build of one driver if !HAS_DMA
       - soc_camera: cleanup control device on async_unbind
      
      * tag 'media/v4.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] saa7134-alsa: Only frees registered sound cards
        [media] vb2-core: call threadio->fnc() if !VB2_BUF_STATE_ERROR
        [media] vb2: fix nasty vb2_thread regression
        [media] tda1004x: only update the frontend properties if locked
        [media] media: i2c: Don't export ir-kbd-i2c module alias
        [media] exynos4-is: make VIDEO_SAMSUNG_EXYNOS4_IS tristate
        [media] media: Kconfig: add dependency of HAS_DMA
        [media] exynos4-is: Wait for 100us before opening sensor
        [media] exynos4-is: Open shouldn't fail when sensor entity is not linked
        [media] s5k6a3: Fix VIDIOC_SUBDEV_G_FMT ioctl for TRY format
        [media] exynos4-is: fix a format string bug
        [media] drivers/media: vsp1_video: fix compile error
        [media] atmel-isi: fix debug message which only show the first format
        [media] soc_camera: cleanup control device on async_unbind
        [media] v4l: vsp1: Fix wrong entities links creation
      dd6f86af
    • Linus Torvalds's avatar
      Merge tag 'sound-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ea5a273c
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This was a busy week and I had to prepare a pile of duct tapes for the
        bugs reported by syzkaller fuzzer in wide range of ALSA core APIs:
        timer, rawmidi, sequencer, and PCM OSS emulation.  Let's see how many
        other holes we need to plug.
      
        Besides that, a few usual boring stuff, HD- and USB-audio quirks, have
        been added"
      
      * tag 'sound-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: timer: Fix leftover link at closing
        ALSA: seq: Fix lockdep warnings due to double mutex locks
        ALSA: rawmidi: Fix race at copying & updating the position
        ALSA: rawmidi: Make snd_rawmidi_transmit() race-free
        ALSA: hda - Add fixup for Mac Mini 7,1 model
        ALSA: hda/realtek - Support headset mode for ALC225
        ALSA: hda/realtek - Support Dell headset mode for ALC225
        ALSA: hda/realtek - New codec support of ALC225
        ALSA: timer: Sync timer deletion at closing the system timer
        ALSA: timer: Fix link corruption due to double start or stop
        ALSA: seq: Fix yet another races among ALSA timer accesses
        ALSA: pcm: Fix potential deadlock in OSS emulation
        ALSA: rawmidi: Remove kernel WARNING for NULL user-space buffer check
        ALSA: seq: Fix race at closing in virmidi driver
        ALSA: emu10k1: correctly handling failed thread creation
        ALSA: usb-audio: Add quirk for Microsoft LifeCam HD-6000
        ALSA: usb-audio: Add native DSD support for PS Audio NuWave DAC
        ALSA: usb-audio: Fix OPPO HA-1 vendor ID
      ea5a273c
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · ed1741b7
      Linus Torvalds authored
      Pull watchdog fixes from Wim Van Sebroeck:
       "This fixes several Kconfig dependencies, a compilation warning in
        pcwd_usb, a failure to abort the sp805 wdt after a ping and the
        max63xx wdt's MODULE_LICENSE"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: Fix dependencies for !HAS_IOMEM archs
        watchdog: imgdpc: select WATCHDOG_CORE
        watchdog: tango: rename ARCH_TANGOX to ARCH_TANGO
        watchdog: pcwd_usb: fix compilation warning
        watchdog: sp805: ping fails to abort wdt reset
        watchdog: max63xx: make module's license marker match the header
      ed1741b7
  2. Feb 05, 2016
  3. Feb 04, 2016
    • Mauro Carvalho Chehab's avatar
      [media] vb2-core: call threadio->fnc() if !VB2_BUF_STATE_ERROR · 1f2c4501
      Mauro Carvalho Chehab authored
      changeset 70433a15
      
       ("media: videobuf2: Refactor vb2_fileio_data
      and vb2_thread") broke videobuf2-dvb.
      
      The root cause is that, instead of calling threadio->fnc() for
      all types of events except for VB2_BUF_STATE_ERROR, it was calling
      it only for VB2_BUF_STATE_DONE.
      
      With that, the DVB thread were never called.
      
      Cc: stable@vger.kernel.org # Kernel >= 4.3
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
      1f2c4501
    • Hans Verkuil's avatar
      [media] vb2: fix nasty vb2_thread regression · fac710e4
      Hans Verkuil authored
      The vb2_thread implementation was made generic and was moved from
      videobuf2-v4l2.c to videobuf2-core.c in commit af3bac1a
      
      . Unfortunately
      that clearly was never tested since it broke read() causing NULL address
      references.
      
      The root cause was confused handling of vb2_buffer vs v4l2_buffer (the pb
      pointer in various core functions).
      
      The v4l2_buffer no longer exists after moving the code into the core and
      it is no longer needed. However, the vb2_thread code passed a pointer to
      a vb2_buffer to the core functions were a v4l2_buffer pointer was expected
      and vb2_thread expected that the vb2_buffer fields would be filled in
      correctly.
      
      This is obviously wrong since v4l2_buffer != vb2_buffer. Note that the
      pb pointer is a void pointer, so no type-checking took place.
      
      This patch fixes this problem:
      
      1) allow pb to be NULL for vb2_core_(d)qbuf. The vb2_thread code will use
         a NULL pointer here since they don't care about v4l2_buffer anyway.
      2) let vb2_core_dqbuf pass back the index of the received buffer. This is
         all vb2_thread needs: this index is the index into the q->bufs array
         and vb2_thread just gets the vb2_buffer from there.
      3) the fileio->b pointer (that originally contained a v4l2_buffer) is
         removed altogether since it is no longer needed.
      
      Tested with vivid and the cobalt driver.
      
      Cc: stable@vger.kernel.org # Kernel >= 4.3
      Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
      Reported-by: default avatarMatthias Schwarzott <zzam@gentoo.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
      fac710e4
    • Mauro Carvalho Chehab's avatar
      [media] tda1004x: only update the frontend properties if locked · e8beb023
      Mauro Carvalho Chehab authored
      
      
      The tda1004x was updating the properties cache before locking.
      If the device is not locked, the data at the registers are just
      random values with no real meaning.
      
      This caused the driver to fail with libdvbv5, as such library
      calls GET_PROPERTY from time to time, in order to return the
      DVB stats.
      
      Tested with a saa7134 card 78:
      	ASUSTeK P7131 Dual, vendor PCI ID: 1043:4862
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
      e8beb023
    • Shaohua Li's avatar
      9ea06415