Merge branch 'for-4.17/upstream' into for-linus

Pull a few small generic code cleanups.

diff --cc drivers/hid/hid-asus.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc include/linux/hid.h
Simple merge