Merge branch 'next-queue' into next

diff --cc fs/cifs/cifsacl.c
Simple merge

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

diff --cc security/integrity/ima/ima_policy.c
Simple merge