r3877 - in trunk/kernel/source/linux-2.6: . debian debian/patches-debian

[Bastian Blank]

Author: waldi
Date: 2005-08-15 09:21:38 +0000 (Mon, 15 Aug 2005)
New Revision: 3877

Modified:
   trunk/kernel/source/linux-2.6/
   trunk/kernel/source/linux-2.6/debian/
   trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-ppc64-ibmvscsi.patch
Log:
r3873: waldi | 2005-08-15 09:12:30 +0000
Update svn:ignore properties.



Property changes on: trunk/kernel/source/linux-2.6
___________________________________________________________________
Name: svn:ignore
   - kernel
crypto
include
net
scripts
sound
CREDITS
README
init
lib
REPORTING-BUGS
security
fs
COPYING
mm
Documentation
usr
MAINTAINERS
ipc
arch
Makefile
drivers

version.Debian

   + arch
COPYING
CREDITS
crypto
Documentation
drivers
fs
include
init
ipc
kernel
lib
MAINTAINERS
Makefile
mm
net
README
REPORTING-BUGS
scripts
security
sound
usr

Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/branches/kernel/source/linux-2.6/release-2.6.12-2:3782
510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6:3869
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/branches/kernel/source/linux-2.6/release-2.6.12-2:3782
510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6:3875


Property changes on: trunk/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svn:ignore
   - control
control.md5sum
rules.gen

   + build
control
control.md5sum
files
linux-*
kernel-*
rules.gen
stamps

Name: svk:merge
   + 

Modified: trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-ppc64-ibmvscsi.patch
===================================================================
--- trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-ppc64-ibmvscsi.patch	2005-08-15 09:21:19 UTC (rev 3876)
+++ trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-ppc64-ibmvscsi.patch	2005-08-15 09:21:38 UTC (rev 3877)
@@ -1129,7 +1129,7 @@
 +					}
 +				} else {
 +					err("Block operation failed\n");
-+					print_command(iue->iu->srp.cmd.cdb);
++					/*print_command(iue->iu->srp.cmd.cdb);*/
 +					send_rsp(iue, SENSE_DEVICE_FAULT);
 +				}
 +			}
@@ -1377,7 +1377,7 @@
 +		bio->bi_io_vec[cur_biovec].bv_page = virt_to_page(buffer);
 +		bio->bi_io_vec[cur_biovec].bv_len = thislen;
 +		bio->bi_io_vec[cur_biovec].bv_offset =
-+		    (unsigned long)buffer & PAGE_OFFSET_MASK;
++		    (unsigned long)buffer & (PAGE_SIZE - 1);
 +		bio->bi_vcnt++;
 +
 +		len -= thislen;