From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Feb 2017 19:58:05 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v5.15~11950
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99378fd26803328cbab64ae60fa98e1394d07a6d;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "A fix for a crash in uinput, and a fix for build errors when HID-RMI
  is built-in but SERIO is a module"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics-rmi4 - select 'SERIO' when needed
  Input: uinput - fix crash when mixing old and new init style
---

99378fd26803328cbab64ae60fa98e1394d07a6d