From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Mar 2018 16:59:45 +0000 (-0700)
Subject: Merge tag 'staging-4.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5e15d39f1e7702bccbd52010f52a6dc39c1175de;p=linux.git

Merge tag 'staging-4.16-rc6' of git://git./linux/kernel/git/gregkh/staging

Pull staging fixes from Greg KH:
 "Here are three staging driver fixes for 4.16-rc6

  Two of them are lockdep fixes for the ashmem driver that have been
  reported by a number of people recently. The last one is a fix for the
  comedi driver core.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-4.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: android: ashmem: Fix possible deadlock in ashmem_ioctl
  staging: comedi: fix comedi_nsamples_left.
  staging: android: ashmem: Fix lockdep issue during llseek
---

5e15d39f1e7702bccbd52010f52a6dc39c1175de