Merge tag 'v4.16-rc4' into next

Sync up with mainline to bring in RAVE MFD device core.