Linux / linux / 2a8cbf2 / Merge tag 'fbdev-v5.0-rc3' of git://github.com/bzolnier/linux

Linux/linux 2a8cbf2 — Documentation/fb fbcon.txt, drivers/video/fbdev offb.c

2019-01-18 17:43:05 UTC by Linus Torvalds on ⎇

master

Merge tag 'fbdev-v5.0-rc3' of git://github.com/bzolnier/linux

Pull fbdev fixes from Bartlomiej Zolnierkiewicz:

 - fix stack memory leak in omap2fb driver (Vlad Tsyrklevich)

 - fix OF node name handling v4.20 regression in offb driver (Rob
   Herring)

 - convert CONFIG_FB_LOGO_CENTER config option added in v5.0-rc1 into a
   kernel parameter (Peter Rosin)

* tag 'fbdev-v5.0-rc3' of git://github.com/bzolnier/linux:
  fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option
  fbdev: offb: Fix OF node name handling
  omap2fb: Fix stack memory disclosure

Delta		File
+10	-9	drivers/video/fbdev/core/fbmem.c
+9	-9	drivers/video/fbdev/offb.c
+0	-9	drivers/video/logo/Kconfig
+8	-0	Documentation/fb/fbcon.txt
+7	-0	drivers/video/fbdev/core/fbcon.c
+2	-0	drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
+1	-0	include/linux/fb.h
+37	-27	7 files

Unified Split Raw