Merge tag 'fbdev-v4.16-rc5' of git://github.com/bzolnier/linux