Merge branch 'devel' into next

Conflicts:

	fs/nfs/file.c

Fix up the conflict with Jon Corbet's bkl-removal tree

diff --cc fs/Kconfig
Simple merge

diff --cc fs/nfs/file.c
index 4e98a56,509dcb5..43164fe
--- 1/fs/nfs/file.c
--- 2/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -170,7 -180,11 +180,13 @@@ force_reval
  
  static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
  {
 +      loff_t loff;
++
+       dprintk("NFS: llseek file(%s/%s, %lld, %d)\n",
+                       filp->f_path.dentry->d_parent->d_name.name,
+                       filp->f_path.dentry->d_name.name,
+                       offset, origin);
+ 
        /* origin == SEEK_END => we must revalidate the cached file length */
        if (origin == SEEK_END) {
                struct inode *inode = filp->f_mapping->host;