lkml.org 
[lkml]   [2007]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.6.20-rt8 patch tweaked for 2.6.20.5
Ingo Molnar wrote:

> John wrote:
>
>> Great! Can you tell me how you generate the original -rt patch, so I
>> can provide an updated version when a new 2.6.20 kernel is released?
>
> they should be generated the way you did: apply the 2.6.20 baseline -rt
> kernel patch to the later patches and fix up rejects. For later kernels
> just do the same.

What options do you give diff?

The output of your patch is e.g.

Index: linux/drivers/input/gameport/gameport.c
===================================================================
--- linux.orig/drivers/input/gameport/gameport.c
+++ linux/drivers/input/gameport/gameport.c
@@ -21,6 +21,7 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/kthread.h>
+#include <linux/interrupt.h>
[...]


diff -upr gives me, e.g.

diff -upr linux-2.6.20.5/drivers/input/gameport/gameport.c
linux-2.6.20.5-rt8/drivers/input/gameport/gameport.c
--- linux-2.6.20.5/drivers/input/gameport/gameport.c 2007-04-06
12:44:59.000000000 +0200
+++ linux-2.6.20.5-rt8/drivers/input/gameport/gameport.c
2007-04-06 18:09:48.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/kthread.h>
+#include <linux/interrupt.h>
[...]

How do I get diff not to print the file time stamps?

How do I get diff not to print the command line for each file?

Regards.
-
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/
\
 
 \ /
  Last update: 2007-04-10 18:25    [W:0.094 / U:0.240 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site