Tyrese Gibson and Dwayne Johnson have ended their long-standing feud following a recent phone chat.