Snoop (previously Snoop Doggy Dogg and Snoop Lion, actually Calvin Cordozar Broadus Jr.) sparked the beef last year when he said Eminem wasn't in his top 10 rappers of all time.
Eminem - real name Marshall Mathers - subsequently referenced his comments on his track 'Zeus', which was released in December.
He rapped: "And, as far as squashin' beef, I'm used to people knockin' me, but just not in my camp.
"And diplomatic as I'm tryna be last thing I need is Snoop doggin' me.
"Man, dog, you was like a damn god to me. Man, not really. I had dog backwards."
It seems like that's all water under the bridge now though, following an apology from Snoop.
Speaking on The Breakfast Club radio show, the 50-year-old said: "I felt like I was out of pocket. I apologized to him, and I let him know and I'm just bettering myself. I make mistakes."
He added: "Man I love Eminem. And the thing is, we love hip hop so much, we competitive. We battle rappers, so that was suppose to trigger that in him.
"We brothers, and we family so we learn to appreciate each other for what we do and we get down and we had a long conversation about the respect that we have for each other, and the way we need to talk in public about each other."
Watch the interview here:
The pair are both due to perform together during the Super Bowl halftime show in February, along with Dr Dre, Mary J Blige and Kendrick Lamar.
The show - which will take place at the SoFi Stadium in Inglewood, California - is a collaboration between the NFL, Pepsi and Roc Nation, Jay-Z's entertainment company.
Snoop said: "Dr. Dre is one of my closest associates. When I knew he got the call, I figured I was going to get the call soon.
"But to add Eminem, Kendrick and Mary J. Blige is special. These are his super friends to actually show people why he is who he is.
"He really wanted to get people what they want. This is an L.A. moment."
Chosen for YouChosen for You
Most Read StoriesMost Read