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