Re: patch bug

[Andrew Morton]

On Tue, 3 Jul 2007 08:12:42 -0500 address@hidden (Karl Berry) wrote:

> Could you send the actual problematic diff to address@hidden
> Hopefully we can get patch fixed ...

Sure.  It's at http://userweb.kernel.org/~akpm/git-scsi-misc.patch.
To reproduce, do:

mkdir foo
cd foo
patch -p1 < ../git-scsi-misc.patch

and you'll get

<snip>
|commit f98754960a9b25057ad5f249f877b3d6fab889ce
|Author: FUJITA Tomonori <address@hidden>
|Date:   Mon May 14 20:25:31 2007 +0900
|
|    [SCSI] hptiop: convert to use the data buffer accessors
|    
|    - remove the unnecessary map_single path.
|    
|    - convert to use the new accessors for the sg lists and the
|    parameters.
|    
|    Jens Axboe <address@hidden> did the for_each_sg cleanup.
|    
|    Signed-off-by: FUJITA Tomonori <address@hidden>
|    Acked-by: HighPoint Linux Team <address@hidden>
|    Signed-off-by: James Bottomley <address@hidden>
|
|commit a16efc1cbf0a9e5ea9f99ae98fb774b60d05c35b
|Author: Kars de Jong <address@hidden>
|Date:   Sun Jun 17 14:47:08 2007 +0200
|
|    [SCSI] 53c700: Amiga 4000T NCR53c710 SCSI
|    
|    New driver for the Amiga 4000T built-in NCR53c710 SCSI controller, using 
the
--------------------------
File to patch: 


the problem is that patch is seeing this text:

commit a16efc1cbf0a9e5ea9f99ae98fb774b60d05c35b
Author: Kars de Jong <address@hidden>
Date:   Sun Jun 17 14:47:08 2007 +0200

    [SCSI] 53c700: Amiga 4000T NCR53c710 SCSI
    
    New driver for the Amiga 4000T built-in NCR53c710 SCSI controller, using the
    53c700 SCSI core.
    
    Signed-off-by: Geert Uytterhoeven <address@hidden>
    Signed-off-by: James Bottomley <address@hidden>

and is getting tripped up by the "53c700".

Explicitly providing the `-u' arg prevents that.