The patch number 8624 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        [EMAIL PROTECTED]

------

From: Mauro Carvalho Chehab  <[EMAIL PROTECTED]>
Improve scripts to allow developers to add a hint about patch priority


After this patch, a new meta-tag will be added, to give a hint about the 
priority:
low    - patches that add new drivers that aren't ready for kernel, but it 
would be
         interesting to be at the main tree;

normal - Patches that will be merged on the next merge window;

high   - Bug fixes

Priority: normal

Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>


---

 README.patches                 |   19 ++++++++++++++-----
 v4l/scripts/hghead.pl          |   24 +++++++++++++++++++++---
 v4l/scripts/prep_commit_msg.pl |   17 ++++++++---------
 3 files changed, 43 insertions(+), 17 deletions(-)

diff -r af43da54ccb3 -r 7c739269c8b3 README.patches
--- a/README.patches    Tue Aug 05 09:30:41 2008 -0300
+++ b/README.patches    Tue Aug 05 10:00:02 2008 -0300
@@ -1,5 +1,5 @@ Mauro Carvalho Chehab <mchehab at infrad
 Mauro Carvalho Chehab <mchehab at infradead dot org>
-                                       Updated on 2008 June, 29
+                                       Updated on 2008 August, 5
 
 This file describes the general procedures used by the LinuxTV team (*)
 and by the v4l-dvb community.
@@ -149,6 +149,8 @@ b) All commits at mercurial trees should
 
           This "patch" does nothing.
 
+          Priority: normal
+
           Signed-off-by: nowhere <[EMAIL PROTECTED]>
 
    All lines starting with # and all lines starting with HG: will be
@@ -160,10 +162,17 @@ b) All commits at mercurial trees should
    From: line shouldn't be omitted, since it will be used for the
    patch author when converting to -git.
 
-c) Since June, 1st, 2007, all patches are requested to have their coding style
-   validated by using script/checkpatch.pl. This check runs automatically by
-   using "make commit". By default, it will try to use the newest version of
-   the script, between the kernel one and a copy at v4l-dvb development tree.
+   Priority: meta-tag will be used as a hint to the subsystem maintainer, to 
help him to 
+   identify if the patch is an improvement or board addition ("normal"), that 
will follow 
+   the normal lifecycle of a patch (e.g. will be sent upstream on the next 
merge tree), if 
+   the patch is a bug fix tree for a while without merging upstream ("low").
+
+   Valid values for "Priority:" are "low", "normal" and "high".
+
+c) All patches are requested to have their coding style validated by using 
+   script/checkpatch.pl. This check runs automatically by using "make commit". 
By default, 
+   it will try to use the newest version of the script, between the kernel one 
and a copy 
+   at v4l-dvb development tree.
 
    It is always a good idea to use in-kernel version, since additional tests
    are performed (like checking for the usage of deprecated API's that are
diff -r af43da54ccb3 -r 7c739269c8b3 v4l/scripts/hghead.pl
--- a/v4l/scripts/hghead.pl     Tue Aug 05 09:30:41 2008 -0300
+++ b/v4l/scripts/hghead.pl     Tue Aug 05 10:00:02 2008 -0300
@@ -19,6 +19,7 @@ my $maintainer_email=$ENV{CHANGE_LOG_EMA
 my $maintainer_email=$ENV{CHANGE_LOG_EMAIL_ADDRESS};
 my $from="";
 my $body="";
+my $priority="";
 my $signed="";
 my $fromname="";
 
@@ -64,8 +65,8 @@ while ($line = <IN>) {
 
        my $tag=$line;
        my $arg=$line;
-       $tag =~ s/\s*([^\s]+:)(.*)\n/\1/;
-       $arg =~ s/\s*([^\s]+:)(.*)\n/\2/;
+       $tag =~ s/\s*([^\s]+:)\s*(.*)\n/\1/;
+       $arg =~ s/\s*([^\s]+:)\s*(.*)\n/\2/;
 
        $tag =~ tr/A-Z/a-z/;
 
@@ -96,6 +97,19 @@ while ($line = <IN>) {
                next;
        }
 
+       if ($tag =~ m/^priority:/) {
+               $arg =~ tr/A-Z/a-z/;
+
+               # Replace the -git branch names for high/normal/low
+               $arg =~ s/^fixes$/high/;
+               $arg =~ s/^fix$/high/;
+               $arg =~ s/^working$/normal/;
+               $arg =~ s/^work$/normal/;
+               $arg =~ s/^pending$/low/;
+               $priority = "Priority: $arg";
+               next;
+       }
+
        if ($line =~ m;^ .*\/.*\| *[0-9]*;) {
                next;
        }
@@ -196,8 +210,12 @@ if (!$signed =~ m/$from/) {
 $subject=~s/^[\n\s]+//;
 $subject=~s/[\n\s]+$//;
 
-$body=~s/^[\n\s]+//;
+$body=~s/^[\n]+//;
 $body=~s/[\n\s]+$//;
+
+if ($priority ne "") {
+       $body="$body\n\n$priority";
+}
 
 $body="$body\n\n$signed";
 
diff -r af43da54ccb3 -r 7c739269c8b3 v4l/scripts/prep_commit_msg.pl
--- a/v4l/scripts/prep_commit_msg.pl    Tue Aug 05 09:30:41 2008 -0300
+++ b/v4l/scripts/prep_commit_msg.pl    Tue Aug 05 10:00:02 2008 -0300
@@ -128,21 +128,20 @@ if ($diff eq 'qdiff') {
 }
 print <<"EOF";
 #
-# For better log display, please keep a blank line after subject, after from,
-# and before signed-off-by.
-# First line should be the subject, without Subject:
-#
+# Patch Subject (a brief description with less than 74 chars):
 
 
-# Now, patch author (just the main one), on a From: field
-# Please change below if the committer is not the patch author.
-#
+# From Line, identifying the name of the patch author
 From: $user
 
-# Then a detailed description:
+# A detailed description:
 
+# NEW: Please change the priority of the patch to "high" if the patch is
+#      a bug fix, or are meant to be applied at the first upstream
+#      version of a new driver whose changes don't depend on changes on
+#      core modules
+Priority: normal
 
 # At the end Signed-off-by: fields by patch author and committer, at least.
-#
 Signed-off-by: $user
 EOF


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/7c739269c8b34a8e0153a896b6a5afe8e608e4ad

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to