Merge branch 'synaptics-rmi4' into for-linus

This brings in fix for F03 build error when serio is module.