From: Linus Torvalds Date: Tue, 6 Oct 2020 18:05:44 +0000 (-0700) Subject: Merge tag 'drm-fixes-2020-10-06-1' of git://anongit.freedesktop.org/drm/drm X-Git-Tag: v5.15~2796 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1e141e9db6b89d124ec09ca162f378a29119481;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'drm-fixes-2020-10-06-1' of git://anongit.freedesktop.org/drm/drm Pull drm fixes from Dave Airlie: "Daniel queued these up last week and I took a long weekend so didn't get them out, but fixing the OOB access on get font seems like something we should land and it's cc'ed stable as well. The other big change is a partial revert for a regression on android on the clcd fbdev driver, and one other docs fix. fbdev: - Re-add FB_ARMCLCD for android - Fix global-out-of-bounds read in fbcon_get_font() core: - Small doc fix" * tag 'drm-fixes-2020-10-06-1' of git://anongit.freedesktop.org/drm/drm: drm: drm_dsc.h: fix a kernel-doc markup Partially revert "video: fbdev: amba-clcd: Retire elder CLCD driver" fbcon: Fix global-out-of-bounds read in fbcon_get_font() Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h --- f1e141e9db6b89d124ec09ca162f378a29119481