From: Andrew Morton <akpm@osdl.org>
To: Valdis.Kletnieks@vt.edu
Cc: christopher.leech@intel.com, linux-kernel@vger.kernel.org
Subject: Re: 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?
Date: Wed, 17 Jan 2007 14:17:18 -0800 [thread overview]
Message-ID: <20070117141718.824df05b.akpm@osdl.org> (raw)
In-Reply-To: <200701172109.l0HL9fdw019715@turing-police.cc.vt.edu>
> 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.
prev parent reply other threads:[~2007-01-17 22:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-17 21:09 Valdis.Kletnieks
2007-01-17 22:17 ` Andrew Morton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070117141718.824df05b.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=Valdis.Kletnieks@vt.edu \
--cc=christopher.leech@intel.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®