diff options
Diffstat (limited to 'tools/patman')
| -rw-r--r-- | tools/patman/README | 5 | ||||
| -rw-r--r-- | tools/patman/checkpatch.py | 5 | ||||
| -rw-r--r-- | tools/patman/series.py | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/tools/patman/README b/tools/patman/README index 86ede78d35c..dc3957ce6fd 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -133,6 +133,11 @@ Series-prefix: prefix Sets the subject prefix. Normally empty but it can be RFC for RFC patches, or RESEND if you are being ignored. +Series-name: name + Sets the name of the series. You don't need to have a name, and + patman does not yet use it, but it is convenient to put the branch + name here to help you keep track of multiple upstreaming efforts. + Cover-letter: This is the patch set title blah blah diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py index a2342771778..d831087d88b 100644 --- a/tools/patman/checkpatch.py +++ b/tools/patman/checkpatch.py @@ -145,8 +145,9 @@ def CheckPatches(verbose, args): if len(problems) != error_count + warning_count: print "Internal error: some problems lost" for item in problems: - print GetWarningMsg(col, item['type'], item['file'], - item['line'], item['msg']) + print GetWarningMsg(col, item['type'], + item.get('file', '<unknown>'), + item.get('line', 0), item['msg']) #print stdout if error_count != 0 or warning_count != 0: str = 'checkpatch.pl found %d error(s), %d warning(s)' % ( diff --git a/tools/patman/series.py b/tools/patman/series.py index ce36b230a36..a283a2d1f4b 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -25,7 +25,7 @@ import gitutil import terminal # Series-xxx tags that we understand -valid_series = ['to', 'cc', 'version', 'changes', 'prefix', 'notes']; +valid_series = ['to', 'cc', 'version', 'changes', 'prefix', 'notes', 'name']; class Series(dict): """Holds information about a patch series, including all tags. @@ -76,7 +76,7 @@ class Series(dict): self[name] = value else: raise ValueError("In %s: line '%s': Unknown 'Series-%s': valid " - "options are %s" % (self.commit.hash, line, name, + "options are %s" % (commit.hash, line, name, ', '.join(valid_series))) def AddCommit(self, commit): |