linux-next: manual merge of the libata tree with Linus' tree

Hi Tejun, Today's linux-next merge of the libata tree got a conflict in drivers/ata/sata_mv.c between commit 90aa2997029f ("ata: sata_mv: Fix probe failures with optional phys") from Linus' tree and commit 8ad116e649b2 ("ata: sata_mv: Cleanup only the initialized ports") from the libata tree. I

linux-next: manual merge of the libata tree with Linus' tree

Hi Tejun, Today's linux-next merge of the libata tree got a conflict in drivers/ata/sata_mv.c between commit 90aa2997029f (ata: sata_mv: Fix probe failures with optional phys) from Linus' tree and commit 8ad116e649b2 (ata: sata_mv: Cleanup only the initialized ports) from the libata tree. I