4 files changed, 192 insertions, 8 deletions
diff --git a/v4l/scripts/check.pl b/v4l/scripts/check.pl
index 4958e281b..975041c4a 100755
--- a/v4l/scripts/check.pl
+++ b/v4l/scripts/check.pl
@@ -87,6 +87,10 @@ $pwd =~ s|/[^/]+\n$||;
 
 sub print_err()
 {
+	if ($err =~ m/LINUX_VERSION_CODE/) {
+		return;
+	}
+
 	if ($err) {
 		printf STDERR "%s/%s: In '%s':\n", $pwd, $file, $errline;
 		printf STDERR "%s/%s:%d: %s\n", $pwd, $file, $ln_numb, $err;
diff --git a/v4l/scripts/checkpatch.pl b/v4l/scripts/checkpatch.pl
index 2d5ece798..b28d2b0f3 100755
--- a/v4l/scripts/checkpatch.pl
+++ b/v4l/scripts/checkpatch.pl
@@ -1937,13 +1937,13 @@ sub process {
 					    ($op eq '>' &&
 					     $ca =~ /<\S+\@\S+$/))
 					{
-					    	$ok = 1;
+						$ok = 1;
 					}
 
 					# Ignore ?:
 					if (($opv eq ':O' && $ca =~ /\?$/) ||
 					    ($op eq '?' && $cc =~ /^:/)) {
-					    	$ok = 1;
+						$ok = 1;
 					}
 
 					if ($ok == 0) {
diff --git a/v4l/scripts/do_merge.pl b/v4l/scripts/do_merge.pl
new file mode 100755
index 000000000..0a4433a21
--- /dev/null
+++ b/v4l/scripts/do_merge.pl
@@ -0,0 +1,175 @@
+#!/usr/bin/perl
+
+my $merge_tree=shift or die "Should specify the pulled tree";
+
+sub hgrcuser($)
+{
+	my $file = shift;
+	my $ui = 0;
+	open IN, '<', $file;
+	while (<IN>) {
+		$ui = 1 if (/^\s*\[ui\]/);
+		if ($ui && /^\s*username\s*=\s*(\S.*?)\s*$/) {
+			close IN;
+			return($1);
+		}
+	}
+	close IN;
+	return("");
+}
+
+sub check_heads()
+{
+	my $count=0;
+	open IN, 'hg heads|';
+	while (<IN>) {
+		if (m/^[Cc]hangeset:/) {
+			$count++;
+		}
+	}
+	close IN;
+	return $count;
+}
+
+sub curr_changeset()
+{
+	my $changeset = -1;
+
+	open IN, 'hg heads|';
+	while (<IN>) {
+		if (m/^[Cc]hangeset:\s*(\d+)/) {
+			if ($changeset < 0) {
+				$changeset = $1;
+			} else {
+				if ($1 < $changeset) {
+					$changeset = $1;
+				}
+			}
+		}
+	}
+	close IN;
+	return $changeset;
+}
+
+sub check_status()
+{
+	my $count=0;
+	open IN, 'hg status -m -a -d -r|';
+	while (<IN>) {
+		$count++;
+	}
+	close IN;
+	return $count;
+}
+
+sub rollback()
+{
+	print "Rolling back hg pull $merge_tree\n";
+	system("hg rollback");
+	system("hg update -C");
+	exit -1;
+}
+
+####################
+# Determine username
+
+# Get Hg username from environment
+my $user = $ENV{HGUSER};
+
+# 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
+if ($user eq "") {
+	my $name = $ENV{CHANGE_LOG_NAME};
+	my $email = $ENV{CHANGE_LOG_EMAIL_ADDRESS};
+	$user = "$name <$email>" if ($name ne "" || $email ne "");
+}
+
+# Last try to come up with something
+if ($user eq "") {
+	print "User not known. Can't procceed\n";
+	exit -1;
+}
+
+######################
+# Do some sanity tests
+
+print "Checking if everything is ok, before applying the new tree.\n";
+
+my $n_heads = check_heads();
+die "Your tree currently have more than one head (it has $n_heads heads). Can't procceed\n" if ($n_heads > 1);
+
+my $dirty = check_status();
+die "Your tree currently has changes. Can't procceed\n" if ($dirty);
+
+my $curr_cs = curr_changeset();
+
+###########
+# Pull tree
+
+print "hg pull $merge_tree\n";
+
+my $ret = system("hg pull $merge_tree");
+die "Couldn't pull from $merge_tree\n" if ($ret);
+
+#############################
+# Merge and commit, if needed
+
+$n_heads = check_heads();
+if ($n_heads > 2) {
+	print "The merged tree have more than one head (it has $n_heads heads). Can't procceed.\n";
+	rollback();
+}
+
+if ($n_heads == 2) {
+	print "Merging the new changesets\n";
+
+	$ret = system("hg merge");
+	if ($ret) {
+		print "hg merge failed. Can't procceed.\n";
+		rollback();
+	}
+
+	print "Committing the new tree\n";
+	# Write the commit message
+	$msg= "merge: $merge_tree\n\nFrom: $user\n\nSigned-off-by: $user\n";
+	$ret=system("hg commit -m '$msg'");
+	if ($ret) {
+		print "hg commit failed. Can't procceed.\n";
+		rollback();
+	}
+}
+
+#####################
+# Test resulting tree
+
+print "Testing if the build didn't break compilation. Only errors and warnings will be displayed. Please wait.\n";
+$ret = system ('make all|egrep -v "^\s*CC"|egrep -v "^\s*LD"');
+if ($ret) {
+	print "Build failed. Can't procceed.\n";
+
+	# To avoid the risk of doing something really bad, let's ask the user to run hg strip
+	print "Your tree is dirty. Since hg has only one rollback level, you'll need to use, instead:";
+	print "\thg strip $curr_cs; hg update -C";
+	print "You'll need to have hg mq extension enabled for hg strip to work.\n";
+
+	exit -1;
+}
+
+##############################
+# Everything is ok, let's push
+
+print "Pushing the new tree at the remote repository specified at .hg/hgrc\n";
+$ret=system ("hg push");
+if ($ret) {
+	print "hg push failed. Don't forget to do the push later.\n";
+}
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 57c663c00..cfe53a636 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -277,11 +277,13 @@ sub open_kconfig($$) {
 	my $in_help = 0;
 	my $default_seen = 0;
 	my $if;
+	my $line;
 
 	print "Opening $file\n" if $debug;
 	open $in, '<', $file or die "File not found: $file";
 	push @kconfigfiles, $file;
 	while (<$in>) {
+		$line = $_;
 		# In our Kconfig files, the first non-help line after the
 		# help text always has no indention.  Technically, the
 		# help text is ended by just by the indention decreasing,
@@ -303,7 +305,7 @@ sub open_kconfig($$) {
 					print OUT "\tdefault n\n";
 				}
 				print OUT "\tdepends on VIDEO_KERNEL_VERSION\n";
-				$_ = sprintf($disabled_msg, $minver{$key});
+				$line = sprintf($disabled_msg, $minver{$key});
 			}
 			next;
 		}
@@ -319,10 +321,13 @@ sub open_kconfig($$) {
 		}
 		next if (/^\s*#/ || /^\s*$/); # skip comments and blank lines
 
+		# Erase any comments on this line
+		s/(?<!\\)#(.*)$//;
+
 		if (m|^\s*source\s+"([^"]+)"\s*$| ||
 		    m|^\s*source\s+(\S+)\s*$|) {
 			open_kconfig($dir, "$dir/$1");
-			$_ = '';	# don't print the source line itself
+			$line = '';	# don't print the source line itself
 			next;
 		}
 
@@ -453,13 +458,13 @@ sub open_kconfig($$) {
 
 			if ($disabled) {
 				$default_seen = 1;
-				$_ = "\tdefault n\n";
+				$line = "\tdefault n\n";
 			}
 		} else {
 			print "Skipping $file:$. $_" if $debug;
 		}
 	} continue {
-		print OUT $_;
+		print OUT $line;
 	}
 	close $in;
 }
@@ -571,8 +576,8 @@ config VIDEO_KERNEL_VERSION
 	  requiring a newer kernel is that no one has tested them with an
 	  older one yet.
 
-	   If the driver works, please post a report at V4L mailing list:
-			video4linux-list\@redhat.com.
+	  If the driver works, please post a report to the V4L mailing list:
+			 linux-media\@vger.kernel.org.
 
 	  Unless you know what you are doing, you should answer N.