From: Bodo Eggert <7eggert@gmx.de>
Subject: [PATCH] Re: diff command line?
To: Russell King <rmk+lkml@arm.linux.org.uk>,
       Gene Heskett <gene.heskett@verizon.net>, linux-kernel@vger.kernel.org
Reply-To: 7eggert@nurfuerspam.de
Date: Sat, 05 Mar 2005 21:47:44 +0100
References: <fa.jshi2h6.1g20sjc@ifi.uio.no> <fa.h6jj2d8.143utbu@ifi.uio.no>
User-Agent: KNode/0.7.7
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7Bit
Message-Id: <E1D7gBd-0000q3-3G@be1.7eggert.dyndns.org>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1215
Lines: 28

Russell King <rmk+lkml@arm.linux.org.uk> wrote:
> On Sat, Mar 05, 2005 at 10:48:00AM -0500, Gene Heskett wrote:

>> What are the options normally used to generate a diff for public
>> consumption on this list?
> 
> diff -urpN orig new
> 
> where "orig" and "new" both contain the top level "linux" directory,
> so the resulting patch can be applied with patch -p1.

This seems to be a common mistake.

Signed-Off-By: Bodo Eggert <7eggert@gmx.de>

--- linux-2.6.11/Documentation/SubmittingPatches.ori    2005-03-05
21:29:26.000000000 +0100
+++ linux-2.6.11/Documentation/SubmittingPatches        2005-03-05
21:38:40.000000000 +0100
@@ -24,6 +24,7 @@ SECTION 1 - CREATING AND SENDING YOUR CH
 ------------

 Use "diff -up" or "diff -uprN" to create patches.
+The resulting patch must apply with -p1 from within the linux directory.

 All changes to the Linux kernel occur in the form of patches, as
 generated by diff(1).  When creating your patch, make sure to create it

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/