Merge remote-tracking branch 'mainline-kernel/v4.15-next/pdids' into v4.15-next/soc