linux-next: manual merge of the security-testing tree with the vfstree

[Stephen Rothwell]

Hi James,

Today's linux-next merge of the security-testing tree got a conflict in
security/tomoyo/realpath.c between commit 6ef0dd885ce8 ("get rid of
pointless checks for dentry->sb == NULL") from the vfs tree and commit
5625f2e32663 ("TOMOYO: Change pathname for non-rename()able filesystems")
from the security-testing tree.

The latter includes the change from the former, so I just used the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature