Fix incorrect conflict resolution in "vfs: Add setns support for the mount namespace"
2 files changed