---

yaml --- r: 1983 b: refs/heads/master c: a96aca8 h: refs/heads/master i: 1981: 7c79a23 1979: 6ea3e71 1975: 45dd6e4 1967: bd75302 1951: abe29e8 1919: ad4556a v: v3
git-mirror · Jun 14, 2005 · a10713e · a10713e
1 parent bd6b5c4
commit a10713e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbd83da82b15292337ff2b71e619c9a3a95f6d80
+refs/heads/master: a96aca88ac71f75e566981b554da44bfd0d111e8
diff --git a/trunk/Documentation/SubmittingPatches b/trunk/Documentation/SubmittingPatches
@@ -271,7 +271,7 @@ patch, which certifies that you wrote it or otherwise have the right to
 pass it on as a open-source patch.  The rules are pretty simple: if you
 can certify the below:
 
-        Developer's Certificate of Origin 1.1
+        Developer's Certificate of Origin 1.0
 
         By making a contribution to this project, I certify that:
 
@@ -291,12 +291,6 @@ can certify the below:
             person who certified (a), (b) or (c) and I have not modified
             it.
 
-	(d) I understand and agree that this project and the contribution
-	    are public and that a record of the contribution (including all
-	    personal information I submit with it, including my sign-off) is
-	    maintained indefinitely and may be redistributed consistent with
-	    this project or the open source license(s) involved.
-
 then you just add a line saying
 
 	Signed-off-by: Random J Developer <random@developer.org>

diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_standalone.c b/trunk/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -256,6 +256,7 @@ static void *exp_seq_next(struct seq_file *s, void *v, loff_t *pos)
 {
  	struct list_head *e = v;
 
+	++*pos;
 	e = e->next;
 
 	if (e == &ip_conntrack_expect_list)
-Original file line number
+Diff line change
@@ Expand Up @@
     {
      	struct list_head *e = v;
+    	++*pos;
     	e = e->next;
     	if (e == &ip_conntrack_expect_list)
@@ Expand Down @@