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, 2 insertions, 2 deletions

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 56cb49006116..1272dd249af3 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -1193,7 +1193,7 @@ static int st_open(struct inode *inode, struct file *filp)
 
 
 /* Flush the tape buffer before close */
-static int st_flush(struct file *filp)
+static int st_flush(struct file *filp, fl_owner_t id)
 {
         int result = 0, result2;
         unsigned char cmd[MAX_COMMAND_SIZE];
@@ -3839,7 +3839,7 @@ static int __init st_setup(char *str)
                                         break;
                                 }
                         }
-                        if (i >= sizeof(parms) / sizeof(struct st_dev_parm))
+                        if (i >= ARRAY_SIZE(parms))
                                  printk(KERN_WARNING "st: invalid parameter in '%s'\n",
                                         stp);
                         stp = strchr(stp, ',');