Two .rej files when patching from 2.6.8.1 to 2.6.9-rc1

[Predrag Ivanovic]

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