Rebasing the for-next branch

Hi Martin,

Do you plan to rebase the for-next branch of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git on v5.16-rc1? I just noticed that there are multiple merge conflicts between the UFS patch series I'm working on (based on mkp-scsi/for-next) and v5.16-rc1. Although rebasing is being frowned upon in the Linux kernel community, Linus probably will be grateful if we do the work of reducing merge conflicts before the v5.17-rc1 pull request is sent.

Thanks,

Bart.