1. 18 7月, 2015 9 次提交
    • L
      Merge tag 'rtc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · dfe91c97
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'dm-4.2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 3f8476fe
      Linus Torvalds 提交于
      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
    • F
      rtc: armada38x: Remove unused variable from armada38x_rtc_set_time() · d80238bb
      Fabio Estevam 提交于
      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: NFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: NAlexandre Belloni <alexandre.belloni@free-electrons.com>
      d80238bb
    • W
      rtc: mt6397: enable wakeup before registering rtc device · baeca449
      Wei-Ning Huang 提交于
      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: NWei-Ning Huang <wnhuang@google.com>
      Acked-by: NEddie Huang <eddie.huang@mediatek.com>
      Signed-off-by: NAlexandre Belloni <alexandre.belloni@free-electrons.com>
      baeca449
    • L
      Merge tag 'staging-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · eb254374
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'usb-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 2b3eb6e3
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'sound-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 1ea2a01c
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'gpio-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 9bca4df2
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · e05bf4f3
      Linus Torvalds 提交于
      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
  2. 17 7月, 2015 30 次提交
  3. 16 7月, 2015 1 次提交