Merge branches 'work.coda' and 'work.dcache-busy-wait' into for-next

-next: trivial conflict in Documentation/filesystems/porting.rst (several
branches append to the end of that file, order of entries is irrelevant)

-next: hopefully no cifs conflict anymore, but if they still use the
variant with ->d_u.d_alias in cifs_d_mark_tmpfile(), just replace the
line in question with
	BUG_ON(d_really_is_positive(dentry));
as in fs/dcache.c:d_mark_tmpfile().