Merge branch 'net-stmmac-convert-to-platform-remove-callback-returning-void'