Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index de35ffe2f79d..5d2cefb5e52d 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -524,7 +524,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)
          * filter the internal and ioctl commands
          */
         if((cmd->cmnd[0] == MEGA_INTERNAL_CMD)) {
-                return cmd->buffer;
+                return cmd->request_buffer;
         }
 
 
@@ -1828,7 +1828,7 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)
 
         scb->dma_type = MEGA_SGLIST;
 
-        if( sgcnt > adapter->sglen ) BUG();
+        BUG_ON(sgcnt > adapter->sglen);
 
         *len = 0;
 
@@ -4492,7 +4492,7 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
         scmd->device = sdev;
 
         scmd->device->host = adapter->host;
-        scmd->buffer = (void *)scb;
+        scmd->request_buffer = (void *)scb;
         scmd->cmnd[0] = MEGA_INTERNAL_CMD;
 
         scb->state |= SCB_ACTIVE;