linux-next: manual merge of the drm tree with the arm tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i2c/tda998x_drv.c between commit: ad975f9364a3 ("drm/i2c: tda998x: group audio functions together") from the arm tree and commit: c20ea8fd4986 ("drm/i2c/tda998x: mark symbol static where possible") fro

linux-next: manual merge of the drm tree with the arm tree

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i2c/tda998x_drv.c between commit: 5d564ba2705d ("drm/i2c: tda998x: group audio functions together") from the arm tree and commit: c20ea8fd4986 ("drm/i2c/tda998x: mark symbol static where possible") fro