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

Pull fbdev updates from Bartlomiej Zolnierkiewicz:

 - remove fbdev notifier usage for fbcon (as prep work to clean up the
   fbcon locking), add locking checks in vt/console code and make
   assorted cleanups in fbdev and backlight code (Daniel Vetter)

 - add COMPILE_TEST support to atmel_lcdfb, da8xx-fb, gbefb, imxfb,
   pvr2fb and pxa168fb drivers (me)

 - fix DMA API abuse in au1200fb and jz4740_fb drivers (Christoph
   Hellwig)

 - add check for new BGRT status field rotation bits in efifb driver
   (Hans de Goede)

 - mark expected switch fall-throughs in s3c-fb driver (Gustavo A. R.
   Silva)

 - remove fbdev mxsfb driver in favour of the drm version (Fabio
   Estevam)

 - remove broken rfbi code from omap2fb driver (me)

 - misc fixes (Arnd Bergmann, Shobhit Kukreti, Wei Yongjun, me)

 - misc cleanups (Gustavo A. R. Silva, Colin Ian King, me)

* tag 'fbdev-v5.3' of git://github.com/bzolnier/linux: (62 commits)
  video: fbdev: imxfb: fix a typo in imxfb_probe()
  video: fbdev: s3c-fb: Mark expected switch fall-throughs
  video: fbdev: s3c-fb: fix sparse warnings about using incorrect types
  video: fbdev: don't print error message on framebuffer_alloc() failure
  video: fbdev: intelfb: return -ENOMEM on framebuffer_alloc() failure
  video: fbdev: s3c-fb: return -ENOMEM on framebuffer_alloc() failure
  vga_switcheroo: Depend upon fbcon being built-in, if enabled
  video: fbdev: omap2: remove rfbi
  video: fbdev: atmel_lcdfb: remove redundant initialization to variable ret
  video: fbdev-MMP: Use struct_size() in devm_kzalloc()
  video: fbdev: controlfb: fix warnings about comparing pointer to 0
  efifb: BGRT: Add check for new BGRT status field rotation bits
  jz4740_fb: fix DMA API abuse
  video: fbdev: pvr2fb: fix link error for pvr2fb_pci_exit
  video: fbdev: s3c-fb: add COMPILE_TEST support
  video: fbdev: imxfb: fix sparse warnings about using incorrect types
  video: fbdev: pvr2fb: fix build warning when compiling as module
  fbcon: Export fbcon_update_vcs
  backlight: simplify lcd notifier
  staging/olpc_dcon: Add drm conversion to TODO
  ...

diff --cc drivers/media/pci/ivtv/ivtvfb.c
index 800b365,299ff03..95a56cc
--- 1/drivers/media/pci/ivtv/ivtvfb.c
--- 2/drivers/media/pci/ivtv/ivtvfb.c
+++ b/drivers/media/pci/ivtv/ivtvfb.c
@@@ -1251,16 -1246,7 +1251,12 @@@ static int ivtvfb_callback_cleanup(stru
        struct osd_info *oi = itv->osd_info;
  
        if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
-               if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) {
-                       IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n",
-                                      itv->instance);
-                       return 0;
-               }
 +              itv->streams[IVTV_DEC_STREAM_TYPE_YUV].vdev.device_caps &=
 +                      ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
 +              itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps &=
 +                      ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
 +              itv->v4l2_cap &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+               unregister_framebuffer(&itv->osd_info->ivtvfb_info);
                IVTVFB_INFO("Unregister framebuffer %d\n", itv->instance);
                itv->ivtvfb_restore = NULL;
                ivtvfb_blank(FB_BLANK_VSYNC_SUSPEND, &oi->ivtvfb_info);

diff --cc drivers/video/fbdev/cyber2000fb.c
Simple merge

diff --cc drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
Simple merge

diff --cc drivers/video/fbdev/omap2/omapfb/dss/core.c
Simple merge

diff --cc drivers/video/fbdev/omap2/omapfb/dss/dss.h
Simple merge

diff --cc drivers/video/fbdev/omap2/omapfb/omapfb-main.c
Simple merge

diff --cc drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
Simple merge

diff --cc drivers/video/fbdev/s3c-fb.c
Simple merge

diff --cc drivers/video/fbdev/sm501fb.c
Simple merge