On Sun, Aug 30, 2020 at 05:51:06PM +0800, Tuo Li wrote: > The variable bclk_rate is checked in: > if (bclk_rate && mclk_rate % bclk_rate) This doesn't apply against current code, please check and resend: HEAD is now at bbd59df075ab Merge series "ASoC: Intel: sdw machine driver updates for 5.10" from Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx>: Applying: ASoC: rockchip: fix a possible divide-by-zero bug in rockchip_i2s_hw_params() Using index info to reconstruct a base tree... M sound/soc/rockchip/rockchip_i2s.c Falling back to patching base and 3-way merge... Auto-merging sound/soc/rockchip/rockchip_i2s.c CONFLICT (content): Merge conflict in sou
Attachment:
signature.asc
Description: PGP signature