According to the search results, there is no information about a rock and Vin Diesel. However, there is information about a feud between Dwayne "The Rock" Johnson and Vin Diesel. The feud started in 2016 when Johnson called out some of his male co-stars, including Diesel, for being unprofessional on the set of "The Fate of the Furious". The feud continued for several years, with both actors making public statements about their differences. However, in June 2023, Johnson announced that he and Diesel had put their differences aside and resolved their issues for the sake of the "Fast & Furious" franchise. Johnson also confirmed that he will return for future movies in the franchise.