Merge branch 'for-4.16/i2c-hid' into for-linus