From: Linus Torvalds Date: Thu, 15 Apr 2021 17:23:44 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input X-Git-Tag: v5.15~1385 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1df01322f00a0aedd4a589597ce9c0b680ae6068;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input Pull input fixes from Dmitry Torokhov: "Just a few driver fixes here" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: elants_i2c - drop zero-checking of ABS_MT_TOUCH_MAJOR resolution Input: elants_i2c - fix division by zero if firmware reports zero phys size Input: nspire-keypad - enable interrupts only when opened Input: i8042 - fix Pegatron C15B ID entry Input: n64joy - fix return value check in n64joy_probe() Input: s6sy761 - fix coordinate read bit shift --- 1df01322f00a0aedd4a589597ce9c0b680ae6068