Diddy -- UCLA Is Cool ... With My Son, At Least

Diddy's son, Justin Combs, better be ready for two-a-days, 'cause he's back on the football field for the UCLA Bruins ... who've buried the mess of Diddy's alleged kettlebell fight with a coach.

We're told head coach Jim Mora met with Justin last week to hash things out once and for all, and move forward ...so the junior cornerback could get back to practice.

TMZ Sports broke the story ... Diddy was arrested for the alleged assault of Bruins strength and conditioning coach, Sal Alosi, back in June. The D.A. eventually rejected the case for felony charges, but the LA. City Attorney is still considering filing a misdemeanor.

Our UCLA sources say Diddy is not allowed at practices, at least for now.