It’s all good between Will Smith and Chris Rock.

According to Diddy, the two made amends after Smith slapped the comedian on stage following his joke about Jada Pinkett Smith during Sunday’s Oscars telecast.

“That’s not a problem. That’s over. I can confirm that,” the hip-hop mogul told Page Six when asked about their feud at the Vanity Fair Oscar party.

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

After Rock made his G.I. Jane joke, Jada appeared to roll her eyes. The actress announced last year she shaved her head after struggling with alopecia.

While accepting the Oscar for Best Actor for King Richard, Smith apologized to the Academy and his fellow nominees for the now-infamous slap. “I want to apologize to all my fellow nominees,” he said. “Art imitates life. I look like the crazy father, just like they said about Richard Williams. But love will make you do crazy things.”

Following the awards, Smith celebrated at the Vanity Fair party with Jada and his children Trey, Jaden, and Willow. He appeared to be in great spirits, dancing and rapping along to his songs like “Summertime,” “Miami,” and “Gettin’ Jiggy Wit It.”

Jaden shared his support for his father on Twitter, writing, “And That’s How We Do It.”

Rock declined to file a police report following the altercation at the 94th Academy Awards.

“LAPD investigative entities are aware of an incident between two individuals during the Academy Awards program,” the LAPD said in a statement. “The incident involved one individual slapping another. The individual involved has declined to file a police report. If the involved party desires a police report at a later date, LAPD will be available to complete an investigative report.”