* Re: Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1
2004-08-26 1:31 Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1 Predrag Ivanovic
@ 2004-08-25 23:41 ` Felipe Alfaro Solana
2004-08-25 23:50 ` David S. Miller
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Felipe Alfaro Solana @ 2004-08-25 23:41 UTC (permalink / raw)
To: predivan; +Cc: linux kernel mailing list
On Thursday 26 August 2004 03:31, Predrag Ivanovic wrote:
> Hi.
>
> There are two .rej files when I patch 2.6.8.1 to 2.6.9-rc1
> (I ran 'make mrproper' when I unpacked 2.6.8.1 tarball).
> These are :
2.6.9-rc1 should be applied on top of 2.6.8 (and not 2.6.8.1).
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1
2004-08-26 1:31 Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1 Predrag Ivanovic
2004-08-25 23:41 ` Felipe Alfaro Solana
@ 2004-08-25 23:50 ` David S. Miller
2004-08-26 17:52 ` Predrag Ivanovic
2004-08-25 23:58 ` Dominik Karall
2004-08-26 0:51 ` Daniel Andersen
3 siblings, 1 reply; 6+ messages in thread
From: David S. Miller @ 2004-08-25 23:50 UTC (permalink / raw)
To: predivan; +Cc: linux-kernel
On Thu, 26 Aug 2004 01:31:36 +0000
Predrag Ivanovic <predivan@ptt.yu> wrote:
> There are two .rej files when I patch 2.6.8.1 to 2.6.9-rc1
Because the 2.6.9-rc1 patch is against 2.6.8 not 2.6.8.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1
2004-08-26 1:31 Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1 Predrag Ivanovic
2004-08-25 23:41 ` Felipe Alfaro Solana
2004-08-25 23:50 ` David S. Miller
@ 2004-08-25 23:58 ` Dominik Karall
2004-08-26 0:51 ` Daniel Andersen
3 siblings, 0 replies; 6+ messages in thread
From: Dominik Karall @ 2004-08-25 23:58 UTC (permalink / raw)
To: predivan; +Cc: linux kernel mailing list
On Thursday 26 August 2004 03:31, Predrag Ivanovic wrote:
> Hi.
>
> There are two .rej files when I patch 2.6.8.1 to 2.6.9-rc1
> (I ran 'make mrproper' when I unpacked 2.6.8.1 tarball).
> These are :
> linux-2.6.9-rc1/Makefile.rej
> -------------------------------------------
> ***************
> .....
> .....
> lock_kernel();
> ------------------------------------------------------------
>
> HTH.
> Pedja
> LGOEG
the 2.6.9-rc1 patch is build against 2.6.8, not 2.6.8.1, so you will need to
do a 'patch -p1 < patch-2.6.8.1 -R' and patch afterwards with -rc1.
regards,
dominik
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1
2004-08-26 1:31 Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1 Predrag Ivanovic
` (2 preceding siblings ...)
2004-08-25 23:58 ` Dominik Karall
@ 2004-08-26 0:51 ` Daniel Andersen
3 siblings, 0 replies; 6+ messages in thread
From: Daniel Andersen @ 2004-08-26 0:51 UTC (permalink / raw)
To: predivan; +Cc: linux kernel mailing list
Predrag Ivanovic wrote:
> Hi.
>
> There are two .rej files when I patch 2.6.8.1 to 2.6.9-rc1
2.6.9-rc1 is to be patched against 2.6.8 and not 2.6.8.1
Daniel Andersen
--
^ permalink raw reply [flat|nested] 6+ messages in thread
* Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1
@ 2004-08-26 1:31 Predrag Ivanovic
2004-08-25 23:41 ` Felipe Alfaro Solana
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Predrag Ivanovic @ 2004-08-26 1:31 UTC (permalink / raw)
To: linux kernel mailing list
Hi.
There are two .rej files when I patch 2.6.8.1 to 2.6.9-rc1
(I ran 'make mrproper' when I unpacked 2.6.8.1 tarball).
These are :
linux-2.6.9-rc1/Makefile.rej
-------------------------------------------
***************
*** 1,7 ****
VERSION = 2
PATCHLEVEL = 6
- SUBLEVEL = 8
- EXTRAVERSION =
NAME=Zonked Quokka
# *DOCUMENTATION*
--- 1,7 ----
VERSION = 2
PATCHLEVEL = 6
+ SUBLEVEL = 9
+ EXTRAVERSION = -rc1
NAME=Zonked Quokka
# *DOCUMENTATION*
-------------------------------------------
and linux-2.6.9-rc1/fs/nfs/file.c.rej.
------------------------------------------------
***************
*** 72,78 ****
static int nfs_check_flags(int flags)
{
- if (flags & (O_APPEND | O_DIRECT))
return -EINVAL;
return 0;
--- 74,80 ----
static int nfs_check_flags(int flags)
{
+ if ((flags & (O_APPEND | O_DIRECT)) == (O_APPEND | O_DIRECT))
return -EINVAL;
return 0;
***************
*** 89,95 ****
int res;
res = nfs_check_flags(filp->f_flags);
- if (!res)
return res;
lock_kernel();
--- 91,97 ----
int res;
res = nfs_check_flags(filp->f_flags);
+ if (res)
return res;
lock_kernel();
------------------------------------------------------------
HTH.
Pedja
LGOEG
--
Give a man a match, and he'll be warm for a minute, but
set him on fire, and he'll be warm for the rest of his life.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1
2004-08-25 23:50 ` David S. Miller
@ 2004-08-26 17:52 ` Predrag Ivanovic
0 siblings, 0 replies; 6+ messages in thread
From: Predrag Ivanovic @ 2004-08-26 17:52 UTC (permalink / raw)
To: David S. Miller; +Cc: linux-kernel
On Wed, 25 Aug 2004 16:50:08 -0700
"David S. Miller" <davem@redhat.com> wrote:
> On Thu, 26 Aug 2004 01:31:36 +0000
> Predrag Ivanovic <predivan@ptt.yu> wrote:
>
>
> > There are two .rej files when I patch 2.6.8.1 to 2.6.9-rc1
>
> Because the 2.6.9-rc1 patch is against 2.6.8 not 2.6.8.1
>
Since 2.6.8.1 is latest,I figured that 2.6.9-rc1 should be
appllied to it.
Sorry,my mistake :-)
Pedja
--
I shall sellotape my cat to a skateboard and fire him into the lake
with a dwarf on his back! -- Adrian Foden plotting Animal Jackass.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-08-26 15:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-08-26 1:31 Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1 Predrag Ivanovic
2004-08-25 23:41 ` Felipe Alfaro Solana
2004-08-25 23:50 ` David S. Miller
2004-08-26 17:52 ` Predrag Ivanovic
2004-08-25 23:58 ` Dominik Karall
2004-08-26 0:51 ` Daniel Andersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox