Merge branch 'for-4.3/upstream' into for-4.3/wacom

There is a conflict between 67e123ff ("Delete unnecessary checks") sitting
in for-4.3/upstream and memory allocation failure handling from Jason Gerecke.
Pull this so that conflict could be resolved.

Signed-off-by: Jiri Kosina <jkosina@suse.com>