merge: http://linuxtv.org/hg/~mkrufky/m920x

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 23 insertions, 7 deletions

diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl
index 4d27fd789..f9f56bd7c 100755
--- a/v4l/scripts/gentree.pl
+++ b/v4l/scripts/gentree.pl
@@ -62,6 +62,7 @@ my %defs = (
 	'I2C_PEC' => 1,
 	'I2C_DF_DUMMY' => 0,
 	'CONFIG_XC3028' => 0,
+	'CONFIG_TUNER_TEA5761' => 0,
 	'I2C_CLASS_TV_ANALOG' => 1,
 	'I2C_CLASS_TV_DIGITAL' => 1);
 
diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl
index 7a1dbacd2..dd4cedee6 100755
--- a/v4l/scripts/hghead.pl
+++ b/v4l/scripts/hghead.pl
@@ -111,7 +111,7 @@ while ($line = <IN>) {
 	}
 
 
-	if ($line =~ m/^(Acked-by|acked-by|Thanks-to|cc|CC|Cc):.*/) {
+	if ($line =~ m/^(Acked-by|Acked-By|acked-by|Thanks-to|cc|CC|Cc):.*/) {
 		$signed="$signed$line";
 		next;
 	}
diff --git a/v4l/scripts/prep_commit_msg.pl b/v4l/scripts/prep_commit_msg.pl
index a4594c7f9..f4047c6ba 100755
--- a/v4l/scripts/prep_commit_msg.pl
+++ b/v4l/scripts/prep_commit_msg.pl
@@ -5,16 +5,31 @@ my $autopatch = shift;
 # Get Hg username from environment
 my $user = $ENV{HGUSER};
 
-# Didn't work? Try the .hgrc file
-if ($user eq "") {
-	open IN, "<$ENV{HOME}/.hgrc";
+sub hgrcuser($)
+{
+	my $file = shift;
+	my $ui = 0;
+	open IN, '<', $file;
 	while (<IN>) {
-		if(/^\s*username\s*=\s*(\S.*)$/) {
-			$user = $1;
-			last;
+		$ui = 1 if (/^\s*\[ui\]/);
+		if ($ui && /^\s*username\s*=\s*(\S.*?)\s*$/) {
+			close IN;
+			return($1);
 		}
 	}
 	close IN;
+	return("");
+}
+
+# Didn't work? Try the repo's .hgrc file
+if ($user eq "") {
+	my $hgroot = `hg root`;
+	chomp($hgroot);
+	$user = hgrcuser("$hgroot/.hg/hgrc");
+}
+# Ok, try ~/.hgrc next
+if ($user eq "") {
+	$user = hgrcuser("$ENV{HOME}/.hgrc");
 }
 
 # Still no luck? Try some other environment variables