diff options
| author | Greg Kroah-Hartman | 2014-02-24 22:34:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-24 22:34:54 +0100 |
| commit | 58e868be77bda526cc8d4264488ed393bc607720 (patch) | |
| tree | f95692355ca78239815c1df58fe2fee7dc79d80d /kernel/user_namespace.c | |
| parent | Merge tag 'iio-fixes-for-3.14c' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Linux 3.14-rc4 (diff) | |
| download | kernel-qcow2-linux-58e868be77bda526cc8d4264488ed393bc607720.tar.gz kernel-qcow2-linux-58e868be77bda526cc8d4264488ed393bc607720.tar.xz kernel-qcow2-linux-58e868be77bda526cc8d4264488ed393bc607720.zip | |
Merge 3.14-rc4 into char-misc-linus
Merge this to catch up with the other patches sent upstream.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/user_namespace.c')
| -rw-r--r-- | kernel/user_namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index 240fb62cf394..dd06439b9c84 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -225,7 +225,7 @@ static u32 map_id_up(struct uid_gid_map *map, u32 id) * * When there is no mapping defined for the user-namespace uid * pair INVALID_UID is returned. Callers are expected to test - * for and handle handle INVALID_UID being returned. INVALID_UID + * for and handle INVALID_UID being returned. INVALID_UID * may be tested for using uid_valid(). */ kuid_t make_kuid(struct user_namespace *ns, uid_t uid) |