Commit 556ef7fe authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

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

parent b355e833
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment