Merge tag 'v3.11' into next

Merge with mainline to bring in sync changes to cyttsp4 driver.