SOURCES: kernel-desktop-nock-compat.patch, kernel-desktop-fcache.p...

[sparky]

Author: sparky                       Date: Fri Jun 30 22:27:25 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- sync with ck.patch

---- Files affected:
SOURCES:
   kernel-desktop-nock-compat.patch (1.2 -> 1.3) , kernel-desktop-fcache.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-nock-compat.patch
diff -u SOURCES/kernel-desktop-nock-compat.patch:1.2 SOURCES/kernel-desktop-nock-compat.patch:1.3
--- SOURCES/kernel-desktop-nock-compat.patch:1.2	Fri Jun 23 21:15:06 2006
+++ SOURCES/kernel-desktop-nock-compat.patch	Sat Jul  1 00:27:20 2006
@@ -13,10 +13,10 @@
 --- linux-2.6.17-ck1.orig/include/linux/bio.h	2006-03-20 20:11:41.000000000 +1100
 +++ linux-2.6.17-ck1/include/linux/bio.h	2006-06-18 15:34:44.000000000 +1000
 @@ -124,6 +124,7 @@ struct bio {
+ #define BIO_BOUNCED	5	/* bio is a bounce bio */
  #define BIO_USER_MAPPED 6	/* contains user pages */
  #define BIO_EOPNOTSUPP	7	/* not supported */
- #define BIO_SUSPEND2	8	/* Suspend2 bio - for corruption checking */
-+#define BIO_NOMERGE	9	/* bio not mergeable */
++#define BIO_NOMERGE	8	/* bio not mergeable */
  #define bio_flagged(bio, flag)	((bio)->bi_flags & (1 << (flag)))
  
  /*

================================================================
Index: SOURCES/kernel-desktop-fcache.patch
diff -u SOURCES/kernel-desktop-fcache.patch:1.2 SOURCES/kernel-desktop-fcache.patch:1.3
--- SOURCES/kernel-desktop-fcache.patch:1.2	Fri Jun 23 21:16:04 2006
+++ SOURCES/kernel-desktop-fcache.patch	Sat Jul  1 00:27:20 2006
@@ -1728,10 +1728,10 @@
 --- linux-2.6.17/include/linux/bio.h	2006-06-18 03:49:35.000000000 +0200
 +++ linux-2.6.17.fcache/include/linux/bio.h	2006-06-21 15:58:45.000000000 +0200
 @@ -124,6 +124,7 @@ struct bio {
+ #define BIO_BOUNCED	5	/* bio is a bounce bio */
  #define BIO_USER_MAPPED 6	/* contains user pages */
  #define BIO_EOPNOTSUPP	7	/* not supported */
- #define BIO_SUSPEND2	8	/* Suspend2 bio - for corruption checking */
-+#define BIO_NOMERGE	9	/* bio not mergeable */
++#define BIO_NOMERGE	8	/* bio not mergeable */
  #define bio_flagged(bio, flag)	((bio)->bi_flags & (1 << (flag)))
  
  /*
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-nock-compat.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-fcache.patch?r1=1.2&r2=1.3&f=u