Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)