Merge branch 'for-4.18/plantronics' into for-linus