diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-14 17:59:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-14 17:59:45 +0100 |
| commit | 5e15d39f1e7702bccbd52010f52a6dc39c1175de (patch) | |
| tree | 43bc0a74440f4dbe4b0bc60dbf9a673a5745ccca /include | |
| parent | Merge tag 'auxdisplay-for-linus-v4.16-rc6' of git://github.com/ojeda/linux (diff) | |
| parent | staging: android: ashmem: Fix possible deadlock in ashmem_ioctl (diff) | |
| download | linux-5e15d39f1e7702bccbd52010f52a6dc39c1175de.tar.xz linux-5e15d39f1e7702bccbd52010f52a6dc39c1175de.zip | |
Merge tag 'staging-4.16-rc6' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions