Messages in this thread Patch in this message | | | Subject | 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch? | From | Valdis.Kletnieks@vt ... | Date | Wed, 17 Jan 2007 16:09:41 -0500 |
| |
commit d8238afa7eedc047b57da7ec98e98fb051fc4e85 Author: Chris Leech <christopher.leech@intel.com> Date: Fri Nov 17 11:37:29 2006 -0800
I/OAT: Add documentation for the tcp_dma_copybreak sysctl
Signed-off-by: Chris Leech <christopher.leech@intel.com>
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
[unhandled content-type:application/pgp-signature] | |