diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-06 11:48:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-06 11:48:17 -0800 |
commit | ab91292cb3e9f43d9c6839d7572d17b35bc21710 (patch) | |
tree | 140d2f27378157ed1f6eafe8f98ace9eb6c884ed /Makefile | |
parent | d49248eb25a223b238cd7687ea92b080f595a323 (diff) | |
parent | 264f53b41946dcabb2b3304190839ab5670c7825 (diff) |
Merge tag 'char-misc-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH:
"Here are some small driver fixes, and one "large" revert, for
5.10-rc7.
They include:
- revert mei patch from 5.10-rc1 that was using a reserved userspace
value. It will be resubmitted once the proper id has been assigned
by the virtio people.
- habanalabs fixes found by the fall-through audit from Gustavo
- speakup driver fixes for reported issues
- fpga config build fix for reported issue.
All of these except the revert have been in linux-next with no
reported issues. The revert is "clean" and just removes a
previously-added driver, so no real issue there"
* tag 'char-misc-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
Revert "mei: virtio: virtualization frontend driver"
fpga: Specify HAS_IOMEM dependency for FPGA_DFL
habanalabs: put devices before driver removal
habanalabs: free host huge va_range if not used
speakup: Reject setting the speakup line discipline outside of speakup
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions