diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-19 11:36:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-19 11:36:09 -0800 |
commit | 672bb0fa9a8303cbd678dc60e315c84dda913ce1 (patch) | |
tree | 62c6d2c2fb3db98aabad49dc39e127ead2245223 /net/ipv6/ip6_fib.c | |
parent | Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (diff) | |
parent | Input: synaptics-rmi4 - prevent UAF reported by KASAN (diff) | |
download | linux-dev-672bb0fa9a8303cbd678dc60e315c84dda913ce1.tar.xz linux-dev-672bb0fa9a8303cbd678dc60e315c84dda913ce1.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
- a fix for use-after-free in Synaptics RMI4 driver
- correction to multitouch contact tracking on certain ALPS touchpads
(which got broken when we tried to fix the 2-finger scrolling)
- touchpad on Lenovo T640p is switched over to SMbus/RMI
- a few device node refcount fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - prevent UAF reported by KASAN
Input: ALPS - fix multi-touch decoding on SS4 plus touchpads
Input: synaptics - Lenovo Thinkpad T460p devices should use RMI
Input: of_touchscreen - add MODULE_LICENSE
Input: 88pm860x-ts - fix child-node lookup
Input: twl6040-vibra - fix child-node lookup
Input: twl4030-vibra - fix sibling-node lookup
Diffstat (limited to 'net/ipv6/ip6_fib.c')
0 files changed, 0 insertions, 0 deletions