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

2007-01-17 Thread Andrew Morton
> 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 <

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

2007-01-17 Thread Valdis . Kletnieks
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 Docu