From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Sep 2017 03:23:41 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v5.15~10356
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d32e5f44a5aeb9c1febaf16db45bf888a3f66725;p=mirror_ubuntu-kernels.git

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

Pull input fixes from Dmitry Torokhov:

 - fixes for two long standing issues (lock up and a crash) in force
   feedback handling in uinput driver

 - tweak to firmware update timing in Elan I2C touchpad driver.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - extend Flash-Write delay
  Input: uinput - avoid crash when sending FF request to device going away
  Input: uinput - avoid FF flush when destroying device
---

d32e5f44a5aeb9c1febaf16db45bf888a3f66725