From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756168AbXJMNwR (ORCPT ); Sat, 13 Oct 2007 09:52:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754060AbXJMNwB (ORCPT ); Sat, 13 Oct 2007 09:52:01 -0400 Received: from emailhub.stusta.mhn.de ([141.84.69.5]:37680 "EHLO mailhub.stusta.mhn.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754036AbXJMNwA (ORCPT ); Sat, 13 Oct 2007 09:52:00 -0400 Date: Sat, 13 Oct 2007 15:52:29 +0200 From: Adrian Bunk To: Jan Engelhardt Cc: Geert Uytterhoeven , Andy Whitcroft , Randy Dunlap , Joel Schopp , Linux Kernel Development , Matthew Wilcox Subject: Re: checkpatch: ERROR: Does not appear to be a unified-diff format patch Message-ID: <20071013135229.GB4211@stusta.de> References: <20071013124733.GA4211@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.16 (2007-06-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Oct 13, 2007 at 02:55:01PM +0200, Jan Engelhardt wrote: > > On Oct 13 2007 14:47, Adrian Bunk wrote: > >On Sat, Oct 13, 2007 at 02:28:00PM +0200, Geert Uytterhoeven wrote: > >> scripts/checkpatch.pl doesn't seem to like this patch: > >> > >> $ scripts/checkpatch.pl m68k-export-asm-cachectl-h.diff > >> ERROR: Does not appear to be a unified-diff format patch > >>... > >> --- a/include/asm-m68k/Kbuild > >> +++ b/include/asm-m68k/Kbuild > >> @@ -1 +1,2 @@ > >>... ^^ > > > >Broken patch, this has to be "-1,1". > > No, this is actually how diff outputs it. >... You seem to be right. That's a really strange part of the unidiff format - you have to write ",0" or ",2", but you can omit a ",1". cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed