diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-24 08:55:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-24 08:55:51 -0800 |
| commit | 1110ebe058268b5425c69a23a99456f2331063bf (patch) | |
| tree | 0dec767acd801f06be728d0df6177159b7481c21 /security/apparmor/lsm.c | |
| parent | 615d300648869c774bd1fe54b4627bb0c20faed4 (diff) | |
| parent | 4b088005c897a62fe98f70ab69687706cb2fad3b (diff) | |
Merge tag 'fbdev-for-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev fixes and cleanups from Helge Deller:
"A crash fix in stifb which was missed to be included in the drm-misc
tree, two checks to prevent wrong userspace input in sisfb and
savagefb and two trivial printk cleanups:
- stifb: Fix crash in stifb_blank()
- savage/sis: Error out if pixclock equals zero
- minor trivial cleanups"
* tag 'fbdev-for-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
fbdev: stifb: Fix crash in stifb_blank()
fbcon: Fix incorrect printed function name in fbcon_prepare_logo()
fbdev: sis: Error out if pixclock equals zero
fbdev: savage: Error out if pixclock equals zero
fbdev: vt8500lcdfb: Remove unnecessary print function dev_err()
Diffstat (limited to 'security/apparmor/lsm.c')
0 files changed, 0 insertions, 0 deletions