Messages in this thread Patch in this message | | | From | Bodo Eggert <> | Subject | [PATCH] Re: diff command line? | Date | Sat, 05 Mar 2005 21:47:44 +0100 |
| |
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/
| |