[PATCH 0/6] 'git svn info' fixes

[PATCH 0/6] 'git svn info' fixes

[Thomas Rast]

Actually, I only wanted to do 5/6 (git svn info: make info relative to
the current directory).  This seemed like a fairly simple change, see
the corresponding mail.

However, I also wanted to provide tests, and that's where the fun
started.  Turns out t9119-git-svn-info.sh is currently quite broken.
1-4 just fix the tests; a brief summary:

[1/6] git svn info: tests: let 'init' test run with SVN 1.5

  The tests do not report any problems with 1.5.

[2/6] git svn info: tests: do not use set -e

  No idea how 'set -e' ever got in there; it completely breaks the
  test script in case of an error.

[3/6] git svn info: tests: use test_cmp instead of git-diff

  git-diff does not correctly report the exit status (IIRC that is
  caused by the pager setup code?), which used to hide a lot of
  errors.

[4/6] git svn info: tests: fix ptouch argument order in setup

  Swapped arguments caused ptouch to fail and tests to break.

Yes, I'm just whoring commit karma here, so feel free to squash these
four into one if you like it better that way.

After these, 22 of 37 tests (all except --url, plus all unknown files)
fail. Most of them are caused by 'git svn info' not URL-encoding the
URL and Repository fields in the output, as SVN does.  6/6 fixes
this.

However, the unknown files tests still fail, simply because 'svn info'
itself fails on untracked files.  It would be great if someone who is
still running SVN 1.4 could check whether that has been a bug in
git-svn all along, or is actually a behaviour change on the part of
SVN.

Oh, and let's hope I did the splitting right this time :-)


 git-svn.perl            |   30 +++++++++++--
 t/t9119-git-svn-info.sh |  102 ++++++++++++++++++++++++++---------------------
 2 files changed, 82 insertions(+), 50 deletions(-)

[PATCH 1/6] git svn info: tests: let 'init' test run with SVN 1.5

[Thomas Rast]

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
 t/t9119-git-svn-info.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index 5fd36a1..46676bc 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -9,9 +9,9 @@ test_description='git-svn info'
 set -e
 
 # Tested with: svn, version 1.4.4 (r25188)
-v=`svn --version | sed -n -e 's/^svn, version \(1\.4\.[0-9]\).*$/\1/p'`
+v=`svn --version | sed -n -e 's/^svn, version \(1\.[0-9]*\.[0-9]*\).*$/\1/p'`
 case $v in
-1.4.*)
+1.[45].*)
 	;;
 *)
 	say "skipping svn-info test (SVN version: $v not supported)"
-- 
1.6.0.1.96.g9307e.dirty

[PATCH 2/6] git svn info: tests: do not use set -e

[Thomas Rast]

Exiting in the middle of a test confuses the test suite, which will
just say "FATAL: Unexpected exit with code 1" in response to a failed
test, instead of actually diagnosing failure and continuing with the
next test.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
 t/t9119-git-svn-info.sh |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index 46676bc..a70f2b9 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -6,8 +6,6 @@ test_description='git-svn info'
 
 . ./lib-git-svn.sh
 
-set -e
-
 # Tested with: svn, version 1.4.4 (r25188)
 v=`svn --version | sed -n -e 's/^svn, version \(1\.[0-9]*\.[0-9]*\).*$/\1/p'`
 case $v in
-- 
1.6.0.1.96.g9307e.dirty

[PATCH 3/6] git svn info: tests: use test_cmp instead of git-diff

[Thomas Rast]

git-diff does not appear to return the correct exit values, and gives
a false success for more than half (!) of the tests due to the space
in "trash directory" which git-svn fails to encode.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
 t/t9119-git-svn-info.sh |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index a70f2b9..7798dcc 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -60,7 +60,7 @@ test_expect_success 'setup repository and import' '
 test_expect_success 'info' "
 	(cd svnwc; svn info) > expected.info &&
 	(cd gitwc; git-svn info) > actual.info &&
-	git-diff expected.info actual.info
+	test_cmp expected.info actual.info
 	"
 
 test_expect_success 'info --url' '
@@ -70,7 +70,7 @@ test_expect_success 'info --url' '
 test_expect_success 'info .' "
 	(cd svnwc; svn info .) > expected.info-dot &&
 	(cd gitwc; git-svn info .) > actual.info-dot &&
-	git-diff expected.info-dot actual.info-dot
+	test_cmp expected.info-dot actual.info-dot
 	"
 
 test_expect_success 'info --url .' '
@@ -80,7 +80,7 @@ test_expect_success 'info --url .' '
 test_expect_success 'info file' "
 	(cd svnwc; svn info file) > expected.info-file &&
 	(cd gitwc; git-svn info file) > actual.info-file &&
-	git-diff expected.info-file actual.info-file
+	test_cmp expected.info-file actual.info-file
 	"
 
 test_expect_success 'info --url file' '
@@ -90,7 +90,7 @@ test_expect_success 'info --url file' '
 test_expect_success 'info directory' "
 	(cd svnwc; svn info directory) > expected.info-directory &&
 	(cd gitwc; git-svn info directory) > actual.info-directory &&
-	git-diff expected.info-directory actual.info-directory
+	test_cmp expected.info-directory actual.info-directory
 	"
 
 test_expect_success 'info --url directory' '
@@ -100,7 +100,7 @@ test_expect_success 'info --url directory' '
 test_expect_success 'info symlink-file' "
 	(cd svnwc; svn info symlink-file) > expected.info-symlink-file &&
 	(cd gitwc; git-svn info symlink-file) > actual.info-symlink-file &&
-	git-diff expected.info-symlink-file actual.info-symlink-file
+	test_cmp expected.info-symlink-file actual.info-symlink-file
 	"
 
 test_expect_success 'info --url symlink-file' '
@@ -113,7 +113,7 @@ test_expect_success 'info symlink-directory' "
 		> expected.info-symlink-directory &&
 	(cd gitwc; git-svn info symlink-directory) \
 		> actual.info-symlink-directory &&
-	git-diff expected.info-symlink-directory actual.info-symlink-directory
+	test_cmp expected.info-symlink-directory actual.info-symlink-directory
 	"
 
 test_expect_success 'info --url symlink-directory' '
@@ -133,7 +133,7 @@ test_expect_success 'info added-file' "
 	cd .. &&
 	(cd svnwc; svn info added-file) > expected.info-added-file &&
 	(cd gitwc; git-svn info added-file) > actual.info-added-file &&
-	git-diff expected.info-added-file actual.info-added-file
+	test_cmp expected.info-added-file actual.info-added-file
 	"
 
 test_expect_success 'info --url added-file' '
@@ -155,7 +155,7 @@ test_expect_success 'info added-directory' "
 		> expected.info-added-directory &&
 	(cd gitwc; git-svn info added-directory) \
 		> actual.info-added-directory &&
-	git-diff expected.info-added-directory actual.info-added-directory
+	test_cmp expected.info-added-directory actual.info-added-directory
 	"
 
 test_expect_success 'info --url added-directory' '
@@ -177,7 +177,7 @@ test_expect_success 'info added-symlink-file' "
 		> expected.info-added-symlink-file &&
 	(cd gitwc; git-svn info added-symlink-file) \
 		> actual.info-added-symlink-file &&
-	git-diff expected.info-added-symlink-file \
+	test_cmp expected.info-added-symlink-file \
 		 actual.info-added-symlink-file
 	"
 
@@ -200,7 +200,7 @@ test_expect_success 'info added-symlink-directory' "
 		> expected.info-added-symlink-directory &&
 	(cd gitwc; git-svn info added-symlink-directory) \
 		> actual.info-added-symlink-directory &&
-	git-diff expected.info-added-symlink-directory \
+	test_cmp expected.info-added-symlink-directory \
 		 actual.info-added-symlink-directory
 	"
 
@@ -227,7 +227,7 @@ test_expect_success 'info deleted-file' "
 	(cd gitwc; git-svn info file) |
 	sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
 		> actual.info-deleted-file &&
-	git-diff expected.info-deleted-file actual.info-deleted-file
+	test_cmp expected.info-deleted-file actual.info-deleted-file
 	"
 
 test_expect_success 'info --url file (deleted)' '
@@ -248,7 +248,7 @@ test_expect_success 'info deleted-directory' "
 	(cd gitwc; git-svn info directory) |
 	sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
 		> actual.info-deleted-directory &&
-	git-diff expected.info-deleted-directory actual.info-deleted-directory
+	test_cmp expected.info-deleted-directory actual.info-deleted-directory
 	"
 
 test_expect_success 'info --url directory (deleted)' '
@@ -269,7 +269,7 @@ test_expect_success 'info deleted-symlink-file' "
 	(cd gitwc; git-svn info symlink-file) |
 	sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
 		> actual.info-deleted-symlink-file &&
-	git-diff expected.info-deleted-symlink-file \
+	test_cmp expected.info-deleted-symlink-file \
 		 actual.info-deleted-symlink-file
 	"
 
@@ -291,7 +291,7 @@ test_expect_success 'info deleted-symlink-directory' "
 	(cd gitwc; git-svn info symlink-directory) |
 	sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
 		 > actual.info-deleted-symlink-directory &&
-	git-diff expected.info-deleted-symlink-directory \
+	test_cmp expected.info-deleted-symlink-directory \
 		 actual.info-deleted-symlink-directory
 	"
 
@@ -309,13 +309,13 @@ test_expect_success 'info unknown-file' "
 	ptouch gitwc/unknown-file svnwc/unknown-file &&
 	(cd svnwc; svn info unknown-file) 2> expected.info-unknown-file &&
 	(cd gitwc; git-svn info unknown-file) 2> actual.info-unknown-file &&
-	git-diff expected.info-unknown-file actual.info-unknown-file
+	test_cmp expected.info-unknown-file actual.info-unknown-file
 	"
 
 test_expect_success 'info --url unknown-file' '
 	test -z "$(cd gitwc; git-svn info --url unknown-file \
 			2> ../actual.info--url-unknown-file)" &&
-	git-diff expected.info-unknown-file actual.info--url-unknown-file
+	test_cmp expected.info-unknown-file actual.info--url-unknown-file
 	'
 
 test_expect_success 'info unknown-directory' "
@@ -326,13 +326,13 @@ test_expect_success 'info unknown-directory' "
 		2> expected.info-unknown-directory &&
 	(cd gitwc; git-svn info unknown-directory) \
 		2> actual.info-unknown-directory &&
-	git-diff expected.info-unknown-directory actual.info-unknown-directory
+	test_cmp expected.info-unknown-directory actual.info-unknown-directory
 	"
 
 test_expect_success 'info --url unknown-directory' '
 	test -z "$(cd gitwc; git-svn info --url unknown-directory \
 			2> ../actual.info--url-unknown-directory)" &&
-	git-diff expected.info-unknown-directory \
+	test_cmp expected.info-unknown-directory \
 		 actual.info--url-unknown-directory
 	'
 
@@ -348,14 +348,14 @@ test_expect_success 'info unknown-symlink-file' "
 		2> expected.info-unknown-symlink-file &&
 	(cd gitwc; git-svn info unknown-symlink-file) \
 		2> actual.info-unknown-symlink-file &&
-	git-diff expected.info-unknown-symlink-file \
+	test_cmp expected.info-unknown-symlink-file \
 		 actual.info-unknown-symlink-file
 	"
 
 test_expect_success 'info --url unknown-symlink-file' '
 	test -z "$(cd gitwc; git-svn info --url unknown-symlink-file \
 			2> ../actual.info--url-unknown-symlink-file)" &&
-	git-diff expected.info-unknown-symlink-file \
+	test_cmp expected.info-unknown-symlink-file \
 		 actual.info--url-unknown-symlink-file
 	'
 
@@ -372,14 +372,14 @@ test_expect_success 'info unknown-symlink-directory' "
 		2> expected.info-unknown-symlink-directory &&
 	(cd gitwc; git-svn info unknown-symlink-directory) \
 		2> actual.info-unknown-symlink-directory &&
-	git-diff expected.info-unknown-symlink-directory \
+	test_cmp expected.info-unknown-symlink-directory \
 		 actual.info-unknown-symlink-directory
 	"
 
 test_expect_success 'info --url unknown-symlink-directory' '
 	test -z "$(cd gitwc; git-svn info --url unknown-symlink-directory \
 			2> ../actual.info--url-unknown-symlink-directory)" &&
-	git-diff expected.info-unknown-symlink-directory \
+	test_cmp expected.info-unknown-symlink-directory \
 		 actual.info--url-unknown-symlink-directory
 	'
 
-- 
1.6.0.1.96.g9307e.dirty

[PATCH 4/6] git svn info: tests: fix ptouch argument order in setup

[Thomas Rast]

The arguments must be <gitwc-path> <svnwc-path>, otherwise it fails to
update the timestamps (without setting a failure exit code) and
results in bad test output later on.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
 t/t9119-git-svn-info.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index 7798dcc..821507d 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -51,10 +51,10 @@ test_expect_success 'setup repository and import' '
 		git-svn fetch &&
 	cd .. &&
 	svn co "$svnrepo" svnwc &&
-	ptouch svnwc/file gitwc/file &&
-	ptouch svnwc/directory gitwc/directory &&
-	ptouch svnwc/symlink-file gitwc/symlink-file &&
-	ptouch svnwc/symlink-directory gitwc/symlink-directory
+	ptouch gitwc/file svnwc/file &&
+	ptouch gitwc/directory svnwc/directory &&
+	ptouch gitwc/symlink-file svnwc/symlink-file &&
+	ptouch gitwc/symlink-directory svnwc/symlink-directory
 	'
 
 test_expect_success 'info' "
-- 
1.6.0.1.96.g9307e.dirty

[PATCH 5/6] git svn info: make info relative to the current directory

[Thomas Rast]

Previously 'git svn info <path>' would always treat the <path> as
relative to the working directory root, with a default of ".".  This
does not match the behaviour of 'svn info'.  Prepend $(git rev-parse
--show-prefix) to the path used inside cmd_info to make it relative to
the current working directory.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---

I realise that this might break things for people who rely on the
current behaviour, but looking at the tests, the goal is to imitate
'svn info' as closely as possible.  This also matches my use case of
'svn info || git svn info', which is why I stumbled over the problem
in the first place.


 git-svn.perl            |    5 +++--
 t/t9119-git-svn-info.sh |   14 +++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 7a1d26d..46bc0b0 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -805,6 +805,7 @@ sub cmd_commit_diff {
 
 sub cmd_info {
 	my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
+	my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
 	if (exists $_[1]) {
 		die "Too many arguments specified\n";
 	}
@@ -825,7 +826,7 @@ sub cmd_info {
 	# canonicalize_path() will return "" to make libsvn 1.5.x happy,
 	$path = "." if $path eq "";
 
-	my $full_url = $url . ($path eq "." ? "" : "/$path");
+	my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
 
 	if ($_url) {
 		print $full_url, "\n";
@@ -861,7 +862,7 @@ sub cmd_info {
 	}
 
 	my ($lc_author, $lc_rev, $lc_date_utc);
-	my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $path);
+	my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
 	my $log = command_output_pipe(@args);
 	my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
 	while (<$log>) {
diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index 821507d..8709bcc 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -45,12 +45,18 @@ test_expect_success 'setup repository and import' '
 		ln -s directory symlink-directory &&
 		svn import -m "initial" . "$svnrepo" &&
 	cd .. &&
+	svn co "$svnrepo" svnwc &&
+	cd svnwc &&
+		echo foo > foo &&
+		svn add foo &&
+		svn commit -m "change outside directory" &&
+		svn update &&
+	cd .. &&
 	mkdir gitwc &&
 	cd gitwc &&
 		git-svn init "$svnrepo" &&
 		git-svn fetch &&
 	cd .. &&
-	svn co "$svnrepo" svnwc &&
 	ptouch gitwc/file svnwc/file &&
 	ptouch gitwc/directory svnwc/directory &&
 	ptouch gitwc/symlink-file svnwc/symlink-file &&
@@ -93,6 +99,12 @@ test_expect_success 'info directory' "
 	test_cmp expected.info-directory actual.info-directory
 	"
 
+test_expect_success 'info inside directory' "
+	(cd svnwc/directory; svn info) > expected.info-inside-directory &&
+	(cd gitwc/directory; git-svn info) > actual.info-inside-directory &&
+	test_cmp expected.info-inside-directory actual.info-inside-directory
+	"
+
 test_expect_success 'info --url directory' '
 	test "$(cd gitwc; git-svn info --url directory)" = "$svnrepo/directory"
 	'
-- 
1.6.0.1.96.g9307e.dirty

[PATCH 6/6] git svn info: always quote URLs in 'info' output

[Thomas Rast]

Changes 'git svn info' to always URL-escape the 'URL' and 'Repository'
fields and --url output, like SVN (at least 1.5) does.

Note that reusing the escape_url() further down in Git::SVN::Ra is not
possible because it only triggers for http(s) URLs.  I did not know
whether extending it to all schemes would break SVN access anywhere,
so I made a new one that quotes in all schemes.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---

I wasn't sure if I should quote --url too.  It is not an 'svn info'
feature, so we could do it either way.  Eventually I decided for the
change to be consistent with the 'URL:' field of normal output.  If
this breaks scripts for someone, I can change it back.

 git-svn.perl            |   25 ++++++++++++++++++++++---
 t/t9119-git-svn-info.sh |   30 ++++++++++++++++--------------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 46bc0b0..11ff813 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -803,6 +803,25 @@ sub cmd_commit_diff {
 	}
 }
 
+sub escape_uri_only {
+	my ($uri) = @_;
+	my @tmp;
+	foreach (split m{/}, $uri) {
+		s/([^\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
+		push @tmp, $_;
+	}
+	join('/', @tmp);
+}
+
+sub escape_url {
+	my ($url) = @_;
+	if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
+		my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
+		$url = "$scheme://$domain$uri";
+	}
+	$url;
+}
+
 sub cmd_info {
 	my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
 	my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
@@ -829,18 +848,18 @@ sub cmd_info {
 	my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
 
 	if ($_url) {
-		print $full_url, "\n";
+		print escape_url($full_url), "\n";
 		return;
 	}
 
 	my $result = "Path: $path\n";
 	$result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
-	$result .= "URL: " . $full_url . "\n";
+	$result .= "URL: " . escape_url($full_url) . "\n";
 
 	eval {
 		my $repos_root = $gs->repos_root;
 		Git::SVN::remove_username($repos_root);
-		$result .= "Repository Root: $repos_root\n";
+		$result .= "Repository Root: " . escape_url($repos_root) . "\n";
 	};
 	if ($@) {
 		$result .= "Repository Root: (offline)\n";
diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index 8709bcc..1811010 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -34,6 +34,8 @@ ptouch() {
 	' "`svn info $2 | grep '^Text Last Updated:'`" "$1"
 }
 
+quoted_svnrepo="$(echo $svnrepo | sed 's/ /%20/')"
+
 test_expect_success 'setup repository and import' '
 	mkdir info &&
 	cd info &&
@@ -70,7 +72,7 @@ test_expect_success 'info' "
 	"
 
 test_expect_success 'info --url' '
-	test "$(cd gitwc; git-svn info --url)" = "$svnrepo"
+	test "$(cd gitwc; git-svn info --url)" = "$quoted_svnrepo"
 	'
 
 test_expect_success 'info .' "
@@ -80,7 +82,7 @@ test_expect_success 'info .' "
 	"
 
 test_expect_success 'info --url .' '
-	test "$(cd gitwc; git-svn info --url .)" = "$svnrepo"
+	test "$(cd gitwc; git-svn info --url .)" = "$quoted_svnrepo"
 	'
 
 test_expect_success 'info file' "
@@ -90,7 +92,7 @@ test_expect_success 'info file' "
 	"
 
 test_expect_success 'info --url file' '
-	test "$(cd gitwc; git-svn info --url file)" = "$svnrepo/file"
+	test "$(cd gitwc; git-svn info --url file)" = "$quoted_svnrepo/file"
 	'
 
 test_expect_success 'info directory' "
@@ -106,7 +108,7 @@ test_expect_success 'info inside directory' "
 	"
 
 test_expect_success 'info --url directory' '
-	test "$(cd gitwc; git-svn info --url directory)" = "$svnrepo/directory"
+	test "$(cd gitwc; git-svn info --url directory)" = "$quoted_svnrepo/directory"
 	'
 
 test_expect_success 'info symlink-file' "
@@ -117,7 +119,7 @@ test_expect_success 'info symlink-file' "
 
 test_expect_success 'info --url symlink-file' '
 	test "$(cd gitwc; git-svn info --url symlink-file)" \
-	     = "$svnrepo/symlink-file"
+	     = "$quoted_svnrepo/symlink-file"
 	'
 
 test_expect_success 'info symlink-directory' "
@@ -130,7 +132,7 @@ test_expect_success 'info symlink-directory' "
 
 test_expect_success 'info --url symlink-directory' '
 	test "$(cd gitwc; git-svn info --url symlink-directory)" \
-	     = "$svnrepo/symlink-directory"
+	     = "$quoted_svnrepo/symlink-directory"
 	'
 
 test_expect_success 'info added-file' "
@@ -150,7 +152,7 @@ test_expect_success 'info added-file' "
 
 test_expect_success 'info --url added-file' '
 	test "$(cd gitwc; git-svn info --url added-file)" \
-	     = "$svnrepo/added-file"
+	     = "$quoted_svnrepo/added-file"
 	'
 
 test_expect_success 'info added-directory' "
@@ -172,7 +174,7 @@ test_expect_success 'info added-directory' "
 
 test_expect_success 'info --url added-directory' '
 	test "$(cd gitwc; git-svn info --url added-directory)" \
-	     = "$svnrepo/added-directory"
+	     = "$quoted_svnrepo/added-directory"
 	'
 
 test_expect_success 'info added-symlink-file' "
@@ -195,7 +197,7 @@ test_expect_success 'info added-symlink-file' "
 
 test_expect_success 'info --url added-symlink-file' '
 	test "$(cd gitwc; git-svn info --url added-symlink-file)" \
-	     = "$svnrepo/added-symlink-file"
+	     = "$quoted_svnrepo/added-symlink-file"
 	'
 
 test_expect_success 'info added-symlink-directory' "
@@ -218,7 +220,7 @@ test_expect_success 'info added-symlink-directory' "
 
 test_expect_success 'info --url added-symlink-directory' '
 	test "$(cd gitwc; git-svn info --url added-symlink-directory)" \
-	     = "$svnrepo/added-symlink-directory"
+	     = "$quoted_svnrepo/added-symlink-directory"
 	'
 
 # The next few tests replace the "Text Last Updated" value with a
@@ -244,7 +246,7 @@ test_expect_success 'info deleted-file' "
 
 test_expect_success 'info --url file (deleted)' '
 	test "$(cd gitwc; git-svn info --url file)" \
-	     = "$svnrepo/file"
+	     = "$quoted_svnrepo/file"
 	'
 
 test_expect_success 'info deleted-directory' "
@@ -265,7 +267,7 @@ test_expect_success 'info deleted-directory' "
 
 test_expect_success 'info --url directory (deleted)' '
 	test "$(cd gitwc; git-svn info --url directory)" \
-	     = "$svnrepo/directory"
+	     = "$quoted_svnrepo/directory"
 	'
 
 test_expect_success 'info deleted-symlink-file' "
@@ -287,7 +289,7 @@ test_expect_success 'info deleted-symlink-file' "
 
 test_expect_success 'info --url symlink-file (deleted)' '
 	test "$(cd gitwc; git-svn info --url symlink-file)" \
-	     = "$svnrepo/symlink-file"
+	     = "$quoted_svnrepo/symlink-file"
 	'
 
 test_expect_success 'info deleted-symlink-directory' "
@@ -309,7 +311,7 @@ test_expect_success 'info deleted-symlink-directory' "
 
 test_expect_success 'info --url symlink-directory (deleted)' '
 	test "$(cd gitwc; git-svn info --url symlink-directory)" \
-	     = "$svnrepo/symlink-directory"
+	     = "$quoted_svnrepo/symlink-directory"
 	'
 
 # NOTE: git does not have the concept of replaced objects,
-- 
1.6.0.1.96.g9307e.dirty

Re: [PATCH 6/6] git svn info: always quote URLs in 'info' output

[Eric Wong]

Thomas Rast <trast@student.ethz.ch> wrote:
> Changes 'git svn info' to always URL-escape the 'URL' and 'Repository'
> fields and --url output, like SVN (at least 1.5) does.
> 
> Note that reusing the escape_url() further down in Git::SVN::Ra is not
> possible because it only triggers for http(s) URLs.  I did not know
> whether extending it to all schemes would break SVN access anywhere,
> so I made a new one that quotes in all schemes.

Thanks for keeping them separate. I seem to recall there being places
where paths must not be escaped in SVN.

-- 
Eric Wong

Re: [PATCH 0/6] 'git svn info' fixes

[Eric Wong]

Thomas Rast <trast@student.ethz.ch> wrote:
> However, I also wanted to provide tests, and that's where the fun
> started.  Turns out t9119-git-svn-info.sh is currently quite broken.
> 1-4 just fix the tests; a brief summary:
> 
> [1/6] git svn info: tests: let 'init' test run with SVN 1.5
> 
>   The tests do not report any problems with 1.5.
> 
> [2/6] git svn info: tests: do not use set -e
> 
>   No idea how 'set -e' ever got in there; it completely breaks the
>   test script in case of an error.

I have a habit of using set -e in my scripts since I often
forget (or am too lazy) to check for errors when executing
a series of commands.

> [4/6] git svn info: tests: fix ptouch argument order in setup
> 
>   Swapped arguments caused ptouch to fail and tests to break.

Hm... I seem to remember explicitly setting the arguments one
way for one reason or another.

> Yes, I'm just whoring commit karma here, so feel free to squash these
> four into one if you like it better that way.
> 
> After these, 22 of 37 tests (all except --url, plus all unknown files)
> fail. Most of them are caused by 'git svn info' not URL-encoding the
> URL and Repository fields in the output, as SVN does.  6/6 fixes
> this.
> 
> However, the unknown files tests still fail, simply because 'svn info'
> itself fails on untracked files.  It would be great if someone who is
> still running SVN 1.4 could check whether that has been a bug in
> git-svn all along, or is actually a behaviour change on the part of
> SVN.

Oops, I upgraded to 1.5.x here already.  I should still have
another machine with 1.4 to check on tomorrow, though.

-- 
Eric Wong

Re: [PATCH 0/6] 'git svn info' fixes

[Thomas Rast]

[-- Attachment #1: Type: text/plain, Size: 983 bytes --]

Eric Wong wrote:
> Thomas Rast <trast@student.ethz.ch> wrote:
> > However, the unknown files tests still fail, simply because 'svn info'
> > itself fails on untracked files.  It would be great if someone who is
> > still running SVN 1.4 could check whether that has been a bug in
> > git-svn all along, or is actually a behaviour change on the part of
> > SVN.
> 
> Oops, I upgraded to 1.5.x here already.  I should still have
> another machine with 1.4 to check on tomorrow, though.

I got a friend with 1.4 to test this, and it appears the error

  $ touch new
  $ svn info new
  new:  (Keine versionierte Ressource)

(literally "not a versioned resource") is already present in

  $ svn --version
  svn, Version 1.4.6 (r28521)

(He also says the error is the same if the file does not exist at
all.)

So should we just change all "unknown foo" tests to verify that 'git
svn info' errors out too?

- Thomas

-- 
Thomas Rast
trast@student.ethz.ch


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH 0/6] 'git svn info' fixes

[Eric Wong]

Thomas Rast <trast@student.ethz.ch> wrote:
> Eric Wong wrote:
> > Thomas Rast <trast@student.ethz.ch> wrote:
> > > However, the unknown files tests still fail, simply because 'svn info'
> > > itself fails on untracked files.  It would be great if someone who is
> > > still running SVN 1.4 could check whether that has been a bug in
> > > git-svn all along, or is actually a behaviour change on the part of
> > > SVN.
> > 
> > Oops, I upgraded to 1.5.x here already.  I should still have
> > another machine with 1.4 to check on tomorrow, though.
> 
> I got a friend with 1.4 to test this, and it appears the error
> 
>   $ touch new
>   $ svn info new
>   new:  (Keine versionierte Ressource)
> 
> (literally "not a versioned resource") is already present in
> 
>   $ svn --version
>   svn, Version 1.4.6 (r28521)
> 
> (He also says the error is the same if the file does not exist at
> all.)

Interesting.

> So should we just change all "unknown foo" tests to verify that 'git
> svn info' errors out too?

Yes, I see no reason to differ from plain svn here.

-- 
Eric Wong

[PATCH 0/2] *** SUBJECT HERE ***

[Thomas Rast]

Eric Wong wrote.
> > So should we just change all "unknown foo" tests to verify that 'git
> > svn info' errors out too?
>
> Yes, I see no reason to differ from plain svn here.

This starts getting more complicated at every turn.  The included
mini-series (probably textually depends on the other 6 patches though)
"fixes" this.

HOWEVER: Subversion itself broke compatibility here.  In 1.4:

  $ svn info new; echo $?
  new:  (Not a versioned resource)

  0

Note the extra linebreak and successful exit.  Current git-svn
precisely matches this output.  In 1.5, it's different:

  $ svn info new; echo $?
  svn: 'new' is not under version control
  1

While it is of course up to you what you would like to do (and modulo
test_must_fail, 2/2 can still be used to fix the tests if you decide
to reject 1/2), I suggest changing to 1.5 behaviour.  exit(1) is the
sane thing to do in this case, and that is already breaking
bit-for-bit compatibility with SVN 1.4, so we might as well adopt the
new error message.  Of course this prevents us from comparing the
output literally in the tests, so I settled for a slightly weaker
check: failure status and mention of the filename.

Unfortunately this does raise the question whether the URL-encoding
issue treated in the other series is in fact a similar incompatibility
between 1.4 and 1.5, not a (minor but long-standing) bug in git-svn.

- Thomas


 git-svn.perl            |    4 +-
 t/t9119-git-svn-info.sh |   73 ++++++++++++++++-------------------------------
 2 files changed, 27 insertions(+), 50 deletions(-)

[PATCH 1/2] git-svn: match SVN 1.5 behaviour of info' on unknown item

[Thomas Rast]

Previously 'git svn info unknown-file' only announced its failure (in
the SVN 1.4 style, "not a versioned resource"), and exited
successfully.

It is desirable to actually exit with failure, so change the code to
exit(1) under this condition.  Since that is already halfway SVN 1.5
compatibility, also change the error output to match 1.5.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
 git-svn.perl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 11ff813..bc181e0 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -832,8 +832,8 @@ sub cmd_info {
 	my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
 
 	if (!$file_type && !$diff_status) {
-		print STDERR "$path:  (Not a versioned resource)\n\n";
-		return;
+		print STDERR "svn: '$path' is not under version control\n";
+		exit 1;
 	}
 
 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
-- 
1.6.0.1.98.g76a24

[PATCH 2/2] git-svn: fix 'info' tests for unknown items

[Thomas Rast]

The previous tests all expected the results from SVN and Git to be
identical, and expected both to return success.  This cannot be
guaranteed: SVN changed the message style between 1.4 and 1.5, and
in 1.5, sets a failure exit code.

Change the tests to verify that 'git svn info <item>' sets a failure
exit code, and that its output contains the file name.  This should
hopefully catch all other errors.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
 t/t9119-git-svn-info.sh |   73 ++++++++++++++++-------------------------------
 1 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index 1811010..3e48459 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -319,82 +319,59 @@ test_expect_success 'info --url symlink-directory (deleted)' '
 
 test_expect_success 'info unknown-file' "
 	echo two > gitwc/unknown-file &&
-	cp gitwc/unknown-file svnwc/unknown-file &&
-	ptouch gitwc/unknown-file svnwc/unknown-file &&
-	(cd svnwc; svn info unknown-file) 2> expected.info-unknown-file &&
-	(cd gitwc; git-svn info unknown-file) 2> actual.info-unknown-file &&
-	test_cmp expected.info-unknown-file actual.info-unknown-file
+	(cd gitwc; test_must_fail git-svn info unknown-file) \
+		 2> actual.info-unknown-file &&
+	grep unknown-file actual.info-unknown-file
 	"
 
 test_expect_success 'info --url unknown-file' '
-	test -z "$(cd gitwc; git-svn info --url unknown-file \
-			2> ../actual.info--url-unknown-file)" &&
-	test_cmp expected.info-unknown-file actual.info--url-unknown-file
+	echo two > gitwc/unknown-file &&
+	(cd gitwc; test_must_fail git-svn info --url unknown-file) \
+		 2> actual.info-url-unknown-file &&
+	grep unknown-file actual.info-url-unknown-file
 	'
 
 test_expect_success 'info unknown-directory' "
 	mkdir gitwc/unknown-directory svnwc/unknown-directory &&
-	ptouch gitwc/unknown-directory svnwc/unknown-directory &&
-	touch gitwc/unknown-directory/.placeholder &&
-	(cd svnwc; svn info unknown-directory) \
-		2> expected.info-unknown-directory &&
-	(cd gitwc; git-svn info unknown-directory) \
-		2> actual.info-unknown-directory &&
-	test_cmp expected.info-unknown-directory actual.info-unknown-directory
+	(cd gitwc; test_must_fail git-svn info unknown-directory) \
+		 2> actual.info-unknown-directory &&
+	grep unknown-directory actual.info-unknown-directory
 	"
 
 test_expect_success 'info --url unknown-directory' '
-	test -z "$(cd gitwc; git-svn info --url unknown-directory \
-			2> ../actual.info--url-unknown-directory)" &&
-	test_cmp expected.info-unknown-directory \
-		 actual.info--url-unknown-directory
+	(cd gitwc; test_must_fail git-svn info --url unknown-directory) \
+		 2> actual.info-url-unknown-directory &&
+	grep unknown-directory actual.info-url-unknown-directory
 	'
 
 test_expect_success 'info unknown-symlink-file' "
 	cd gitwc &&
 		ln -s unknown-file unknown-symlink-file &&
 	cd .. &&
-	cd svnwc &&
-		ln -s unknown-file unknown-symlink-file &&
-	cd .. &&
-	ptouch gitwc/unknown-symlink-file svnwc/unknown-symlink-file &&
-	(cd svnwc; svn info unknown-symlink-file) \
-		2> expected.info-unknown-symlink-file &&
-	(cd gitwc; git-svn info unknown-symlink-file) \
-		2> actual.info-unknown-symlink-file &&
-	test_cmp expected.info-unknown-symlink-file \
-		 actual.info-unknown-symlink-file
+	(cd gitwc; test_must_fail git-svn info unknown-symlink-file) \
+		 2> actual.info-unknown-symlink-file &&
+	grep unknown-symlink-file actual.info-unknown-symlink-file
 	"
 
 test_expect_success 'info --url unknown-symlink-file' '
-	test -z "$(cd gitwc; git-svn info --url unknown-symlink-file \
-			2> ../actual.info--url-unknown-symlink-file)" &&
-	test_cmp expected.info-unknown-symlink-file \
-		 actual.info--url-unknown-symlink-file
+	(cd gitwc; test_must_fail git-svn info --url unknown-symlink-file) \
+		 2> actual.info-url-unknown-symlink-file &&
+	grep unknown-symlink-file actual.info-url-unknown-symlink-file
 	'
 
 test_expect_success 'info unknown-symlink-directory' "
 	cd gitwc &&
 		ln -s unknown-directory unknown-symlink-directory &&
 	cd .. &&
-	cd svnwc &&
-		ln -s unknown-directory unknown-symlink-directory &&
-	cd .. &&
-	ptouch gitwc/unknown-symlink-directory \
-	       svnwc/unknown-symlink-directory &&
-	(cd svnwc; svn info unknown-symlink-directory) \
-		2> expected.info-unknown-symlink-directory &&
-	(cd gitwc; git-svn info unknown-symlink-directory) \
-		2> actual.info-unknown-symlink-directory &&
-	test_cmp expected.info-unknown-symlink-directory \
-		 actual.info-unknown-symlink-directory
+	(cd gitwc; test_must_fail git-svn info unknown-symlink-directory) \
+		 2> actual.info-unknown-symlink-directory &&
+	grep unknown-symlink-directory actual.info-unknown-symlink-directory
 	"
 
 test_expect_success 'info --url unknown-symlink-directory' '
-	test -z "$(cd gitwc; git-svn info --url unknown-symlink-directory \
-			2> ../actual.info--url-unknown-symlink-directory)" &&
-	test_cmp expected.info-unknown-symlink-directory \
-		 actual.info--url-unknown-symlink-directory
+	(cd gitwc; test_must_fail git-svn info --url unknown-symlink-directory) \
+		 2> actual.info-url-unknown-symlink-directory &&
+	grep unknown-symlink-directory actual.info-url-unknown-symlink-directory
 	'
 
 test_done
-- 
1.6.0.1.98.g76a24

Re: [PATCH 0/2] 'git svn info' fixes

[Eric Wong]

Thomas Rast <trast@student.ethz.ch> wrote:
> Eric Wong wrote.
> > > So should we just change all "unknown foo" tests to verify that 'git
> > > svn info' errors out too?
> >
> > Yes, I see no reason to differ from plain svn here.
> 
> This starts getting more complicated at every turn.  The included
> mini-series (probably textually depends on the other 6 patches though)
> "fixes" this.
> 
> HOWEVER: Subversion itself broke compatibility here.  In 1.4:
> 
>   $ svn info new; echo $?
>   new:  (Not a versioned resource)
> 
>   0
> 
> Note the extra linebreak and successful exit.  Current git-svn
> precisely matches this output.  In 1.5, it's different:
> 
>   $ svn info new; echo $?
>   svn: 'new' is not under version control
>   1
> 
> While it is of course up to you what you would like to do (and modulo
> test_must_fail, 2/2 can still be used to fix the tests if you decide
> to reject 1/2), I suggest changing to 1.5 behaviour.  exit(1) is the
> sane thing to do in this case, and that is already breaking
> bit-for-bit compatibility with SVN 1.4, so we might as well adopt the
> new error message.  Of course this prevents us from comparing the
> output literally in the tests, so I settled for a slightly weaker
> check: failure status and mention of the filename.

Yes.  Please maintain compatibility with svn 1.5.  The current version
of git-svn should strive to maintain compatibility with the current
version of svn whenever possible.

> Unfortunately this does raise the question whether the URL-encoding
> issue treated in the other series is in fact a similar incompatibility
> between 1.4 and 1.5, not a (minor but long-standing) bug in git-svn.

It should match svn 1.5 for "git svn info".

Since "git svn info --url" is a git-svn-only thing, whatever makes the
most sense from a command-line scripting perspective (I don't have time
to check against a real repo right now):

For git-svn info --url, just want things like:

	svn log -v `git svn info --url`

	svn cp `git svn info --url` \
               `git svn info --url | sed -e 's,/trunk,/tags/1.0,'`

	svn rm `git svn info --url`

to just work.

I seem to recall the rules being slightly different for http(s):// and
(file://|svn://) URLs with the command-line client; but my memory may
just be fuzzy...

Thanks for looking into this!

-- 
Eric Wong

Re: [PATCH 0/2] 'git svn info' fixes

[Thomas Rast]

[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]

Eric Wong wrote:
> Yes.  Please maintain compatibility with svn 1.5.  The current version
> of git-svn should strive to maintain compatibility with the current
> version of svn whenever possible.

Ok, that certainly clarifies the goal.

> > Unfortunately this does raise the question whether the URL-encoding
> > issue treated in the other series is in fact a similar incompatibility
> > between 1.4 and 1.5, not a (minor but long-standing) bug in git-svn.
> 
> It should match svn 1.5 for "git svn info".
[...]
> 	svn log -v `git svn info --url`
> [should] just work.
> 
> I seem to recall the rules being slightly different for http(s):// and
> (file://|svn://) URLs with the command-line client; but my memory may
> just be fuzzy...

I've finally found a system with SVN 1.4 that I have access to, and
ran a few tests.  I don't have svn:// servers with weird directory
names at hand, but I could verify that even SVN 1.4 quotes output and
requires the input to be properly quoted:

  $ svn info
  Path: .
  URL: file:///home/thomas/test%20directory%3F
  Repository Root: file:///home/thomas/test%20directory%3F
  [...]

  $ svn info file:///home/thomas/test%20directory%3F
  Path: test directory?
  URL: file:///home/thomas/test%20directory%3F
  Repository Root: file:///home/thomas/test%20directory%3F
  [...]

  $ svn info file:///home/thomas/'test directory?'
  svn: URL 'file:///home/thomas/test directory?' is not properly URI-encoded

Variations with https:// and SVN 1.5 give the same results.  So unless
I'm missing something, the two patch series are needed to get the
correct output.

- Thomas

-- 
Thomas Rast
trast@student.ethz.ch



[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH 0/2] 'git svn info' fixes

[Eric Wong]

Thomas Rast <trast@student.ethz.ch> wrote:
> Eric Wong wrote:
> > Yes.  Please maintain compatibility with svn 1.5.  The current version
> > of git-svn should strive to maintain compatibility with the current
> > version of svn whenever possible.
> 
> Ok, that certainly clarifies the goal.
> 
> > > Unfortunately this does raise the question whether the URL-encoding
> > > issue treated in the other series is in fact a similar incompatibility
> > > between 1.4 and 1.5, not a (minor but long-standing) bug in git-svn.
> > 
> > It should match svn 1.5 for "git svn info".
> [...]
> > 	svn log -v `git svn info --url`
> > [should] just work.
> > 
> > I seem to recall the rules being slightly different for http(s):// and
> > (file://|svn://) URLs with the command-line client; but my memory may
> > just be fuzzy...
> 
> I've finally found a system with SVN 1.4 that I have access to, and
> ran a few tests.  I don't have svn:// servers with weird directory
> names at hand, but I could verify that even SVN 1.4 quotes output and
> requires the input to be properly quoted:
> 
>   $ svn info
>   Path: .
>   URL: file:///home/thomas/test%20directory%3F
>   Repository Root: file:///home/thomas/test%20directory%3F
>   [...]
> 
>   $ svn info file:///home/thomas/test%20directory%3F
>   Path: test directory?
>   URL: file:///home/thomas/test%20directory%3F
>   Repository Root: file:///home/thomas/test%20directory%3F
>   [...]
> 
>   $ svn info file:///home/thomas/'test directory?'
>   svn: URL 'file:///home/thomas/test directory?' is not properly URI-encoded
> 
> Variations with https:// and SVN 1.5 give the same results.  So unless
> I'm missing something, the two patch series are needed to get the
> correct output.

Thank you very much for the fixes an analysis.  This series acked and
pushed out to git://git.bogomips.org/git-svn.git

-- 
Eric Wong

[PATCH 0/2] *** SUBJECT HERE ***

[Junio C Hamano]

*** BLURB HERE ***

Junio C Hamano (1):
  Makefile: test-parse-options depends on parse-options.h

Kjetil Barvik (1):
  symlinks.c: small style cleanup

 Makefile   |    2 ++
 symlinks.c |    6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

[PATCH 0/2] *** SUBJECT HERE ***

[Izik Eidus]

RFC: move the dirty page tracking to use dirty bit

Well, i was bored this morning and had this idea for a while, didnt test it to
much..., first i want to hear what ppl think?

Thanks.

Izik Eidus (2):
  kvm: fix dirty bit tracking for slots with large pages
  kvm: change the dirty page tracking to work with dirty bit instead of
    page fault

 arch/ia64/kvm/kvm-ia64.c        |    4 ++++
 arch/powerpc/kvm/powerpc.c      |    4 ++++
 arch/s390/kvm/kvm-s390.c        |    4 ++++
 arch/x86/include/asm/kvm_host.h |    3 +++
 arch/x86/kvm/mmu.c              |   32 +++++++++++++++++++++++++++++---
 arch/x86/kvm/svm.c              |    7 +++++++
 arch/x86/kvm/vmx.c              |    7 +++++++
 arch/x86/kvm/x86.c              |   21 ++++++++++++++++++---
 include/linux/kvm_host.h        |    1 +
 virt/kvm/kvm_main.c             |   17 ++++++++++++-----
 10 files changed, 89 insertions(+), 11 deletions(-)

[RFC/PATCH 0/2] Updates to improve device tree support

[Bill Gatliff]

This patch series updates the pca953x GPIO driver to take advantage
of the new of_i2c_gpiochip_add() function, which registers i2c GPIO
devices with the device tree API.  These changes allow i2c-based GPIO
expanders to be properly referenced from the proper entries in a
device tree.

The of_i2c_gpiochip_add() function has been posted for review on the
linuxppc-dev mailing list.

Bill Gatliff (2):
  Use struct of_i2c_gpio_chip instead of raw struct gpio_chip
  Reorder initialization to better support device tree data

 drivers/gpio/pca953x.c |  168 +++++++++++++++++++++++++-----------------------
 1 files changed, 88 insertions(+), 80 deletions(-)

[PATCH 0/2] *** SUBJECT HERE ***

[Bill Gatliff]

*** BLURB HERE ***

Bill Gatliff (2):
  Use struct of_i2c_gpio_chip instead of raw struct gpio_chip
  Reorder initialization to better support device tree data

 drivers/gpio/pca953x.c |  168 +++++++++++++++++++++++++-----------------------
 1 files changed, 88 insertions(+), 80 deletions(-)

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Bill Gatliff]

Bill Gatliff wrote:
> *** BLURB HERE ***
>   

Dangit, sometimes I really hate it when emacs leaves its backup files
around...  :(

Like now, for example.  Please disregard the noise generated by my
careless use of filename wildcards...


b.g.

-- 
Bill Gatliff
Embedded systems training and consulting
http://billgatliff.com
bgat@billgatliff.com

[PATCH 0/2] *** SUBJECT HERE ***

[Arnaldo Carvalho de Melo]

*** BLURB HERE ***

Arnaldo Carvalho de Melo (1):
  perf symbols: Fix kallsyms kernel/module map splitting

Ming Lei (1):
  perf symbols: Figure out start address of kernel map from kallsyms

 tools/perf/util/symbol.c |   59 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 6 deletions(-)

[PATCH 0/2] *** SUBJECT HERE ***

[sukeshs]

From: Sukesh Srikakula <sukeshs@xl-sj1-20.sj.broadcom.com>

*** BLURB HERE ***

Sukesh Srikakula (2):
  brcm80211: FIX for TKIP GTK bug
  brcm80211: Fix for suspend/resume bug

 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c |    4 ----
 drivers/staging/brcm80211/brcmfmac/dhd.h          |    3 +++
 drivers/staging/brcm80211/brcmfmac/dhd_linux.c    |    6 ++++--
 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c  |   12 ++++++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)

-- 
1.7.3.2

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Greg KH]

On Tue, May 03, 2011 at 12:00:55AM -0700, sukeshs@broadcom.com wrote:
> From: Sukesh Srikakula <sukeshs@xl-sj1-20.sj.broadcom.com>
> 
> *** BLURB HERE ***

I think you forgot the subject and the BLURB :(

care to retry?

[PATCH 0/2] *** SUBJECT HERE ***

[Anders Hammarquist]

The USB cable to read out data from the Abbott FreeStyle Precision
meters, known as the Abbott stip port cable, uses the TI 3410 chip,
just as the already added stereo port cable. They are essestially
the same cable, just with different connectors at the end.

This patch set adds the product id to the driver, and makes the
product type more explicit. Arguably, the ABBOTT_PRODUCT_ID
define could be removed, but I left it on the off chance that
someone other that the TI 3410 driver uses it.

/Anders

Anders Hammarquist (2):
  Add product id for Abbott strip port cable for Precision meter    
    which uses the TI 3410 chip.
  Be explicit about the Abbott product ids being product ids.

 drivers/usb/serial/ti_usb_3410_5052.c |    3 ++-
 drivers/usb/serial/ti_usb_3410_5052.h |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

-- 
1.7.10.4

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Greg KH]

I think you forgot a Subject :)

On Wed, Jun 19, 2013 at 02:05:07AM +0200, Anders Hammarquist wrote:
> The USB cable to read out data from the Abbott FreeStyle Precision
> meters, known as the Abbott stip port cable, uses the TI 3410 chip,
> just as the already added stereo port cable. They are essestially
> the same cable, just with different connectors at the end.
> 
> This patch set adds the product id to the driver, and makes the
> product type more explicit. Arguably, the ABBOTT_PRODUCT_ID
> define could be removed, but I left it on the off chance that
> someone other that the TI 3410 driver uses it.

No, it doesn't, please fix up that last patch and resend it.

thanks,

greg k-h

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Anders Hammarquist]

In a message of Wed, 19 Jun 2013 15:53:15 -0700, Greg KH writes:
>I think you forgot a Subject :)

Indeed. I blame it on my first fight with git format-patch ;-)

>On Wed, Jun 19, 2013 at 02:05:07AM +0200, Anders Hammarquist wrote:
>> This patch set adds the product id to the driver, and makes the
>> product type more explicit. Arguably, the ABBOTT_PRODUCT_ID
>> define could be removed, but I left it on the off chance that
>> someone other that the TI 3410 driver uses it.
>
>No, it doesn't, please fix up that last patch and resend it.

Right, and in removing it I actually found that it was used in
two places in the driver. I lost my second fight with format-patch
so I'll just enclose the fixed patch below.

/Anders

---8<---
ti_usb_3410_5052:
* Remove unspecific ABBOTT_PRODUCT_ID
* Fix size of statically sized arrays

Signed-off-by: Anders Hammarquist <iko@iko.pp.se>

diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index e581c25..26c1161 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -158,7 +158,7 @@ static unsigned int product_5052_count;
 /* the array dimension is the number of default entries plus */
 /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */
 /* null entry */
-static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_3410[16+TI_EXTRA_VID_PID_COUNT+1] = {
 	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
 	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -172,8 +172,8 @@ static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = {
 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
-	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_ID) },
-	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) },
+	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_PRODUCT_ID) },
+	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
 };
 
@@ -184,7 +184,7 @@ static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = {
 	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },
 };
 
-static struct usb_device_id ti_id_table_combined[19+2*TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_combined[20+2*TI_EXTRA_VID_PID_COUNT+1] = {
 	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
 	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -202,7 +202,8 @@ static struct usb_device_id ti_id_table_combined[19+2*TI_EXTRA_VID_PID_COUNT+1]
 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
-	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
+	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_PRODUCT_ID) },
+	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
 	{ }
 };
diff --git a/drivers/usb/serial/ti_usb_3410_5052.h b/drivers/usb/serial/ti_usb_3410_5052.h
index 4a2423e..d3ff470 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.h
+++ b/drivers/usb/serial/ti_usb_3410_5052.h
@@ -52,9 +52,8 @@
 
 /* Abbott Diabetics vendor and product ids */
 #define ABBOTT_VENDOR_ID		0x1a61
-#define ABBOTT_STEREO_PLUG_ID		0x3410
-#define ABBOTT_PRODUCT_ID		ABBOTT_STEREO_PLUG_ID
-#define ABBOTT_STRIP_PORT_ID		0x3420
+#define ABBOTT_STEREO_PLUG_PRODUCT_ID	0x3410
+#define ABBOTT_STRIP_PORT_PRODUCT_ID	0x3420
 
 /* Commands */
 #define TI_GET_VERSION			0x01

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Greg KH]

On Sat, Jun 22, 2013 at 01:08:12AM +0200, Anders Hammarquist wrote:
> In a message of Wed, 19 Jun 2013 15:53:15 -0700, Greg KH writes:
> >I think you forgot a Subject :)
> 
> Indeed. I blame it on my first fight with git format-patch ;-)
> 
> >On Wed, Jun 19, 2013 at 02:05:07AM +0200, Anders Hammarquist wrote:
> >> This patch set adds the product id to the driver, and makes the
> >> product type more explicit. Arguably, the ABBOTT_PRODUCT_ID
> >> define could be removed, but I left it on the off chance that
> >> someone other that the TI 3410 driver uses it.
> >
> >No, it doesn't, please fix up that last patch and resend it.
> 
> Right, and in removing it I actually found that it was used in
> two places in the driver. I lost my second fight with format-patch
> so I'll just enclose the fixed patch below.
> 
> /Anders
> 
> ---8<---
> ti_usb_3410_5052:
> * Remove unspecific ABBOTT_PRODUCT_ID
> * Fix size of statically sized arrays
> 
> Signed-off-by: Anders Hammarquist <iko@iko.pp.se>

Please resend this in a format that I can apply it in (i.e. one that
does not require me to edit it by hand...)

Also, please cc: the linux-usb@vger.kernel.org mailing list for usb
patches.

> diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
> index e581c25..26c1161 100644
> --- a/drivers/usb/serial/ti_usb_3410_5052.c
> +++ b/drivers/usb/serial/ti_usb_3410_5052.c
> @@ -158,7 +158,7 @@ static unsigned int product_5052_count;
>  /* the array dimension is the number of default entries plus */
>  /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */
>  /* null entry */
> -static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = {
> +static struct usb_device_id ti_id_table_3410[16+TI_EXTRA_VID_PID_COUNT+1] = {

That's a mess, why have it be a static array at all?  Just include an
empty one at the end.


>  	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
>  	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
>  	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
> @@ -172,8 +172,8 @@ static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = {
>  	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
>  	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
>  	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
> -	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_ID) },
> -	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) },
> +	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_PRODUCT_ID) },
> +	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_PRODUCT_ID) },
>  	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
>  };
>  
> @@ -184,7 +184,7 @@ static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = {
>  	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },
>  };
>  
> -static struct usb_device_id ti_id_table_combined[19+2*TI_EXTRA_VID_PID_COUNT+1] = {
> +static struct usb_device_id ti_id_table_combined[20+2*TI_EXTRA_VID_PID_COUNT+1] = {

Same here.  Although that might take another patch, to handle it all
correctly, separate from this "change the device id names" patch.

thanks,

greg k-h

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Anders Hammarquist]

In a message of Fri, 21 Jun 2013 16:56:03 -0700, Greg KH writes:
>Please resend this in a format that I can apply it in (i.e. one that
>does not require me to edit it by hand...)

After more fighting with git, I belive I now made it spit out what I
wanted. Patch 1/2 ahead.

>> -static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = {
>> +static struct usb_device_id ti_id_table_3410[16+TI_EXTRA_VID_PID_COUNT+1] = {
>
>That's a mess, why have it be a static array at all?  Just include an
>empty one at the end.

Indeed. I'd already had some (failed) thoughts about how to handle it
nicely. Now I've had another think through, and I have something which
deals with it and at least complains if TI_EXTRA_VID_PID_COUNT is changed
without changing the initializer. Patch 2/2

/Anders

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Greg KH]

On Sat, Jun 22, 2013 at 08:54:43PM +0200, Anders Hammarquist wrote:
> In a message of Fri, 21 Jun 2013 16:56:03 -0700, Greg KH writes:
> >Please resend this in a format that I can apply it in (i.e. one that
> >does not require me to edit it by hand...)
> 
> After more fighting with git, I belive I now made it spit out what I
> wanted. Patch 1/2 ahead.
> 
> >> -static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = {
> >> +static struct usb_device_id ti_id_table_3410[16+TI_EXTRA_VID_PID_COUNT+1] = {
> >
> >That's a mess, why have it be a static array at all?  Just include an
> >empty one at the end.
> 
> Indeed. I'd already had some (failed) thoughts about how to handle it
> nicely. Now I've had another think through, and I have something which
> deals with it and at least complains if TI_EXTRA_VID_PID_COUNT is changed
> without changing the initializer. Patch 2/2

Why don't we just drop the extra id thing entirely?  The usb-serial
subsystem handles new device ids being added dynamically from sysfs for
a long time now.  Removing this module option would clean up the code a
lot, and prevent these errors from ever happening again.

thanks,

greg k-h

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Anders Hammarquist]

In a message of Tue, 25 Jun 2013 16:39:11 -0700, Greg KH writes:
>> Indeed. I'd already had some (failed) thoughts about how to handle it
>> nicely. Now I've had another think through, and I have something which
>> deals with it and at least complains if TI_EXTRA_VID_PID_COUNT is changed
>> without changing the initializer. Patch 2/2
>
>Why don't we just drop the extra id thing entirely?  The usb-serial
>subsystem handles new device ids being added dynamically from sysfs for
>a long time now.  Removing this module option would clean up the code a
>lot, and prevent these errors from ever happening again.

Aha, yes, I'm all for that (had I only known I'd have done that to start
with). I'll look in to it.

/Anders

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Johan Hovold]

On Wed, Jun 26, 2013 at 10:29:59AM +0200, Anders Hammarquist wrote:
> In a message of Tue, 25 Jun 2013 16:39:11 -0700, Greg KH writes:
> >> Indeed. I'd already had some (failed) thoughts about how to handle it
> >> nicely. Now I've had another think through, and I have something which
> >> deals with it and at least complains if TI_EXTRA_VID_PID_COUNT is changed
> >> without changing the initializer. Patch 2/2
> >
> >Why don't we just drop the extra id thing entirely?  The usb-serial
> >subsystem handles new device ids being added dynamically from sysfs for
> >a long time now.  Removing this module option would clean up the code a
> >lot, and prevent these errors from ever happening again.
> 
> Aha, yes, I'm all for that (had I only known I'd have done that to start
> with). I'll look in to it.

I already have a few patches here (part of a larger 3.11 clean-up series)
which removes the vid/pid module parameters from all usb-serial modules
including ti_usb_3410_5052.

I hope to be able to submit the whole series a later tonight, but here's
the ti_usb_3410_5052 part if anyone's interested.

Thanks,
Johan


From: Johan Hovold <jhovold@gmail.com>
Subject: [PATCH] USB: ti_usb_3410_5052: remove vendor/product module parameters

Remove the vendor and product module parameters which were added a long
time ago when we did not have the dynamic sysfs interface to add
new device ids (and which isn't limited to five new vid/pid pair).

A vid/pid pair can be added dynamically using sysfs, for example:

  echo 0451 1234 >/sys/bus/usb-serial/drivers/ti_usb_3410_5052_1/new_id

for 1-port adapters, or

  echo 0451 1234 >/sys/bus/usb-serial/drivers/ti_usb_3410_5052_2/new_id

for 2-port adapters.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
 drivers/usb/serial/ti_usb_3410_5052.c | 72 ++++-------------------------------
 1 file changed, 7 insertions(+), 65 deletions(-)

diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index f3e21f5..5585b20 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -141,20 +141,9 @@ static int ti_download_firmware(struct ti_device *tdev);
 
 /* module parameters */
 static int closing_wait = TI_DEFAULT_CLOSING_WAIT;
-static ushort vendor_3410[TI_EXTRA_VID_PID_COUNT];
-static unsigned int vendor_3410_count;
-static ushort product_3410[TI_EXTRA_VID_PID_COUNT];
-static unsigned int product_3410_count;
-static ushort vendor_5052[TI_EXTRA_VID_PID_COUNT];
-static unsigned int vendor_5052_count;
-static ushort product_5052[TI_EXTRA_VID_PID_COUNT];
-static unsigned int product_5052_count;
 
 /* supported devices */
-/* the array dimension is the number of default entries plus */
-/* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */
-/* null entry */
-static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_3410[] = {
 	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
 	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -171,16 +160,18 @@ static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = {
 	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_ID) },
 	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
+	{ }	/* terminator */
 };
 
-static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_5052[] = {
 	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },
+	{ }	/* terminator */
 };
 
-static struct usb_device_id ti_id_table_combined[19+2*TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_combined[] = {
 	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
 	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -200,7 +191,7 @@ static struct usb_device_id ti_id_table_combined[19+2*TI_EXTRA_VID_PID_COUNT+1]
 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
 	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
 	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
-	{ }
+	{ }	/* terminator */
 };
 
 static struct usb_serial_driver ti_1port_device = {
@@ -289,61 +280,12 @@ module_param(closing_wait, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(closing_wait,
     "Maximum wait for data to drain in close, in .01 secs, default is 4000");
 
-module_param_array(vendor_3410, ushort, &vendor_3410_count, S_IRUGO);
-MODULE_PARM_DESC(vendor_3410,
-		"Vendor ids for 3410 based devices, 1-5 short integers");
-module_param_array(product_3410, ushort, &product_3410_count, S_IRUGO);
-MODULE_PARM_DESC(product_3410,
-		"Product ids for 3410 based devices, 1-5 short integers");
-module_param_array(vendor_5052, ushort, &vendor_5052_count, S_IRUGO);
-MODULE_PARM_DESC(vendor_5052,
-		"Vendor ids for 5052 based devices, 1-5 short integers");
-module_param_array(product_5052, ushort, &product_5052_count, S_IRUGO);
-MODULE_PARM_DESC(product_5052,
-		"Product ids for 5052 based devices, 1-5 short integers");
-
 MODULE_DEVICE_TABLE(usb, ti_id_table_combined);
 
+module_usb_serial_driver(serial_drivers, ti_id_table_combined);
 
 /* Functions */
 
-static int __init ti_init(void)
-{
-	int i, j, c;
-
-	/* insert extra vendor and product ids */
-	c = ARRAY_SIZE(ti_id_table_combined) - 2 * TI_EXTRA_VID_PID_COUNT - 1;
-	j = ARRAY_SIZE(ti_id_table_3410) - TI_EXTRA_VID_PID_COUNT - 1;
-	for (i = 0; i < min(vendor_3410_count, product_3410_count); i++, j++, c++) {
-		ti_id_table_3410[j].idVendor = vendor_3410[i];
-		ti_id_table_3410[j].idProduct = product_3410[i];
-		ti_id_table_3410[j].match_flags = USB_DEVICE_ID_MATCH_DEVICE;
-		ti_id_table_combined[c].idVendor = vendor_3410[i];
-		ti_id_table_combined[c].idProduct = product_3410[i];
-		ti_id_table_combined[c].match_flags = USB_DEVICE_ID_MATCH_DEVICE;
-	}
-	j = ARRAY_SIZE(ti_id_table_5052) - TI_EXTRA_VID_PID_COUNT - 1;
-	for (i = 0; i < min(vendor_5052_count, product_5052_count); i++, j++, c++) {
-		ti_id_table_5052[j].idVendor = vendor_5052[i];
-		ti_id_table_5052[j].idProduct = product_5052[i];
-		ti_id_table_5052[j].match_flags = USB_DEVICE_ID_MATCH_DEVICE;
-		ti_id_table_combined[c].idVendor = vendor_5052[i];
-		ti_id_table_combined[c].idProduct = product_5052[i];
-		ti_id_table_combined[c].match_flags = USB_DEVICE_ID_MATCH_DEVICE;
-	}
-
-	return usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, ti_id_table_combined);
-}
-
-static void __exit ti_exit(void)
-{
-	usb_serial_deregister_drivers(serial_drivers);
-}
-
-module_init(ti_init);
-module_exit(ti_exit);
-
-
 static int ti_startup(struct usb_serial *serial)
 {
 	struct ti_device *tdev;
-- 
1.8.2.1

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Anders Hammarquist]

In a message of Wed, 26 Jun 2013 12:39:24 +0200, Johan Hovold writes:
>On Wed, Jun 26, 2013 at 10:29:59AM +0200, Anders Hammarquist wrote:
>> In a message of Tue, 25 Jun 2013 16:39:11 -0700, Greg KH writes:
>> >> Indeed. I'd already had some (failed) thoughts about how to handle it
>> >> nicely. Now I've had another think through, and I have something which
>> >> deals with it and at least complains if TI_EXTRA_VID_PID_COUNT is changed
>> >> without changing the initializer. Patch 2/2
>> >
>> >Why don't we just drop the extra id thing entirely?  The usb-serial
>> >subsystem handles new device ids being added dynamically from sysfs for
>> >a long time now.  Removing this module option would clean up the code a
>> >lot, and prevent these errors from ever happening again.
>> 
>> Aha, yes, I'm all for that (had I only known I'd have done that to start
>> with). I'll look in to it.
>
>I already have a few patches here (part of a larger 3.11 clean-up series)
>which removes the vid/pid module parameters from all usb-serial modules
>including ti_usb_3410_5052.
>
>I hope to be able to submit the whole series a later tonight, but here's
>the ti_usb_3410_5052 part if anyone's interested.

I did a quick check of adding the device id though sysfs, and although
it partly works, it doesn't find the correct firmware (it ends up trying
to load 5052 firmware for a 3410 device. Looking at the code it seems
(struct ti_device) td_is_3410 isn't set properly.)

I can take a stab at fixing it in the next few days.

/Anders

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Johan Hovold]

On Thu, Jun 27, 2013 at 11:50:52PM +0200, Anders Hammarquist wrote:
> In a message of Wed, 26 Jun 2013 12:39:24 +0200, Johan Hovold writes:
> >On Wed, Jun 26, 2013 at 10:29:59AM +0200, Anders Hammarquist wrote:
> >> In a message of Tue, 25 Jun 2013 16:39:11 -0700, Greg KH writes:
> >> >> Indeed. I'd already had some (failed) thoughts about how to handle it
> >> >> nicely. Now I've had another think through, and I have something which
> >> >> deals with it and at least complains if TI_EXTRA_VID_PID_COUNT is changed
> >> >> without changing the initializer. Patch 2/2
> >> >
> >> >Why don't we just drop the extra id thing entirely?  The usb-serial
> >> >subsystem handles new device ids being added dynamically from sysfs for
> >> >a long time now.  Removing this module option would clean up the code a
> >> >lot, and prevent these errors from ever happening again.
> >> 
> >> Aha, yes, I'm all for that (had I only known I'd have done that to start
> >> with). I'll look in to it.
> >
> >I already have a few patches here (part of a larger 3.11 clean-up series)
> >which removes the vid/pid module parameters from all usb-serial modules
> >including ti_usb_3410_5052.
> >
> >I hope to be able to submit the whole series a later tonight, but here's
> >the ti_usb_3410_5052 part if anyone's interested.
> 
> I did a quick check of adding the device id though sysfs, and although
> it partly works, it doesn't find the correct firmware (it ends up trying
> to load 5052 firmware for a 3410 device. Looking at the code it seems
> (struct ti_device) td_is_3410 isn't set properly.)

Turns out that the drivers device-type detection has never worked with
the dynamic id interface (all devices were detected as 2-port devices).

I'm responding to this mail with a fix. Care to give it a try?

Thanks,
Johan

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Anders Hammarquist]

In a message of Fri, 28 Jun 2013 12:23:33 +0200, Johan Hovold writes:
>> I did a quick check of adding the device id though sysfs, and although
>> it partly works, it doesn't find the correct firmware (it ends up trying
>> to load 5052 firmware for a 3410 device. Looking at the code it seems
>> (struct ti_device) td_is_3410 isn't set properly.)
>
>Turns out that the drivers device-type detection has never worked with
>the dynamic id interface (all devices were detected as 2-port devices).
>
>I'm responding to this mail with a fix. Care to give it a try?

Yes, this works fine. 

/Anders

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Johan Hovold]

On Tue, Jul 02, 2013 at 01:22:01AM +0200, Anders Hammarquist wrote:
> In a message of Fri, 28 Jun 2013 12:23:33 +0200, Johan Hovold writes:
> >> I did a quick check of adding the device id though sysfs, and although
> >> it partly works, it doesn't find the correct firmware (it ends up trying
> >> to load 5052 firmware for a 3410 device. Looking at the code it seems
> >> (struct ti_device) td_is_3410 isn't set properly.)
> >
> >Turns out that the drivers device-type detection has never worked with
> >the dynamic id interface (all devices were detected as 2-port devices).
> >
> >I'm responding to this mail with a fix. Care to give it a try?
> 
> Yes, this works fine. 

Thanks for testing.

Johan

[PATCH 0/2] *** SUBJECT HERE ***

[Damien Millescamps]

*** BLURB HERE ***

Damien Millescamps (2):
  eal: add flag to force unbind device
  eal: load libraries before creating threads

 lib/librte_eal/common/include/rte_pci.h |    2 ++
 lib/librte_eal/linuxapp/eal/eal.c       |   24 ++++++++++++------------
 lib/librte_eal/linuxapp/eal/eal_pci.c   |    5 +++++
 3 files changed, 19 insertions(+), 12 deletions(-)

-- 
1.7.2.5

[PATCH 0/2] *** SUBJECT HERE ***

[Chris Zankel]

Hi,

These two patches fix two of the broken builds for Xtensa:
- coreutils
- cdrkit

The first patch enables valloc for recent versions of uClibc (snapshot), which
is still used by cdrkit. The second patch disables libnsrp for Xtensa
(!BR_xtensa), which is used by libnss, and consequently libnss and ecryptfs.

Thanks,
-Chris

Chris Zankel (2):
  uclibc-snapshot: enable option UCLIBC_SUSV2_LEGACY
  libnspr: Add dependency on !BR2_xtensa

 package/ecryptfs-utils/Config.in      | 1 +
 package/libnspr/Config.in             | 3 ++-
 package/libnss/Config.in              | 1 +
 package/uclibc/uClibc-snapshot.config | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

-- 
1.8.1.2

[PATCH 0/2] *** SUBJECT HERE ***

[Claire Murphy]

*** BLURB HERE ***

Claire Murphy (2):
  Patch for Qemu wrapper for US-VHost to ensure Qemu process ends when
    VM is shutdown.
  Patch to allow live migration of a VM with US-VHost.

 examples/vhost/libvirt/qemu-wrap.py |   31 +++++++++++++++++++++++++++----
 examples/vhost/vhost-net-cdev.c     |   18 ++++++++++++++++++
 examples/vhost/virtio-net.c         |    8 +++++++-
 3 files changed, 52 insertions(+), 5 deletions(-)

[PATCH 0/2] *** SUBJECT HERE ***

[Andrew Pinski]

*** BLURB HERE ***

Andrew Pinski (2):
  ARM64:VDSO: Improve gettimeofday, don't use udiv
  ARM64:VDSO: Improve __do_get_tspec, don't use udiv

 arch/arm64/kernel/vdso/gettimeofday.S |   47 ++++++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 12 deletions(-)

-- 
1.7.2.5

[PATCH 0/2] *** SUBJECT HERE ***

[Andrew Pinski]

*** BLURB HERE ***

Andrew Pinski (2):
  ARM64:VDSO: Improve gettimeofday, don't use udiv
  ARM64:VDSO: Improve __do_get_tspec, don't use udiv

 arch/arm64/kernel/vdso/gettimeofday.S |   47 ++++++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 12 deletions(-)

-- 
1.7.2.5

[PATCH 0/2] *** SUBJECT HERE ***

[Colin Watson]

Some UEFI firmware is easily provoked into running out of space in its
variable storage.  This is usually due to certain kernel drivers (e.g.
pstore), but regardless of the cause it can cause grub-install to fail
because it currently asks efibootmgr to delete and re-add entries, and
the deletion often doesn't result in an immediate garbage collection.
Writing variables frequently also increases wear on the NVRAM which may
have limited write cycles.  For these reasons, it's desirable to find a
way to minimise writes while still allowing grub-install to ensure that
a suitable boot entry exists.

This short patch series does so by using the efivar and efiboot
libraries directly.

Colin Watson (2):
  Add %X to grub_vsnprintf_real and friends
  Minimise writes to EFI variable storage

 INSTALL                         |   5 +
 Makefile.util.def               |  20 ++
 configure.ac                    |  12 +
 grub-core/kern/misc.c           |  10 +-
 grub-core/osdep/efivar.c        |   3 +
 grub-core/osdep/unix/efivar.c   | 503 ++++++++++++++++++++++++++++++++
 grub-core/osdep/unix/platform.c | 100 +------
 include/grub/util/install.h     |   5 +
 util/grub-install.c             |   4 +-
 9 files changed, 565 insertions(+), 97 deletions(-)
 create mode 100644 grub-core/osdep/efivar.c
 create mode 100644 grub-core/osdep/unix/efivar.c

-- 
2.17.1

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Daniel Kiper]

On Mon, Mar 11, 2019 at 03:04:49PM +0000, Colin Watson wrote:
> Some UEFI firmware is easily provoked into running out of space in its
> variable storage.  This is usually due to certain kernel drivers (e.g.
> pstore), but regardless of the cause it can cause grub-install to fail
> because it currently asks efibootmgr to delete and re-add entries, and
> the deletion often doesn't result in an immediate garbage collection.
> Writing variables frequently also increases wear on the NVRAM which may
> have limited write cycles.  For these reasons, it's desirable to find a
> way to minimise writes while still allowing grub-install to ensure that
> a suitable boot entry exists.
>
> This short patch series does so by using the efivar and efiboot
> libraries directly.

This looks like something for longer discussion. So, I am going to take
the patchset after the release if you do not convince me that it should
land in the GRUB 2.04.

And I agree with Steve comments.

Daniel

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Colin Watson]

On Wed, Mar 13, 2019 at 10:56:47AM +0100, Daniel Kiper wrote:
> This looks like something for longer discussion. So, I am going to take
> the patchset after the release if you do not convince me that it should
> land in the GRUB 2.04.

While I think it's important and I expect to be applying some variation
of it to Debian for our upcoming release, it's also not in any way a new
issue, so I think it's more important to get more timely and frequent
GRUB releases happening than to push for this particular patch set to be
in 2.04.

> And I agree with Steve comments.

Yep - I'll deal with those soon and post a v2.

-- 
Colin Watson                                       [cjwatson@ubuntu.com]

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Daniel Kiper]

On Wed, Mar 13, 2019 at 10:12:26AM +0000, Colin Watson wrote:
> On Wed, Mar 13, 2019 at 10:56:47AM +0100, Daniel Kiper wrote:
> > This looks like something for longer discussion. So, I am going to take
> > the patchset after the release if you do not convince me that it should
> > land in the GRUB 2.04.
>
> While I think it's important and I expect to be applying some variation
> of it to Debian for our upcoming release, it's also not in any way a new
> issue, so I think it's more important to get more timely and frequent
> GRUB releases happening than to push for this particular patch set to be
> in 2.04.

So, after the release. Granted!

> > And I agree with Steve comments.
>
> Yep - I'll deal with those soon and post a v2.

Thanks!

Daniel

[PATCH 0/2] *** SUBJECT HERE ***

[Tao Zhang]

*** BLURB HERE ***

Tao Zhang (2):
  coresight: Add support for device names
  dt-bindings: arm: add property for coresight component name

 Documentation/devicetree/bindings/arm/coresight.txt | 2 ++
 drivers/hwtracing/coresight/coresight-core.c        | 6 ++++++
 2 files changed, 8 insertions(+)

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Greg Kroah-Hartman]

On Fri, Apr 16, 2021 at 04:07:54PM +0800, Tao Zhang wrote:
> *** BLURB HERE ***

Where is the blurb?

And your subject is not ok :(

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Greg Kroah-Hartman]

On Fri, Apr 16, 2021 at 04:07:54PM +0800, Tao Zhang wrote:
> *** BLURB HERE ***

Where is the blurb?

And your subject is not ok :(


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 0/2] *** SUBJECT HERE ***

[Saurav Girepunje]

*** BLURB HERE ***

Saurav Girepunje (2):
  usb: musb: remove unused function argument
  usb: musb: Remove unused function argument

 drivers/usb/musb/musb_host.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

--
2.25.1

Re: [PATCH 0/2] *** SUBJECT HERE ***

[Greg KH]

On Fri, May 07, 2021 at 10:06:17AM +0530, Saurav Girepunje wrote:
> *** BLURB HERE ***

No subject or blurb?

> 
> Saurav Girepunje (2):
>   usb: musb: remove unused function argument
>   usb: musb: Remove unused function argument

Again, these have the same subject line, which is not allowed.

Please fix up and resend them all (we only saw 1 on the mailing list.)

thanks,

greg k-h

Re: [PATCH 0/2] *** SUBJECT HERE ***

[SAURAV GIREPUNJE]

On Fri, May 07, 2021 at 08:00:29AM +0200, Greg KH wrote:
> On Fri, May 07, 2021 at 10:06:17AM +0530, Saurav Girepunje wrote:
> > *** BLURB HERE ***
>
> No subject or blurb?
>
> >
> > Saurav Girepunje (2):
> >   usb: musb: remove unused function argument
> >   usb: musb: Remove unused function argument
>
> Again, these have the same subject line, which is not allowed.
>
> Please fix up and resend them all (we only saw 1 on the mailing list.)
>
> thanks,
>
> greg k-h


Plese ignore this mail.

I was trying to learn how to send pathes with cover letter from below
https://kernelnewbies.org/FirstKernelPatch

and did not realized that on sample command set the cc list
git format-patch -o /tmp/ --cover-letter -n --thread=shallow --cc="linux-usb@vger.kernel.org" 3b12c21^..b7ca36a

[PATCH 0/2] *** SUBJECT HERE ***

[Jit Loon Lim]

*** BLURB HERE ***

Chee Hong Ang (2):
  arm: socfpga: soc64: Enable L2 reset on S10
  arm: socfpga: soc64: Perform warm reset after L2 reset in SPL on S10

 .../include/mach/reset_manager_soc64.h        |  1 +
 arch/arm/mach-socfpga/lowlevel_init_soc64.S   | 24 ++++++++
 drivers/sysreset/sysreset_socfpga_soc64.c     | 58 ++++++++++++++++++-
 include/configs/socfpga_soc64_common.h        |  7 +++
 4 files changed, 88 insertions(+), 2 deletions(-)

-- 
2.26.2

[PATCH 0/2] *** SUBJECT HERE ***

[sieu.mun.tang]

From: Sieu Mun Tang <sieu.mun.tang@intel.com>

*** BLURB HERE ***

Tien Fong Chee (2):
  arch: arm: mach-socfpga: Use custom header target buffer in SPL
  arch: arm: mach-socfpga: Add SPL fitImage config match

 arch/arm/mach-socfpga/spl_a10.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

-- 
2.25.1

[PATCH 0/2] *** SUBJECT HERE ***

[Sergey Lisov]

DesignWare MMC cores have a configurable data bus width of either 16, 32, or 64
bytes. It is possible, and some vendors actually do it, to ship a DW MMC core
configured for 32-bit data bus within a 64-bit SoC. In this case the kernel
will attempt 64-bit (readq) accesses to certain 64-bit MMIO registers, while
the core will expect pairs of 32-bit accesses.

It seems that currently the only register for which the kernel performs 64-bit
accesses is the FIFO. The symptom is that the DW MMC core never receives a read
on the second half of the register, does not register the datum as being read,
and thus not advancing its internal FIFO pointer, breaking further reads. It
also seems that this FIFO is only used for small (less than 16 bytes)
transfers, which probably means that only some SDIO cards are affected.

Sergey Lisov (2):
  devicetree: synopsys-dw-mshc-common: add "fifo-access-32bit" property
  dw_mmc: add an option to force 32-bit accesses to 64-bit device
    registers

 .../bindings/mmc/synopsys-dw-mshc-common.yaml |   6 +
 drivers/mmc/host/dw_mmc.c                     | 125 +++++++++++++++++-
 drivers/mmc/host/dw_mmc.h                     |   2 +
 3 files changed, 131 insertions(+), 2 deletions(-)

-- 
2.38.3

[PATCH 0/2] *** SUBJECT HERE ***

[Sergey Lisov]

DesignWare MMC cores have a configurable data bus width of either 16, 32, or 64
bytes. It is possible, and some vendors actually do it, to ship a DW MMC core
configured for 32-bit data bus within a 64-bit SoC. In this case the kernel
will attempt 64-bit (readq) accesses to certain 64-bit MMIO registers, while
the core will expect pairs of 32-bit accesses.

It seems that currently the only register for which the kernel performs 64-bit
accesses is the FIFO. The symptom is that the DW MMC core never receives a read
on the second half of the register, does not register the datum as being read,
and thus not advancing its internal FIFO pointer, breaking further reads. It
also seems that this FIFO is only used for small (less than 16 bytes)
transfers, which probably means that only some SDIO cards are affected.

Sergey Lisov (2):
  devicetree: synopsys-dw-mshc-common: add "fifo-access-32bit" property
  dw_mmc: add an option to force 32-bit accesses to 64-bit device
    registers

 .../bindings/mmc/synopsys-dw-mshc-common.yaml |   6 +
 drivers/mmc/host/dw_mmc.c                     | 125 +++++++++++++++++-
 drivers/mmc/host/dw_mmc.h                     |   2 +
 3 files changed, 131 insertions(+), 2 deletions(-)

-- 
2.38.3

[PATCH 0/2] *** SUBJECT HERE ***

[Sergey Lisov]

DesignWare MMC cores have a configurable data bus width of either 16, 32, or 64
bytes. It is possible, and some vendors actually do it, to ship a DW MMC core
configured for 32-bit data bus within a 64-bit SoC. In this case the kernel
will attempt 64-bit (readq) accesses to certain 64-bit MMIO registers, while
the core will expect pairs of 32-bit accesses.

It seems that currently the only register for which the kernel performs 64-bit
accesses is the FIFO. The symptom is that the DW MMC core never receives a read
on the second half of the register, does not register the datum as being read,
and thus not advancing its internal FIFO pointer, breaking further reads. It
also seems that this FIFO is only used for small (less than 16 bytes)
transfers, which probably means that only some SDIO cards are affected.

Sergey Lisov (2):
  devicetree: synopsys-dw-mshc-common: add "fifo-access-32bit" property
  dw_mmc: add an option to force 32-bit accesses to 64-bit device
    registers

 .../bindings/mmc/synopsys-dw-mshc-common.yaml |   6 +
 drivers/mmc/host/dw_mmc.c                     | 125 +++++++++++++++++-
 drivers/mmc/host/dw_mmc.h                     |   2 +
 3 files changed, 131 insertions(+), 2 deletions(-)

-- 
2.38.3

[PATCH 0/2] *** SUBJECT HERE ***

[lixiaoyong]

*** BLURB HERE ***

lixiaoyong (2):
  utils.bbclass: enhance readelf command call with llvm
  oe/package.py: enhance objdump command call with llvm

 meta/classes-global/utils.bbclass | 4 ++--
 meta/lib/oe/package.py            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.34.1