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

[Tetsuo Handa]

Stephen Rothwell wrote:
> 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.

Thank you.
Modification of security/tomoyo/realpath.c in 6ef0dd885ce8 is no longer needed.

In message "linux-next: Tree for July 22",
Stephen Rothwell wrote:
> The security-testing tree still has its build failure.
(...snipped...)
> Merging security-testing/next
> CONFLICT (content): Merge conflict in security/tomoyo/realpath.c

What should I do?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/