Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 30, 2015
  1. Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/ke…

    authored
    …rnel/git/tj/libata
    
    Pull libata fixes from Tejun Heo:
     "Nothing exciting.  Two patches to update queued trim blacklist"
    
    * 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
      libata: Blacklist queued TRIM on Samsung SSD 850 Pro
      libata: Update Crucial/Micron blacklist
  2. Merge tag 'gpio-v4.0-3' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/linusw/linux-gpio
    
    Pull late GPIO fixes from Linus Walleij:
     "Here are the (hopefully) last GPIO fixes for v4.0.  Nothing
      controversial whatsoever, just fixes:
    
       - syscon GPIO fix for Keystone DSP GPIOs
    
       - pin number translation fix for ACPI GPIO
    
       - a smallish compiler warning fix on the mpc8xxx driver"
    
    * tag 'gpio-v4.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
      gpio: syscon: reduce message level when direction reg offset not in dt
      gpiolib: translate pin number in GPIO ACPI callbacks
      gpio: mpc8xxx: remove __initdata annotation for mpc8xxx_gpio_ids[]
Commits on Mar 28, 2015
  1. Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/sc…

    authored
    …m/linux/kernel/git/tip/tip
    
    Pull timer fixes from Ingo Molnar:
     "Two clocksource driver fixes, and an idle loop RCU warning fix"
    
    * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      clocksource/drivers/sun5i: Fix cpufreq interaction with sched_clock()
      clocksource/drivers: Fix various !CONFIG_HAS_IOMEM build errors
      timers/tick/broadcast-hrtimer: Fix suspicious RCU usage in idle loop
Commits on Mar 27, 2015
  1. libata: Blacklist queued TRIM on Samsung SSD 850 Pro

    Martin K. Petersen authored Tejun Heo committed
    Blacklist queued TRIM on this drive for now.
    
    Reported-by: Stefan Keller <linux-list@zahlenfresser.de>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    CC: stable@vger.kernel.org
    Signed-off-by: Tejun Heo <tj@kernel.org>
  2. libata: Update Crucial/Micron blacklist

    Martin K. Petersen authored Tejun Heo committed
    Micron has released an updated firmware (MU02) for M510/M550/MX100
    drives to fix the issues with queued TRIM. Queued TRIM remains broken on
    M500 but is working fine on later drives such as M600 and MX200.
    
    Tweak our blacklist to reflect the above.
    
    Link: https://bugzilla.kernel.org/show_bug.cgi?id=71371
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Tejun Heo <tj@kernel.org>
  3. @grygoriyS @linusw

    gpio: syscon: reduce message level when direction reg offset not in dt

    grygoriyS authored linusw committed
    Now GPIO syscon driver produces bunch of warnings during the
    boot of Kesytone 2 SoCs:
     gpio-syscon soc:keystone_dsp_gpio@02620240: can't read the dir register offset!
     gpio-syscon soc:keystone_dsp_gpio@2620244: can't read the dir register offset!
    
    This message unintentionally was added using dev_err(), but its
    actual log level is debug, because third cell of "ti,syscon-dev" is
    optional.
    
    Hence change it to dev_dbg() as it should be.
    
    This patch fixes commit:
     5a3e3f8 ("gpio: syscon: retriave syscon node and regs offsets from dt")
    
    Reported-by: Russell King <linux@arm.linux.org.uk>
    Tested-by: Murali Karicheri <m-karicheri2@ti.com>
    Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
    Signed-off-by: Grygorii Strashko <grygorii.strashko@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  4. @jahogan

    watchdog: imgpdc: Fix default heartbeat

    jahogan authored Wim Van Sebroeck committed
    The IMG PDC watchdog driver heartbeat module parameter has no default so
    it is initialised to zero. This results in the following warning during
    probe:
    
    imgpdc-wdt 2006000.wdt: Initial timeout out of range! setting max timeout
    
    The module parameter description implies that the default value should
    be PDC_WDT_DEF_TIMEOUT, which isn't yet used, so initialise it to that.
    
    Also tweak the heartbeat module parameter description for consistency.
    
    Fixes: 9393766 ("watchdog: ImgTec PDC Watchdog Timer Driver")
    Signed-off-by: James Hogan <james.hogan@imgtec.com>
    Cc: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
    Cc: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
    Cc: Jude Abraham <Jude.Abraham@imgtec.com>
    Cc: linux-watchdog@vger.kernel.org
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  5. @jahogan

    watchdog: imgpdc: Fix probe NULL pointer dereference

    jahogan authored Wim Van Sebroeck committed
    The IMG PDC watchdog probe function calls pdc_wdt_stop() prior to
    watchdog_set_drvdata(), causing a NULL pointer dereference when
    pdc_wdt_stop() retrieves the struct pdc_wdt_dev pointer using
    watchdog_get_drvdata() and reads the register base address through it.
    
    Fix by moving the watchdog_set_drvdata() call earlier, to where various
    other pdc_wdt->wdt_dev fields are initialised.
    
    Fixes: 9393766 ("watchdog: ImgTec PDC Watchdog Timer Driver")
    Signed-off-by: James Hogan <james.hogan@imgtec.com>
    Cc: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
    Cc: Naidu Tellapati <Naidu.Tellapati@imgtec.com>
    Cc: Jude Abraham <Jude.Abraham@imgtec.com>
    Cc: linux-watchdog@vger.kernel.org
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  6. watchdog: mtk_wdt: signedness bug in mtk_wdt_start()

    Dan Carpenter authored Wim Van Sebroeck committed
    "ret" should be signed for the error handling to work correctly.  This
    doesn't matter much in real life since mtk_wdt_set_timeout() always
    succeeds.
    
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Commits on Mar 26, 2015
  1. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    authored
    Pull drm refcounting fixes from Dave Airlie:
     "Here is the complete set of i915 bug/warn/refcounting fixes"
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/i915: Fixup legacy plane->crtc link for initial fb config
      drm/i915: Fix atomic state when reusing the firmware fb
      drm/i915: Keep ring->active_list and ring->requests_list consistent
      drm/i915: Don't try to reference the fb in get_initial_plane_config()
      drm: Fixup racy refcounting in plane_force_disable
  2. Merge tag 'dm-4.0-fix-2' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/device-mapper/linux-dm
    
    Pull device mapper fix from Mike Snitzer:
     "Fix DM core device cleanup regression -- due to a latent race that was
      exposed by the bdi changes that were introduced during the 4.0 merge"
    
    * tag 'dm-4.0-fix-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
      dm: fix add_disk() NULL pointer due to race with free_dev()
  3. @danvet @jnikula

    drm/i915: Fixup legacy plane->crtc link for initial fb config

    danvet authored jnikula committed
    This is a very similar bug in the load detect code fixed in
    
    commit 9128b04
    Author: Daniel Vetter <daniel.vetter@ffwll.ch>
    Date:   Tue Mar 3 17:31:21 2015 +0100
    
        drm/i915: Fix modeset state confusion in the load detect code
    
    But this time around it was the initial fb code that forgot to update
    the plane->crtc pointer. Otherwise it's the exact same bug, with the
    exact same restrains (any set_config call/ioctl that doesn't disable
    the pipe papers over the bug for free, so fairly hard to hit in normal
    testing). So if you want the full explanation just go read that one
    over there - it's rather long ...
    
    Cc: Matt Roper <matthew.d.roper@intel.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: Josh Boyer <jwboyer@fedoraproject.org>
    Cc: Jani Nikula <jani.nikula@linux.intel.com>
    Reported-and-tested-by: Josh Boyer <jwboyer@fedoraproject.org>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    [Jani: backported to drm-intel-fixes for v4.0-rc]
    Reference: http://mid.gmane.org/CA+5PVA7ChbtJrknqws1qvZcbrg1CW2pQAFkSMURWWgyASRyGXg@mail.gmail.com
    Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  4. @jnikula

    drm/i915: Fix atomic state when reusing the firmware fb

    Damien Lespiau authored jnikula committed
    Right now, we get a warning when taking over the firmware fb:
    
      [drm:drm_atomic_plane_check] FB set but no CRTC
    
    with the following backtrace:
    
      [<ffffffffa010339d>] drm_atomic_check_only+0x35d/0x510 [drm]
      [<ffffffffa0103567>] drm_atomic_commit+0x17/0x60 [drm]
      [<ffffffffa00a6ccd>] drm_atomic_helper_plane_set_property+0x8d/0xd0 [drm_kms_helper]
      [<ffffffffa00f1fed>] drm_mode_plane_set_obj_prop+0x2d/0x90 [drm]
      [<ffffffffa00a8a1b>] restore_fbdev_mode+0x6b/0xf0 [drm_kms_helper]
      [<ffffffffa00aa969>] drm_fb_helper_restore_fbdev_mode_unlocked+0x29/0x80 [drm_kms_helper]
      [<ffffffffa00aa9e2>] drm_fb_helper_set_par+0x22/0x50 [drm_kms_helper]
      [<ffffffffa050a71a>] intel_fbdev_set_par+0x1a/0x60 [i915]
      [<ffffffff813ad444>] fbcon_init+0x4f4/0x580
    
    That's because we update the plane state with the fb from the firmware, but we
    never associate the plane to that CRTC.
    
    We don't quite have the full DRM take over from HW state just yet, so
    fake enough of the plane atomic state to pass the checks.
    
    v2: Fix the state on which we set the CRTC in the case we're sharing the
        initial fb with another pipe. (Matt)
    
    Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
    Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    [Jani: backported to drm-intel-fixes for v4.0-rc]
    Reference: http://mid.gmane.org/CA+5PVA7yXH=U757w8V=Zj2U1URG4nYNav20NpjtQ4svVueyPNw@mail.gmail.com
    Reference: http://lkml.kernel.org/r/CA+55aFweWR=nDzc2Y=rCtL_H8JfdprQiCimN5dwc+TgyD4Bjsg@mail.gmail.com
    Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  5. @mripard

    clocksource/drivers/sun5i: Fix cpufreq interaction with sched_clock()

    mripard authored Ingo Molnar committed
    The sun5i timer is used as the sched-clock on certain systems, and ever
    since we started using cpufreq, the cpu clock (that is one of the
    timer's clock indirect parent) now changes as well, along with the
    actual sched_clock() rate.
    
    This is not accurate and not desirable.
    
    We can safely remove the sun5i sched-clock on those systems, since we
    have other reliable sched_clock() sources in the system.
    
    Tested-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    [ Improved the changelog. ]
    Cc: richard@nod.at
    Link: http://lkml.kernel.org/r/1427362029-6511-4-git-send-email-daniel.lezcano@linaro.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
  6. @richardweinberger

    clocksource/drivers: Fix various !CONFIG_HAS_IOMEM build errors

    richardweinberger authored Ingo Molnar committed
    Fix !CONFIG_HAS_IOMEM related build failures in three clocksource drivers.
    
    The build failures have the pattern of:
    
      drivers/clocksource/sh_cmt.c: In function ‘sh_cmt_map_memory’: drivers/clocksource/sh_cmt.c:920:2:
      error: implicit declaration of function ‘ioremap_nocache’ [-Werror=implicit-function-declaration]   cmt->mapbase = ioremap_nocache(mem->start, resource_size(mem));
    
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Cc: maxime.ripard@free-electrons.com
    Link: http://lkml.kernel.org/r/1427362029-6511-1-git-send-email-daniel.lezcano@linaro.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
  7. @ickle @jnikula

    drm/i915: Keep ring->active_list and ring->requests_list consistent

    ickle authored jnikula committed
    If we retire requests last, we may use a later seqno and so clear
    the requests lists without clearing the active list, leading to
    confusion. Hence we should retire requests first for consistency with
    the early return. The order used to be important as the lifecycle for
    the object on the active list was determined by request->seqno. However,
    the requests themselves are now reference counted removing the
    constraint from the order of retirement.
    
    Fixes regression from
    
    commit 1b5a433
    Author: John Harrison <John.C.Harrison@Intel.com>
    Date:   Mon Nov 24 18:49:42 2014 +0000
    
        drm/i915: Convert 'i915_seqno_passed' calls into 'i915_gem_request_completed
    '
    
    and a
    
    	WARNING: CPU: 0 PID: 1383 at drivers/gpu/drm/i915/i915_gem_evict.c:279 i915_gem_evict_vm+0x10c/0x140()
    	WARN_ON(!list_empty(&vm->active_list))
    
    Identified by updating WATCH_LISTS:
    
    	[drm:i915_verify_lists] *ERROR* blitter ring: active list not empty, but no requests
    	WARNING: CPU: 0 PID: 681 at drivers/gpu/drm/i915/i915_gem.c:2751 i915_gem_retire_requests_ring+0x149/0x230()
    	WARN_ON(i915_verify_lists(ring->dev))
    
    Note that this is only a problem in evict_vm where the following happens
    after a retire_request has cleaned out all requests, but not all active
    bo:
    - intel_ring_idle called from i915_gpu_idle notices that no requests are
      outstanding and immediately returns.
    - i915_gem_retire_requests_ring called from i915_gem_retire_requests also
      immediately returns when there's no request, still leaving the bo on the
      active list.
    - evict_vm hits the WARN_ON(!list_empty(&vm->active_list)) after evicting
      all active objects that there's still stuff left that shouldn't be
      there.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: John Harrison <John.C.Harrison@Intel.com>
    Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Commits on Mar 25, 2015
  1. Merge branch 'akpm' (patches from Andrew)

    authored
    Merge misc fixes from Andrew Morton:
     "15 fixes"
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
      mm: numa: mark huge PTEs young when clearing NUMA hinting faults
      mm: numa: slow PTE scan rate if migration failures occur
      mm: numa: preserve PTE write permissions across a NUMA hinting fault
      mm: numa: group related processes based on VMA flags instead of page table flags
      hfsplus: fix B-tree corruption after insertion at position 0
      MAINTAINERS: add Jan as DMI/SMBIOS support maintainer
      fs/affs/file.c: unlock/release page on error
      mm/page_alloc.c: call kernel_map_pages in unset_migrateype_isolate
      mm/slub: fix lockups on PREEMPT && !SMP kernels
      mm/memory hotplug: postpone the reset of obsolete pgdat
      MAINTAINERS: correct rtc armada38x pattern entry
      mm/pagewalk.c: prevent positive return value of walk_page_test() from being passed to callers
      mm: fix anon_vma->degree underflow in anon_vma endless growing prevention
      drivers/rtc/rtc-mrst: fix suspend/resume
      aoe: update aoe maintainer information
  2. @larsclausen

    drivers/rtc/rtc-mrst: fix suspend/resume

    larsclausen authored committed
    The Moorestown RTC driver implements suspend and resume callbacks and
    assigns them to the suspend and resume fields of the device_driver
    struct.  These callbacks are never actually called by anything though.
    
    Modify the driver to properly use dev_pm_ops so that the suspend and
    resume functions are actually executed upon suspend/resume.
    
    [akpm@linux-foundation.org: device_driver.name is const char *]
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: Feng Tang <feng.tang@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Merge branch 'for-linus' of git://git.kernel.dk/linux-block

    authored
    Pull block layer fixes from Jens Axboe:
     "A small collection of fixes that has been gathered over the last few
      weeks.  This contains:
    
       - A one-liner fix for NVMe, fixing a missing list_head init that
         could makes us oops on hitting recovery at load time.
    
       - Two small blk-mq fixes:
            - Fixup a bad goto jump on error handling.
            - Fix for oopsing if running out of reserved tags.
    
       - A memory leak fix for NBD.
    
       - Two small writeback fixes from Tejun, fixing a missing init to
         INITIAL_JIFFIES, and a possible underflow introduced recently.
    
       - A core merge fixup in sg gap detection, where rq->biotail was
         indexed with the count of rq->bio"
    
    * 'for-linus' of git://git.kernel.dk/linux-block:
      writeback: fix possible underflow in write bandwidth calculation
      NVMe: Initialize device list head before starting
      Fix bug in blk_rq_merge_ok
      blkmq: Fix NULL pointer deref when all reserved tags in
      blk-mq: fix use of incorrect goto label in blk_mq_init_queue error path
      nbd: fix possible memory leak
      writeback: add missing INITIAL_JIFFIES init in global_update_bandwidth()
  4. Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/ke…

    authored
    …rnel/git/tj/libata
    
    Pull libata fix from Tejun Heo:
     "One patch to fix a regression from the recent switch to blk-mq tag
      allocation which can cause oops on SAS-attached SATA drives"
    
    * 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
      ata: Add a new flag to destinguish sas controller
  5. Merge tag 'mfd-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kerne…

    authored
    …l/git/lee/mfd
    
    Pull MFD fixes from Lee Jones:
     - Use DMA'able addresses for DMA; rtsx_usb
     - Use return value in the correct way; kempld-core
    
    * tag 'mfd-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
      mfd: kempld-core: Fix callback return value check
      mfd: rtsx_usb: Prevent DMA from stack
  6. drm/i915: Don't try to reference the fb in get_initial_plane_config()

    Damien Lespiau authored Dave Airlie committed
    Tvrtko noticed a new warning on boot:
    
      WARNING: CPU: 1 PID: 353 at include/linux/kref.h:47 drm_framebuffer_reference+0x6c/0x80 [drm]()
      Call Trace:
      [<ffffffff8161f10c>] dump_stack+0x4f/0x7b
      [<ffffffff81052caa>] warn_slowpath_common+0xaa/0xd0
      [<ffffffff81052d8a>] warn_slowpath_null+0x1a/0x20
      [<ffffffffa00d035c>] drm_framebuffer_reference+0x6c/0x80 [drm]
      [<ffffffffa01c0df7>] update_state_fb.isra.54+0x47/0x50 [i915]
      [<ffffffffa01ccd5c>] skylake_get_initial_plane_config+0x93c/0x950 [i915]
      [<ffffffffa01e8721>] intel_modeset_init+0x1551/0x17c0 [i915]
      [<ffffffffa02476e0>] i915_driver_load+0xed0/0x11e0 [i915]
      [<ffffffff81627aa1>] ? _raw_spin_unlock_irqrestore+0x51/0x70
      [<ffffffffa00ca8b7>] drm_dev_register+0x77/0x110 [drm]
      [<ffffffffa00cda3b>] drm_get_pci_dev+0x11b/0x1f0 [drm]
      [<ffffffff81098e3d>] ? trace_hardirqs_on+0xd/0x10
      [<ffffffff81627aa1>] ? _raw_spin_unlock_irqrestore+0x51/0x70
      [<ffffffffa0145276>] i915_pci_probe+0x56/0x60 [i915]
      [<ffffffff813ad59c>] pci_device_probe+0x7c/0x100
      [<ffffffff81466aad>] driver_probe_device+0x16d/0x380
    
    We cannot take a reference at this point, not before
    intel_framebuffer_init() and the underlying drm_framebuffer_init().
    
    Introduced in:
    
      commit 706dc7b
      Author: Matt Roper <matthew.d.roper@intel.com>
      Date:   Tue Feb 3 13:10:04 2015 -0800
    
          drm/i915: Ensure plane->state->fb stays in sync with plane->fb
    
    v2: Don't move update_state_fb(). It was moved around because I
        originally put update_state_fb() in intel_alloc_plane_obj() before
        finding a better place. (Matt)
    
    Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
    Reported-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
    Cc: Matt Roper <matthew.d.roper@intel.com>
    Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
    Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    From drm-next:
    (cherry picked from commit f55548b)
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Mar 24, 2015
  1. Merge tag 'spi-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/broonie/spi
    
    Pull spi fixes from Mark Brown:
     "A couple of driver specific fixes of the usual "important if you have
      that device" kind together with a fix for a use after free bug that
      was introduced into the trace code in some of the recent refactoring
      of the message queue handling"
    
    * tag 'spi-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
      spi: trigger trace event for message-done before mesg->complete
      spi: dw-mid: clear BUSY flag fist and test other one
      spi: qup: Fix cs-num DT property parsing
  2. Merge tag 'regulator-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/li…

    authored
    …nux/kernel/git/broonie/regulator
    
    Pull regulator fixes from Mark Brown:
     "Two fixes here, one typo fix in the documentation and one fix for a
      system hang with one of the Palmas chips caused by the use of an
      incorrect offset being provided for one of the registers"
    
    * tag 'regulator-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
      regulator: Fix documentation for regmap in the config
      regulator: palmas: Correct TPS659038 register definition for REGEN2
  3. Merge tag 'regmap-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux…

    authored
    …/kernel/git/broonie/regmap
    
    Pull regmap fix from Mark Brown:
     "This patch fixes a bad interaction between the support that was added
      for having regmaps without devices for early system controller
      initialization and the trace support.
    
      There's a very good analysis of the actual issue in the commit message
      for the change"
    
    * tag 'regmap-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
      regmap: introduce regmap_name to fix syscon regmap trace events
  4. @broonie
  5. @danvet

    drm: Fixup racy refcounting in plane_force_disable

    danvet authored Dave Airlie committed
    Originally it was impossible to be dropping the last refcount in this
    function since there was always one around still from the idr. But in
    
    commit 83f45fc
    Author: Daniel Vetter <daniel.vetter@ffwll.ch>
    Date:   Wed Aug 6 09:10:18 2014 +0200
    
        drm: Don't grab an fb reference for the idr
    
    we've switched to weak references, broke that assumption but forgot to
    fix it up.
    
    Since we still force-disable planes it's only possible to hit this
    when racing multiple rmfb with fbdev restoring or similar evil things.
    As long as userspace is nice it's impossible to hit the BUG_ON.
    
    But the BUG_ON would most likely be hit from fbdev code, which usually
    invovles the console_lock besides all modeset locks. So very likely
    we'd never get the bug reports if this was hit in the wild, hence
    better be safe than sorry and backport.
    
    Spotted by Matt Roper while reviewing other patches.
    
    [airlied: pull this back into 4.0 - the oops happens there]
    
    Cc: stable@vger.kernel.org
    Cc: Matt Roper <matthew.d.roper@intel.com>
    Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Mar 23, 2015
  1. @snitm

    dm: fix add_disk() NULL pointer due to race with free_dev()

    snitm authored
    Commit c4db59d ("fs: don't reassign dirty inodes to
    default_backing_dev_info") exposed DM to a latent race in free_dev() vs
    add_disk() in relation to management of the device's minor number.
    
    Fix this by refactoring free_dev() to match cleanup order of the
    alloc_dev() error path.  Move cleanup of the gendisk, queue, and bdev
    to _before_ the cleanup of the idr managed minor number.
    
    Also, purely due to cleanup that fell out during the free_dev() audit:
    - adjust dm_blk_close() to access the gendisk's private_data under
      the _minor_lock spinlock.
    - move __dm_destroy()'s dm_get_live_table() call out from under the
      _minor_lock spinlock.
    
    Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1202449
    
    Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
    Reported-by: Jeff Moyer <jmoyer@redhat.com>
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
  2. @broonie

    Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix…

    broonie authored
    …/palmas' into regulator-linus
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    authored
    Pull networking fixes from David Miller:
    
     1) Validate iov ranges before feeding them into iov_iter_init(), from
        Al Viro.
    
     2) We changed copy_from_msghdr_from_user() to zero out the msg_namelen
        is a NULL pointer is given for the msg_name.  Do the same in the
        compat code too.  From Catalin Marinas.
    
     3) Fix partially initialized tuples in netfilter conntrack helper, from
        Ian Wilson.
    
     4) Missing continue; statement in nft_hash walker can lead to crashes,
        from Herbert Xu.
    
     5) tproxy_tg6_check looks for IP6T_INV_PROTO in ->flags instead of
        ->invflags, fix from Pablo Neira Ayuso.
    
     6) Incorrect memory account of TCP FINs can result in negative socket
        memory accounting values.  Fix from Josh Hunt.
    
     7) Don't allow virtual functions to enable VLAN promiscuous mode in
        be2net driver, from Vasundhara Volam.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
      netfilter: nft_compat: set IP6T_F_PROTO flag if protocol is set
      cx82310_eth: wait for firmware to become ready
      net: validate the range we feed to iov_iter_init() in sys_sendto/sys_recvfrom
      net: compat: Update get_compat_msghdr() to match copy_msghdr_from_user() behaviour
      be2net: use PCI MMIO read instead of config read for errors
      be2net: restrict MODIFY_EQ_DELAY cmd to a max of 8 EQs
      be2net: Prevent VFs from enabling VLAN promiscuous mode
      tcp: fix tcp fin memory accounting
      ipv6: fix backtracking for throw routes
      net: ethernet: pcnet32: Setup the SRAM and NOUFLO on Am79C97{3, 5}
      ipv6: call ipv6_proxy_select_ident instead of ipv6_select_ident in udp6_ufo_fragment
      netfilter: xt_TPROXY: fix invflags check in tproxy_tg6_check()
      netfilter: restore rule tracing via nfnetlink_log
      netfilter: nf_tables: allow to change chain policy without hook if it exists
      netfilter: Fix potential crash in nft_hash walker
      netfilter: Zero the tuple in nfnl_cthelper_parse_tuple()
  4. @keithbusch @axboe

    NVMe: Initialize device list head before starting

    keithbusch authored axboe committed
    Driver recovery requires the device's list node to have been initialized.
    
    Fixes: https://lkml.org/lkml/2015/3/22/262
    
    Reported-by: Steven Noonan <steven@uplinklabs.net>
    Signed-off-by: Keith Busch <keith.busch@intel.com>
    Cc: Matthew Wilcox <willy@linux.intel.com>
    Cc: Jens Axboe <axboe@fb.com>
    Signed-off-by: Jens Axboe <axboe@fb.com>
Commits on Mar 22, 2015
  1. Merge tag 'md/4.0-rc4-fix' of git://neil.brown.name/md

    authored
    Pull bugfix for md from Neil Brown:
     "One fix for md in 4.0-rc4
    
      Regression in recent patch causes crash on error path"
    
    * tag 'md/4.0-rc4-fix' of git://neil.brown.name/md:
      md: fix problems with freeing private data after ->run failure.
  2. Merge tag 'char-misc-4.0-rc5' of git://git.kernel.org/pub/scm/linux/k…

    authored
    …ernel/git/gregkh/char-misc
    
    Pull char/misc fixes from Greg KH:
     "Here are three fixes for 4.0-rc5 that revert 3 PCMCIA patches that
      were merged in 4.0-rc1 that cause regressions.  So let's revert them
      for now and they will be reworked and resent sometime in the future.
    
      All have been tested in linux-next for a while"
    
    * tag 'char-misc-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
      Revert "pcmcia: add a new resource manager for non ISA systems"
      Revert "pcmcia: fix incorrect bracketing on a test"
      Revert "pcmcia: add missing include for new pci resource handler"
  3. Merge tag 'staging-4.0-rc5' of git://git.kernel.org/pub/scm/linux/ker…

    authored
    …nel/git/gregkh/staging
    
    Pull staging driver fixes from Greg KH:
     "Here are four small staging driver fixes, all for the vt6656 and
      vt6655 drivers, that resolve some reported issues with them.
    
      All of these patches have been in linux next for a while"
    
    * tag 'staging-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
      vt6655: Fix late setting of byRFType.
      vt6655: RFbSetPower fix missing rate RATE_12M
      staging: vt6656: vnt_rf_setpower: fix missing rate RATE_12M
      staging: vt6655: vnt_tx_packet fix dma_idx selection.
  4. Merge tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/gregkh/tty
    
    Pull tty/serial driver fix from Greg KH:
     "Here's a single 8250 serial driver that fixes a reported deadlock with
      the serial console and the tty driver.
    
      It's been in linux-next for a while now"
    
    * tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
      serial: 8250_dw: Fix deadlock in LCR workaround
Something went wrong with that request. Please try again.