2007-01-17 21:09:48

by Valdis Klētnieks

[permalink] [raw]

Subject: 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?

---

commit d8238afa7eedc047b57da7ec98e98fb051fc4e85
Author: Chris Leech <[email protected]>
Date: Fri Nov 17 11:37:29 2006 -0800

I/OAT: Add documentation for the tcp_dma_copybreak sysctl

Signed-off-by: Chris Leech <[email protected]>

looks fishy, like a cvs update went bad:

diff -puN Documentation/networking/ip-sysctl.txt~git-ioat Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/ip-sysctl.txt~git-ioat
+++ a/Documentation/networking/ip-sysctl.txt
@@ -387,6 +387,22 @@ tcp_workaround_signed_windows - BOOLEAN
not receive a window scaling option from them.
Default: 0

+<<<<<<< HEAD/Documentation/networking/ip-sysctl.txt
+=======
+tcp_slow_start_after_idle - BOOLEAN
+ If set, provide RFC2861 behavior and time out the congestion

---

Attachments:

(No filename) (226.00 B)

2007-01-17 22:17:25

by Andrew Morton

[permalink] [raw]

Subject: Re: 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?

---

> On Wed, 17 Jan 2007 16:09:41 -0500 [email protected] wrote:
> commit d8238afa7eedc047b57da7ec98e98fb051fc4e85
> Author: Chris Leech <[email protected]>
> Date: Fri Nov 17 11:37:29 2006 -0800
>
> I/OAT: Add documentation for the tcp_dma_copybreak sysctl
>
> Signed-off-by: Chris Leech <[email protected]>
>
> looks fishy, like a cvs update went bad:
>
> diff -puN Documentation/networking/ip-sysctl.txt~git-ioat Documentation/networking/ip-sysctl.txt
> --- a/Documentation/networking/ip-sysctl.txt~git-ioat
> +++ a/Documentation/networking/ip-sysctl.txt
> @@ -387,6 +387,22 @@ tcp_workaround_signed_windows - BOOLEAN
> not receive a window scaling option from them.
> Default: 0
>
> +<<<<<<< HEAD/Documentation/networking/ip-sysctl.txt
> +=======
> +tcp_slow_start_after_idle - BOOLEAN
> + If set, provide RFC2861 behavior and time out the congestion
>

Yeah, that's a git merge error. I fix lots of them but didn't bother with
this one because it's just a .txt file. It'll go away when Chris gets
around to cleaning up that tree.