1. 18 Jul, 2015 2 commits
    • Linus Torvalds's avatar
      Merge tag 'rtc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · dfe91c97
      Linus Torvalds authored
      Pull rtc fixes from Alexandre Belloni:
       "A few fixes for the RTC susbsystem for 4.2.
      
        The mt6397 driver was introduce in 4.2 so it is worth fixing before
        the final release.  I though the compilation warning for armada38x was
        fixed by akpm in commit f98b733e ("rtc-armada38x.c: remove unused
        local `flags'") but he actually missed some occurrences of the
        variables.  Since I received 4 patches for that, I think we can
        include it now.
      
        Summary:
         - fix mt6397 wakealarm creation
         - remove a compilation warning for armada38x that was forgotten"
      
      * tag 'rtc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
        rtc: armada38x: Remove unused variable from armada38x_rtc_set_time()
        rtc: mt6397: enable wakeup before registering rtc device
      dfe91c97
    • Linus Torvalds's avatar
      Merge tag 'dm-4.2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 3f8476fe
      Linus Torvalds authored
      Pull device mapper fixes from Mike Snitzer:
      
       - revert a request-based DM core change that caused IO latency to
         increase and adversely impact both throughput and system load
      
       - fix for a use after free bug in DM core's device cleanup
      
       - a couple DM btree removal fixes (used by dm-thinp)
      
       - a DM thinp fix for order-5 allocation failure
      
       - a DM thinp fix to not degrade to read-only metadata mode when in
         out-of-data-space mode for longer than the 'no_space_timeout'
      
       - fix a long-standing oversight in both dm-thinp and dm-cache by now
         exporting 'needs_check' in status if it was set in metadata
      
       - fix an embarrassing dm-cache busy-loop that caused worker threads to
         eat cpu even if no IO was actively being issued to the cache device
      
      * tag 'dm-4.2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm cache: avoid calls to prealloc_free_structs() if possible
        dm cache: avoid preallocation if no work in writeback_some_dirty_blocks()
        dm cache: do not wake_worker() in free_migration()
        dm cache: display 'needs_check' in status if it is set
        dm thin: display 'needs_check' in status if it is set
        dm thin: stay in out-of-data-space mode once no_space_timeout expires
        dm: fix use after free crash due to incorrect cleanup sequence
        Revert "dm: only run the queue on completion if congested or no requests pending"
        dm btree: silence lockdep lock inversion in dm_btree_del()
        dm thin: allocate the cell_sort_array dynamically
        dm btree remove: fix bug in redistribute3
      3f8476fe
  2. 17 Jul, 2015 18 commits
    • Fabio Estevam's avatar
      rtc: armada38x: Remove unused variable from armada38x_rtc_set_time() · d80238bb
      Fabio Estevam authored
      Remove the 'flags' variable in order to fix the following warning:
      
      drivers/rtc/rtc-armada38x.c:91:22: warning: unused variable 'flags' [-Wunused-variable]
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      d80238bb
    • Wei-Ning Huang's avatar
      rtc: mt6397: enable wakeup before registering rtc device · baeca449
      Wei-Ning Huang authored
      rtc_sysfs_add_device checks if device can wakeup before creating the
      wakealarm file in sysfs. Thus the driver must set wakeup capability
      before registering the rtc device.
      Signed-off-by: default avatarWei-Ning Huang <wnhuang@google.com>
      Acked-by: default avatarEddie Huang <eddie.huang@mediatek.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      baeca449
    • Linus Torvalds's avatar
      Merge tag 'staging-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · eb254374
      Linus Torvalds authored
      Pull staging and IIO driver fixes from Greg KH:
       "Here's some staging and IIO driver fixes for 4.2-rc3.
      
        Nothing major, the majority are IIO issues that were reported, with a
        few other minor staging driver fixes.  All have been in linux-next for
        a while with no reported issues"
      
      * tag 'staging-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (25 commits)
        staging: vt6656: check ieee80211_bss_conf bssid not NULL
        staging: vt6655: check ieee80211_bss_conf bssid not NULL
        staging:lustre: remove irq.h from socklnd.h
        staging: make board support depend on OF_IRQ and CLKDEV_LOOKUP
        iio: tmp006: Check channel info on write
        iio: sx9500: Add missing init in sx9500_buffer_pre{en,dis}able()
        iio:light:ltr501: fix regmap dependency
        iio:light:ltr501: fix variable in ltr501_init
        iio: sx9500: fix bug in compensation code
        iio: sx9500: rework error handling of raw readings
        iio: magnetometer: mmc35240: fix available sampling frequencies
        iio:light:stk3310: Fix REGMAP_I2C dependency
        iio: light: STK3310: un-invert proximity values
        iio:adc:cc10001_adc: fix Kconfig dependency
        iio: light: tcs3414: Fix bug preventing to set integration time
        iio:accel:bmc150-accel: fix counting direction
        iio:light:cm3323: clear bitmask before set
        iio: adc: at91_adc: allow to use full range of startup time
        iio: DAC: ad5624r_spi: fix bit shift of output data value
        iio: proximity: sx9500: Fix proximity value
        ...
      eb254374
    • Linus Torvalds's avatar
      Merge tag 'usb-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 2b3eb6e3
      Linus Torvalds authored
      Pull USB driver fixes from Greg KH:
       "Here's some USB driver fixes for 4.2-rc3.
      
        The ususal number of gadget driver fixes are in here, along with some
        new device ids and a build fix for the mn10300 arch which required
        some symbols to be renamed in the mos7720 driver.
      
        All have been in linux-next for a while with no reported issues"
      
      * tag 'usb-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: serial: Destroy serial_minors IDR on module exit
        usb: gadget: f_midi: fix error recovery path
        usb: phy: mxs: suspend to RAM causes NULL pointer dereference
        usb: gadget: udc: fix free_irq() after request_irq() failed
        usb: gadget: composite: Fix NULL pointer dereference
        usb: gadget: f_fs: do not set cancel function on synchronous {read,write}
        usb: f_mass_storage: limit number of reported LUNs
        usb: dwc3: core: avoid NULL pointer dereference
        usb: dwc2: embed storage for reg backup in struct dwc2_hsotg
        usb: dwc2: host: allocate qtd before atomic enqueue
        usb: dwc2: host: allocate qh before atomic enqueue
        usb: musb: host: rely on port_mode to call musb_start()
        USB: cp210x: add ID for Aruba Networks controllers
        USB: mos7720: rename registers
        USB: option: add 2020:4000 ID
      2b3eb6e3
    • Linus Torvalds's avatar
      Merge tag 'sound-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 1ea2a01c
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "There are two small fixes for HD-audio and USB LINE6, and the rest are
        a few new quirks and device ID addition that are good enough to get
        into 4.2"
      
      * tag 'sound-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda/realtek: Enable HP amp and mute LED on HP Folio 9480m [v3]
        ALSA: line6: Fix -EBUSY error during active monitoring
        ALSA: hda - Fix a wrong busy check in alt PCM open
        ALSA: hda - add codec ID for Broxton display audio codec
        ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4
      1ea2a01c
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 9bca4df2
      Linus Torvalds authored
      Pull GPIO fixes from Linus Walleij:
       "This is a first set of GPIO fixes for the v4.2 series, all hitting
        individual drivers and nothing else (except for a documentation
        oneliner.  I intended to send a request earlier but life intervened)"
      
      * tag 'gpio-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: pca953x: fix nested irqs rescheduling
        gpio: omap: prevent module from being unloaded while in use
        gpio: max732x: Add missing dev reference to gpiochip
        gpio/xilinx: Use correct address when setting initial values.
        gpio: zynq: Fix problem with unbalanced pm_runtime_enable
        gpio: omap: add missed spin_unlock_irqrestore in omap_gpio_irq_type
        gpio: brcmstb: fix null ptr dereference in driver remove
        gpio: Remove double "base" in comment
      9bca4df2
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · e05bf4f3
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Fixes all over the place.
      
        The rockchip and imx fixes I missed while on holidays, so I've queued
        them now which makes this a bit bigger.
      
        The rest is misc amdgpu, radeon, i915 and armada.
      
        I think the most important thing is the ioctl fix, we dropped the
        avoid compat ball, so we get to add a compat wrapper.
      
        There is also an i915 revert to avoid a regression with existing
        userspace"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (43 commits)
        drm/ttm: improve uncached page deallocation.
        drm/ttm: fix uncached page deallocation to properly fill page pool v3.
        drm/amdgpu/dce8: Re-set VBLANK interrupt state when enabling a CRTC
        drm/radeon/ci: silence a harmless PCC warning
        drm/amdgpu/cz: silence some dpm debug output
        drm/amdgpu/cz: store the forced dpm level
        drm/amdgpu/cz: unforce dpm levels before forcing to low/high
        drm/amdgpu: remove bogus check in gfx8 rb setup
        drm/amdgpu: set proper index/data pair for smc regs on CZ (v2)
        drm/amdgpu: disable the IP module if early_init returns -ENOENT (v2)
        drm/amdgpu: stop context leak in the error path
        drm/amdgpu: validate the context id in the dependencies
        drm/radeon: fix user ptr race condition
        drm/radeon: Don't flush the GART TLB if rdev->gart.ptr == NULL
        drm/radeon: add a dpm quirk for Sapphire Radeon R9 270X 2GB GDDR5
        drm/armada: avoid saving the adjusted mode to crtc->mode
        drm/armada: fix overlay when partially off-screen
        drm/armada: convert overlay to use drm_plane_helper_check_update()
        drm/armada: fix gem object free after failed prime import
        drm/armada: fix incorrect overlay plane cleanup
        ...
      e05bf4f3
    • Jérôme Glisse's avatar
      drm/ttm: improve uncached page deallocation. · e9308884
      Jérôme Glisse authored
      Calls to set_memory_wb() incure heavy TLB flush and IPI cost. To
      minimize those wait until pool grow beyond batch size before
      draining the pool.
      Signed-off-by: default avatarJérôme Glisse <jglisse@redhat.com>
      Reviewed-by: default avatarMario Kleiner <mario.kleiner.de@gmail.com>
      Reviewed-and-Tested-by: default avatarMichel Dänzer <michel@daenzer.net>
      Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Thomas Hellstrom <thellstrom@vmware.com>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e9308884
    • Jérôme Glisse's avatar
      drm/ttm: fix uncached page deallocation to properly fill page pool v3. · ef2b7317
      Jérôme Glisse authored
      Current code never allowed the page pool to actualy fill in anyway.
      This fix it, so that we only start freeing page from the pool when
      we go over the pool size.
      
      Changed since v1:
        - Move the page batching optimization to its separate patch.
      
      Changed since v2:
        - Do not remove code part of the batching optimization with
          this patch.
        - Better commit message.
      Signed-off-by: default avatarJérôme Glisse <jglisse@redhat.com>
      Reviewed-by: default avatarMario Kleiner <mario.kleiner.de@gmail.com>
      Reviewed-and-Tested-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
      Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Thomas Hellstrom <thellstrom@vmware.com>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      ef2b7317
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 21bdb584
      Linus Torvalds authored
      Pull power management and ACPI fixes from Rafael Wysocki:
       "These fix two bugs in the cpufreq core (including one recent
        regression), fix a 4.0 PCI regression related to the ACPI resources
        management and quieten an RCU-related lockdep complaint about a
        tracepoint in the suspend-to-idle code.
      
        Specifics:
      
         - Fix a recently introduced issue in the cpufreq policy object
           reinitialization that leads to CPU offline/online breakage (Viresh
           Kumar)
      
         - Make it possible to access frequency tables of offline CPUs which
           is needed by thermal management code among other things (Viresh
           Kumar)
      
         - Fix an ACPI resource management regression introduced during the
           4.0 cycle that may cause incorrect resource validation results to
           appear in 32-bit x86 kernels due to silent truncation of 64-bit
           values to 32-bit (Jiang Liu)
      
         - Fix up an RCU-related lockdep complaint about suspicious RCU usage
           in idle caused by using a suspend tracepoint in the core suspend-
           to-idle code (Rafael J Wysocki)"
      
      * tag 'pm+acpi-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / PCI: Fix regressions caused by resource_size_t overflow with 32-bit kernel
        cpufreq: Allow freq_table to be obtained for offline CPUs
        cpufreq: Initialize the governor again while restoring policy
        suspend-to-idle: Prevent RCU from complaining about tick_freeze()
      21bdb584
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.2-3' of... · 3e87ee06
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.2-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver fixes from Darren Hart:
       "Fix SMBIOS call handling and hwswitch state coherency in the
        dell-laptop driver.  Cleanups for intel_*_ipc drivers.  Details:
      
        dell-laptop:
         - Do not cache hwswitch state
         - Check return value of each SMBIOS call
         - Clear buffer before each SMBIOS call
      
        intel_scu_ipc:
         - Move local memory initialization out of a mutex
      
        intel_pmc_ipc:
         - Update kerneldoc formatting
         - Fix compiler casting warnings"
      
      * tag 'platform-drivers-x86-v4.2-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        intel_scu_ipc: move local memory initialization out of a mutex
        intel_pmc_ipc: Update kerneldoc formatting
        dell-laptop: Do not cache hwswitch state
        dell-laptop: Check return value of each SMBIOS call
        dell-laptop: Clear buffer before each SMBIOS call
        intel_pmc_ipc: Fix compiler casting warnings
      3e87ee06
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · f85c7124
      Linus Torvalds authored
      Pull m68knommu/coldfire fixes from Greg Ungerer:
       "Contains build fixes and updates for the ColdFire defconfigs.
      
        Specifically there is a couple of fixes that address problems building
        allnoconfig.  Also fix for enabling PCI bus on the M54xx family of
        ColdFire"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k: enable PCI support for m5475evb defconfig
        m68k: fix io functions for ColdFire/MMU/PCI case
        m68knommu: update defconfig for ColdFire m5475evb
        m68knommu: update defconfig for ColdFire m5407c3
        m68knommu: update defconfig for ColdFire m5307c3
        m68knommu: update defconfig for ColdFire m5275evb
        m68knommu: update defconfig for ColdFire m5272c3
        m68knommu: update defconfig for ColdFire m5249evb
        m68knommu: update defconfig for m5208evb
        m68knommu: make ColdFire SoC selection a choice
        m68knommu: improve the clock configuration defaults
        m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire
      f85c7124
    • Mike Snitzer's avatar
      dm cache: avoid calls to prealloc_free_structs() if possible · 665022d7
      Mike Snitzer authored
      If no work was performed then prealloc_data_structs() wasn't ever called
      so there isn't any need to call prealloc_free_structs().
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      665022d7
    • Mike Snitzer's avatar
      dm cache: avoid preallocation if no work in writeback_some_dirty_blocks() · e782eff5
      Mike Snitzer authored
      Refactor writeback_some_dirty_blocks() to avoid prealloc_data_structs()
      if the policy doesn't have any dirty blocks ready for writeback.
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      e782eff5
    • Mike Snitzer's avatar
      dm cache: do not wake_worker() in free_migration() · 386cb7cd
      Mike Snitzer authored
      All methods that queue work call wake_worker() as you'd expect.
      E.g. cell_defer, defer_bio, quiesce_migration (which is called by
      writeback, promote, demote_then_promote, invalidate, discard, etc).
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      386cb7cd
    • Dave Airlie's avatar
      Merge branch 'drm-rockchip-2015-07-13' of... · aaab3bba
      Dave Airlie authored
      Merge branch 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes
      
      misc rockchip fixes.
      
      * 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-drm-rockchip:
        drm/rockchip: vop: remove hardware cursor window
        drm/rockchip: vop: switch cursor plane to window 3
        drm/rockchip: Drop owner assignment from platform_driver
        drm/rockchip: use drm_gem_mmap helpers
        drm/rockchip: only call drm_fb_helper_hotplug_event if fb_helper present
        drm/rockchip: Add BGR formats to VOP
      aaab3bba
    • Dave Airlie's avatar
      Merge tag 'imx-drm-fixes-2015-07-14' of git://git.pengutronix.de/git/pza/linux into drm-fixes · e1e50e1e
      Dave Airlie authored
      imx-drm: fixes for parallel-display, imx-tve, and ipu-common
      
      These patches fix the parallel-display driver to use the standard OF
      graph bindings for connecting a drm_panel via device tree instead of
      an undocumented, driver specific device tree property, take care to
      disable all IPU interrupts before setting up the irq chip to fix a
      kexec lockup, and fix VGA output on i.MX53-QSB boards by correcting
      the media bus format set by the imx-tve driver.
      
      * tag 'imx-drm-fixes-2015-07-14' of git://git.pengutronix.de/git/pza/linux:
        drm/imx: tve: fix media bus format for VGA output
        GPU: ipu: fix lockup caused by pending chained interrupts
        drm/imx: parallel-display: fix drm_panel support
      e1e50e1e
    • Dave Airlie's avatar
      Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-fixes · 8f6644ca
      Dave Airlie authored
      A range of fixes for the Armada DRM driver:
      - A missing wakeup could result in overlay frames being delayed, causing
        video playback to hiccup.
      - Avoid unmapping a dma-buf attachment which was never mapped
      - Fix the overlay when partially off the screen by switching to the
        drm_plane_helper_check_update() helper and using the calculated
        coordinates to set the start address.
      - Remove an incorrect assignment to crtc->mode - which should be the
        unadjusted mode.
      - Fix a missing call to drm_plane_cleanup() in the overlay code.
      
      * 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm/armada: avoid saving the adjusted mode to crtc->mode
        drm/armada: fix overlay when partially off-screen
        drm/armada: convert overlay to use drm_plane_helper_check_update()
        drm/armada: fix gem object free after failed prime import
        drm/armada: fix incorrect overlay plane cleanup
        drm/armada: fix missing overlay wake-up
      8f6644ca
  3. 16 Jul, 2015 20 commits