On Fri, Apr 01, 2005 at 11:56:35PM +0300, Can Burak �ilingir wrote:
> OK, attached.

Thanks.

Regards,

// Ola

> On Mar 28, 2005 10:20 PM, Ola Lundqvist <[EMAIL PROTECTED]> wrote:
> > Hello
> > 
> > On Mon, Mar 28, 2005 at 06:21:28PM +0300, Can Burak Cilingir wrote:
> > > Package: kernel-patch-vserver
> > > Version: 1.9.4-2
> > > Severity: important
> > > Tags: patch
> > >
> > >
> > > patch rejected (kernel-source 2.6.10), following patch is a patch for the 
> > > patch (if i used the
> > > diff tool correctly)
> > 
> > Thanks a lot.
> > 
> > It would be nice if you could send me this patch as an attachment as
> > it will not be broken by the email program. :)
> > 
> > Regards,
> > 
> > // Ola
> > 
> > > after applying this, merges correctly
> > >
> > > --- patch-2.6.10-5-debian-vs1.9.4.diff.orig     2005-03-28
> > > 16:53:58.000000000 +0300
> > > +++ patch-2.6.10-5-debian-vs1.9.4.diff  2005-03-28 17:07:31.000000000
> > > +0300
> > > @@ -10141,9 +10141,9 @@
> > >   #include <linux/dcookies.h>
> > >     #include <linux/suspend.h>
> > >      +#include <linux/vs_cvirt.h>
> > >      -
> > >      - #include <linux/compat.h>
> > >      - #include <linux/syscalls.h>
> > >      + #include <linux/tty.h>
> > >      +
> > >      + #include <linux/compat.h>
> > >       @@ -225,7 +227,10 @@ static int set_one_prio(struct task_stru
> > >                       goto out;
> > >                             }
> > >
> > >
> > >
> > > -- System Information:
> > > Debian Release: 3.1
> > >   APT prefers unstable
> > >   APT policy: (500, 'unstable')
> > > Architecture: i386 (i686)
> > > Kernel: Linux 2.6.9-2-686
> > > Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
> > >
> > > Versions of packages kernel-patch-vserver depends on:
> > > ii  bash                          3.0-14     The GNU Bourne Again SHell
> > > ii  grep-dctrl                    2.1.9      Grep Debian package 
> > > information
> > > ii  patch                         2.5.9-2    Apply a diff file to an 
> > > original
> > >
> > > -- no debconf information
> > >
> > >
> > 
> > --
> >  --------------------- Ola Lundqvist ---------------------------
> > /  [EMAIL PROTECTED]                     Annebergsslingan 37      \
> > |  [EMAIL PROTECTED]                 654 65 KARLSTAD          |
> > |  +46 (0)54-10 14 30                  +46 (0)70-332 1551       |
> > |  http://www.opal.dhs.org             UIN/icq: 4912500         |
> > \  gpg/f.p.: 7090 A92B 18FE 7994 0C36  4FE4 18A1 B1CF 0FE5 3DD9 /
> >  ---------------------------------------------------------------
> > 
> 
> 
> 
> -- 
> Can Burak Cilingir
> http://canb.net/
> icq#10720999

> --- patch-2.6.10-5-debian-vs1.9.4.diff.orig   2005-03-28 16:53:58.000000000 
> +0300
> +++ patch-2.6.10-5-debian-vs1.9.4.diff.can    2005-03-28 18:22:18.000000000 
> +0300
> @@ -10141,9 +10141,9 @@
>   #include <linux/dcookies.h>
>   #include <linux/suspend.h>
>  +#include <linux/vs_cvirt.h>
> - 
> - #include <linux/compat.h>
> - #include <linux/syscalls.h>
> + #include <linux/tty.h>
> +
> + #include <linux/compat.h>     
>  @@ -225,7 +227,10 @@ static int set_one_prio(struct task_stru
>               goto out;
>       }


-- 
 --- Ola Lundqvist systemkonsult --- M Sc in IT Engineering ----
/  [EMAIL PROTECTED]                   Annebergsslingan 37        \
|  [EMAIL PROTECTED]                   654 65 KARLSTAD            |
|  http://www.opal.dhs.org           Mobile: +46 (0)70-332 1551 |
\  gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9  /
 ---------------------------------------------------------------


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to