linux-kernel - 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <200701172109.l0HL9fdw019715@turing-police.cc.vt.edu>
Date:	Wed, 17 Jan 2007 16:09:41 -0500
From:	Valdis.Kletnieks@...edu
To:	Andrew Morton <akpm@...l.org>,
	Chris Leech <christopher.leech@...el.com>
Cc:	linux-kernel@...r.kernel.org
Subject: 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?

commit d8238afa7eedc047b57da7ec98e98fb051fc4e85
Author: Chris Leech <christopher.leech@...el.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@...el.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



Content of type "application/pgp-signature" skipped