Hi all,
The following commits are also in the drm tree as different commits
(but the same patches):
5b0779ae13de ("ASoC: hdmi-codec: move no_capture_mute to struct hdmi_codec_pdata")
a8e792d3f0bb ("ASoC: hdmi-codec: pass data to get_dai_id too")
These are commits
bb1d67bf82fb ("ASoC: hdmi-codec: move no_capture_mute to struct hdmi_codec_pdata")
6af45d7df109 ("ASoC: hdmi-codec: pass data to get_dai_id too")
in the drm tree.
The latter of these is already causing an unnecessary conflict in
drivers/gpu/drm/bridge/lontium-lt9611.c.
--
Cheers,
Stephen Rothwell
Attachment:
pgptuS2YQW2kO.pgp
Description: OpenPGP digital signature
