LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?
@ 2007-01-17 21:09 Valdis.Kletnieks
  2007-01-17 22:17 ` Andrew Morton
  0 siblings, 1 reply; 2+ messages in thread
From: Valdis.Kletnieks @ 2007-01-17 21:09 UTC (permalink / raw)
  To: Andrew Morton, Chris Leech; +Cc: linux-kernel

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

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



[-- Attachment #2: Type: application/pgp-signature, Size: 226 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?
  2007-01-17 21:09 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch? Valdis.Kletnieks
@ 2007-01-17 22:17 ` Andrew Morton
  0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2007-01-17 22:17 UTC (permalink / raw)
  To: Valdis.Kletnieks; +Cc: christopher.leech, linux-kernel

> On Wed, 17 Jan 2007 16:09:41 -0500 Valdis.Kletnieks@vt.edu wrote:
> 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
> 

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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-01-17 22:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-01-17 21:09 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch? Valdis.Kletnieks
2007-01-17 22:17 ` Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).