linux-next: manual merge of the input tree with the input-current tree

Hi Dmitry, Today's linux-next merge of the input tree got a conflict in: drivers/input/rmi4/Kconfig between commit: 413d37326700 ("Input: synaptics-rmi4 - select 'SERIO' when needed") from the input-current tree and commit: b29c139a15b6 ("Input: synaptics-rmi4 - use Kconfig "if" to expr

linux-next: manual merge of the input tree with the input-current tree

Hi Dmitry, Today's linux-next merge of the input tree got a conflict in drivers/input/mouse/synaptics.c between commit dc5465dc8a6d ("Input: synaptics - fix middle button on Lenovo 2015 products") from the input-current tree and commit de4e374b401a ("Input: synaptics - switch ForcePad detection to