Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c

diff --cc fs/cifs/cifsfs.c
index 1cebb7e34215c60278e2138b13edc4c5e4bb0980,bd0f2f2353ce3eda3be4aab2d21518cd58671154..1fd0dc85f53c9a25a8f2cac7ab6c9a41e77b930e
--- 1/fs/cifs/cifsfs.c
--- 2/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@@ -856,10 -849,11 +856,11 @@@ static int cifs_oplock_thread(void *dum
        __u16  netfid;
        int rc;
  
+       set_freezable();
        do {
 -              if (try_to_freeze()) 
 +              if (try_to_freeze())
                        continue;
 -              
 +
                spin_lock(&GlobalMid_Lock);
                if (list_empty(&GlobalOplock_Q)) {
                        spin_unlock(&GlobalMid_Lock);

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/cifs/export.c
index c21d3d09d0afea5a056cb7c420eb85b8d226b458,96df1d51fdc367f509a332fc6dae4629c42cde93..893fd0aebff82160ec04ecd6b4de5825c7bfa956
--- 1/fs/cifs/export.c
--- 2/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@@ -41,28 -30,24 +41,26 @@@
  
  #include <linux/fs.h>
  #include <linux/exportfs.h>
 - 
 +#include "cifsglob.h"
 +#include "cifs_debug.h"
 +
- 
  #ifdef CONFIG_CIFS_EXPERIMENTAL
- 
 - 
  static struct dentry *cifs_get_parent(struct dentry *dentry)
  {
 -      /* BB need to add code here eventually to enable export via NFSD */
 -      return ERR_PTR(-EACCES);
 +      /* BB need to add code here eventually to enable export via NFSD */
 +      cFYI(1, ("get parent for %p", dentry));
 +      return ERR_PTR(-EACCES);
  }
 - 
 +
  struct export_operations cifs_export_ops = {
 -      .get_parent = cifs_get_parent,
 -/*    Following five export operations are unneeded so far and can default */         
 -/*    .get_dentry =
 -      .get_name =
 -      .find_exported_dentry =
 -      .decode_fh = 
 -      .encode_fs =  */
 - };
 - 
 +      .get_parent = cifs_get_parent,
 +/*    Following five export operations are unneeded so far and can default:
 +      .get_dentry =
 +      .get_name =
 +      .find_exported_dentry =
 +      .decode_fh =
 +      .encode_fs =  */
 +};
 +
  #endif /* EXPERIMENTAL */
 - 
 +