From a10713e6a823a11a0809112391464d1d7e0ba0d9 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 13 Jun 2005 18:27:13 -0700 Subject: [PATCH] --- yaml --- r: 1983 b: refs/heads/master c: a96aca88ac71f75e566981b554da44bfd0d111e8 h: refs/heads/master i: 1981: 7c79a234c6c6b447737b78a72d2d9bddfcfce0ad 1979: 6ea3e71e25bcc7901d9458f876f32d7f130d3e2e 1975: 45dd6e49605b84f5e267327bc1ef64d7526d7658 1967: bd75302516641e909fdf73e441917ef4c2cfd1d9 1951: abe29e887c55976e22ebabe18cd4a3e7999c872f 1919: ad4556a11030787e14084c53e76acdcb829a8be7 v: v3 --- [refs] | 2 +- trunk/Documentation/SubmittingPatches | 8 +------- trunk/net/ipv4/netfilter/ip_conntrack_standalone.c | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1fdca8e12c99..f963f078760a 100644 --- 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 index 4d35562b1cf9..9838d32b2fe7 100644 --- 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 diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_standalone.c b/trunk/net/ipv4/netfilter/ip_conntrack_standalone.c index 46ca45f74d85..bc59f7b39805 100644 --- 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)