Merge branch 'v5.15/standard/base' into v5.15/standard/bcm-2xxx-rpi
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
# Conflicts:
# drivers/gpu/drm/vc4/vc4_hdmi.c
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
# Conflicts:
# drivers/gpu/drm/vc4/vc4_hdmi.c