Merge "mmc: block: cmdq discard should use softirq completion path" into msm-4.9