Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop...
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Wed, 19 Jun 2019 13:18:48 +0000 (15:18 +0200)
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Wed, 19 Jun 2019 13:18:48 +0000 (15:18 +0200)
commit2ee692802b8f6c54bd6499addd3d07c2833d84d8
tree6aa9a7de774804de0d5a944436a380eb99a6ac68
parent0f5a5712ad1e3b8472b1c1459681dadad9277067
parent1dcff4ae65185e8c0300972f6d8d39d9a9db2bda
Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next

topic/remove-fbcon-notifiers:
- remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking
- assorted locking checks in vt/console code
- assorted notifier and cleanups in fbdev and backlight code

One trivial merge conflict fixed.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
drivers/video/fbdev/Kconfig
drivers/video/fbdev/cyber2000fb.c
drivers/video/fbdev/pvr2fb.c