Al-Adab Al-Mufrad #572

'Amr ibn Shu'ayb reported via his father that his grandfather, "The Prophet, may Allah bless him and grant him peace, sat down on the steps of the Ka'ba in the year of Conquest* and praised and glorified Allah. Then he said, 'Whoever is party to an alliance made in the Jahiliyya, Islam only increases its strength. There is no hijra after the Conquest.'"