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

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

diff --combined include/linux/fs.h
index 1d80ba7,ecc8c2c..2d5a112
--- 1/include/linux/fs.h
--- 2/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -6,7 -6,6 +6,6 @@@
   * structures etc.
   */
  
- #include <linux/config.h>
  #include <linux/limits.h>
  #include <linux/ioctl.h>
  
@@@ -1101,7 -1100,7 +1100,7 @@@ struct super_operations 
        int (*statfs) (struct super_block *, struct kstatfs *);
        int (*remount_fs) (struct super_block *, int *, char *);
        void (*clear_inode) (struct inode *);
 -      void (*umount_begin) (struct super_block *);
 +      void (*umount_begin) (struct vfsmount *, int);
  
        int (*show_options)(struct seq_file *, struct vfsmount *);
        int (*show_stats)(struct seq_file *, struct vfsmount *);
@@@ -1763,7 -1762,7 +1762,7 @@@ extern struct inode_operations simple_d
  struct tree_descr { char *name; const struct file_operations *ops; int mode; };
  struct dentry *d_alloc_name(struct dentry *, const char *);
  extern int simple_fill_super(struct super_block *, int, struct tree_descr *);
 -extern int simple_pin_fs(char *name, struct vfsmount **mount, int *count);
 +extern int simple_pin_fs(struct file_system_type *, struct vfsmount **mount, int *count);
  extern void simple_release_fs(struct vfsmount **mount, int *count);
  
  extern ssize_t simple_read_from_buffer(void __user *, size_t, loff_t *, const void *, size_t);

diff --combined include/linux/lockd/lockd.h
index 6b26847,a8876bc..aa4fe90
--- 1/include/linux/lockd/lockd.h
--- 2/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@@ -11,7 -11,6 +11,6 @@@
  
  #ifdef __KERNEL__
  
- #include <linux/config.h>
  #include <linux/in.h>
  #include <linux/fs.h>
  #include <linux/kref.h>
@@@ -50,12 -49,11 +49,12 @@@ struct nlm_host 
                                h_killed     : 1,
                                h_monitored  : 1;
        wait_queue_head_t       h_gracewait;    /* wait while reclaiming */
 +      struct rw_semaphore     h_rwsem;        /* Reboot recovery lock */
        u32                     h_state;        /* pseudo-state counter */
        u32                     h_nsmstate;     /* true remote NSM state */
        u32                     h_pidcount;     /* Pseudopids */
        atomic_t                h_count;        /* reference count */
 -      struct semaphore        h_sema;         /* mutex for pmap binding */
 +      struct mutex            h_mutex;        /* mutex for pmap binding */
        unsigned long           h_nextrebind;   /* next portmap call */
        unsigned long           h_expires;      /* eligible for GC */
        struct list_head        h_lockowners;   /* Lockowners for the client */
@@@ -221,7 -219,6 +220,7 @@@ static __inline__ in
  nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2)
  {
        return  fl1->fl_pid   == fl2->fl_pid
 +           && fl1->fl_owner == fl2->fl_owner
             && fl1->fl_start == fl2->fl_start
             && fl1->fl_end   == fl2->fl_end
             &&(fl1->fl_type  == fl2->fl_type || fl2->fl_type == F_UNLCK);

diff --combined include/linux/nfs4.h
index 1477fc8,1059e6d..5f681d5
--- 1/include/linux/nfs4.h
--- 2/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@@ -14,7 -14,6 +14,6 @@@
  #define _LINUX_NFS4_H
  
  #include <linux/types.h>
- #include <linux/list.h>
  
  #define NFS4_VERIFIER_SIZE    8
  #define NFS4_FHSIZE           128
@@@ -97,6 -96,9 +96,9 @@@ enum nfs4_acl_whotype 
        NFS4_ACL_WHO_EVERYONE,
  };
  
+ #ifdef __KERNEL__
+ #include <linux/list.h>
+ 
  struct nfs4_ace {
        uint32_t        type;
        uint32_t        flag;
@@@ -345,8 -347,6 +347,6 @@@ enum lock_type4 
  #define NFS4_MINOR_VERSION 0
  #define NFS4_DEBUG 1
  
- #ifdef __KERNEL__
- 
  /* Index of predefined Linux client operations */
  
  enum {
@@@ -384,7 -384,6 +384,7 @@@
        NFSPROC4_CLNT_DELEGRETURN,
        NFSPROC4_CLNT_GETACL,
        NFSPROC4_CLNT_SETACL,
 +      NFSPROC4_CLNT_FS_LOCATIONS,
  };
  
  #endif