commit | b083234b78ea75c52fdbfab4aa7e2d3e590f3b1b | [log] [tgz] |
---|---|---|
author | Daniel Rosenberg <drosen@google.com> | Tue Jul 21 15:17:26 2015 -0700 |
committer | chrmhoffmann <chrmhoffmann@gmail.com> | Sun Apr 05 10:22:14 2020 +0200 |
tree | ae2a6ec32943c81ac4eaf978746f54c2fbca6289 | |
parent | b30dee55e912274925224b36a6da27fc8738dd0b [diff] |
Fix incorrect conflict resolution in "vfs: Add setns support for the mount namespace"