aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/main.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <[email protected]>2020-03-04 13:29:19 +0000
committerArnaldo Carvalho de Melo <[email protected]>2020-03-04 13:29:19 +0000
commitd46eec8e975a8180e178e01ba505801c44bc9a6c (patch)
treebff067e554fc03c576e107297085d30c8e381370 /fs/ecryptfs/main.c
parentperf/x86: Add Intel Tiger Lake uncore support (diff)
parentperf diff: Fix undefined string comparison spotted by clang's -Wstring-compare (diff)
downloadkernel-d46eec8e975a8180e178e01ba505801c44bc9a6c.tar.gz
kernel-d46eec8e975a8180e178e01ba505801c44bc9a6c.zip
Merge remote-tracking branch 'acme/perf/urgent' into perf/core
To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'fs/ecryptfs/main.c')
-rw-r--r--fs/ecryptfs/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index b8a7ce379ffe..e63259fdef28 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -7,7 +7,7 @@
* Copyright (C) 2004-2007 International Business Machines Corp.
* Author(s): Michael A. Halcrow <[email protected]>
* Michael C. Thompson <[email protected]>
- * Tyler Hicks <[email protected]>
+ * Tyler Hicks <[email protected]>
*/
#include <linux/dcache.h>