projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 355a47a 6116b89)
Merge tag 'topic/remove-fbcon-notifiers-2019-06-26' into drm-misc-next-fixes
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 26 Jun 2019 10:26:34 +0000 (12:26 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 26 Jun 2019 10:26:34 +0000 (12:26 +0200)
topic/remove-fbcon-notifiers:
- Export fbcon_update_vcs to fix sh_mobile_lcdcfb.c compilation.
- Rely on fbcon being builtin when vgaswitcheroo is builtin.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7dd06ccb-7f8d-943b-bbc0-f4e58e041a23@linux.intel.com

Trivial merge
Linux 6.x block layer and io_uring tree(s)