Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into upstream-fixes

Sync with Linus' tree. This is necessary to have a base for
patch that fixes commit 35b4c01e29b ("power_supply: add "powers"
links to self-powered HID devices") which went in through Anton's
tree.

1 files changed, 1 insertions, 6 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 214ba7f9f577..806e0a286634 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -235,7 +235,7 @@ out_delete:
 }
 
 static const char * const annotate_usage[] = {
-        "perf annotate [<options>] <command>",
+        "perf annotate [<options>]",
         NULL
 };
 
@@ -313,10 +313,5 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used)
                 annotate.sym_hist_filter = argv[0];
         }
 
-        if (field_sep && *field_sep == '.') {
-                pr_err("'.' is the only non valid --field-separator argument\n");
-                return -1;
-        }
-
         return __cmd_annotate(&annotate);
 }