Merge branch 'fixes' into next

This commit is contained in:
Vinod Koul 2020-09-22 20:18:32 +05:30
commit d2dc9ab747