While the filing of the Form PF will serve both purposes, there does appear to be a discrepancy in deadlines for the annual filing: the CFTC having a 90 day deadline and the SEC with either 120 days or 60 depending on fund size.
FORBES: CFTC Registration Adds Additional Regulatory Layer for Hedge Funds