Photo credit: Featureflash Photo Agency / Shutterstock.com

P Diddy has confirmed that all is well and good between Chris Rock and Will Smith, following their dramatic altercation at Sunday night’s Oscars, which saw Will Smith rush to the stage to hit Chris Rock after he made a joke about wife Jada Pinkett Smith’s shaved head, which is due to her ongoing battle with alopecia.

At the time of the now-viral altercation, P Diddy – real name Sean Combs – said, “Will and Chris, we’re going to solve this – but right now we’re moving on with love.”

Well, it seems like the rapper was true to his word, as he made sure that the two men resolved things…

“That’s not a problem. That’s over. I can confirm that,” Diddy reportedly confirmed to Page Six at the Vanity Fair Oscars after-party following the ceremony.

“It’s all love,” he added. “They’re brothers.”

Will Smith – who walked away with the ‘Best Actor in a Leading Role’ Oscar for his role as Venus and Serena Williams’ father Richard Williams in King Richard – seemed to have forgotten his troubles at the Vanity Fair after-party in Beverly Hills…

The 53-year-old actor was spotted dancing and singing along to his greatest hits, including Summertime, Miami, and Gettin’ Jiggy Wit It, while his wife and children, Trey, 29 (from his previous relationship with Sheree Zampino) Jaden, 23, and Willow, 21, were also dancing along with him.

Chris Rock wasn’t at the Vanity Fair after-party, and instead attended Gucci’s 14th annual “The Party” which was held at the home of Guy Oseary.

Let’s hope that the two really have put everything behind them!