Merge branch 'master'

diff --combined fs/Kconfig
index 62ee097776f0cede02b98c3ff935b95109a66ae1,f9b5842c8d2de67e6f9258f65fad1fc6207b9242..563a59e5e694db6b3fb2f217ba4dfe27df563cd1
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -323,7 -323,6 +323,7 @@@ config FS_POSIX_AC
        default n
  
  source "fs/xfs/Kconfig"
 +source "fs/gfs2/Kconfig"
  
  config OCFS2_FS
        tristate "OCFS2 file system support (EXPERIMENTAL)"
@@@ -800,6 -799,7 +800,7 @@@ config PROC_KCOR
  config PROC_VMCORE
          bool "/proc/vmcore support (EXPERIMENTAL)"
          depends on PROC_FS && EXPERIMENTAL && CRASH_DUMP
+       default y
          help
          Exports the dump image of crashed kernel in ELF format.
  
@@@ -842,6 -842,12 +843,12 @@@ config TMPF
  config HUGETLBFS
        bool "HugeTLB file system support"
        depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
+       help
+         hugetlbfs is a filesystem backing for HugeTLB pages, based on
+         ramfs. For architectures that support it, say Y here and read
+         <file:Documentation/vm/hugetlbpage.txt> for details.
+ 
+         If unsure, say N.
  
  config HUGETLB_PAGE
        def_bool HUGETLBFS
@@@ -862,7 -868,7 +869,7 @@@ config RAMF
  
  config CONFIGFS_FS
        tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       depends on SYSFS && EXPERIMENTAL
        help
          configfs is a ram-based filesystem that provides the converse
          of sysfs's functionality. Where sysfs is a filesystem-based
@@@ -1818,7 -1824,6 +1825,7 @@@ source "fs/partitions/Kconfig
  endmenu
  
  source "fs/nls/Kconfig"
 +source "fs/dlm/Kconfig"
  
  endmenu
  

diff --combined include/linux/fs.h
index 16be62041bfec6a7984e8e2080f01d32f94d6e67,3de2bfb2410ffcdc0449a7b5cbe5d1eee1dc54a2..ff56c0bec43cdfe3dae236685d3f4e8b01e689d7
--- 1/include/linux/fs.h
--- 2/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -762,7 -762,7 +762,7 @@@ extern int fcntl_getlease(struct file *
  #define SYNC_FILE_RANGE_WRITE         2
  #define SYNC_FILE_RANGE_WAIT_AFTER    4
  extern int do_sync_file_range(struct file *file, loff_t offset, loff_t endbyte,
-                       int flags);
+                       unsigned int flags);
  
  /* fs/locks.c */
  extern void locks_init_lock(struct file_lock *);
@@@ -1039,8 -1039,8 +1039,8 @@@ struct file_operations 
        int (*check_flags)(int);
        int (*dir_notify)(struct file *filp, unsigned long arg);
        int (*flock) (struct file *, int, struct file_lock *);
-       ssize_t (*splice_write)(struct inode *, struct file *, size_t, unsigned int);
-       ssize_t (*splice_read)(struct file *, struct inode *, size_t, unsigned int);
+       ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
+       ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
  };
  
  struct inode_operations {
@@@ -1329,9 -1329,6 +1329,9 @@@ extern struct subsystem fs_subsys
  #define FLOCK_VERIFY_READ  1
  #define FLOCK_VERIFY_WRITE 2
  
 +/* /sys/fs */
 +extern struct subsystem fs_subsys;
 +
  extern int locks_mandatory_locked(struct inode *);
  extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t);
  
@@@ -1614,8 -1611,17 +1614,17 @@@ extern ssize_t generic_file_sendfile(st
  extern void do_generic_mapping_read(struct address_space *mapping,
                                    struct file_ra_state *, struct file *,
                                    loff_t *, read_descriptor_t *, read_actor_t);
- extern ssize_t generic_file_splice_read(struct file *, struct inode *, size_t, unsigned int);
- extern ssize_t generic_file_splice_write(struct inode *, struct file *, size_t, unsigned int);
+ 
+ /* fs/splice.c */
+ extern ssize_t generic_file_splice_read(struct file *, loff_t *,
+               struct pipe_inode_info *, size_t, unsigned int);
+ extern ssize_t generic_file_splice_write(struct pipe_inode_info *,
+               struct file *, loff_t *, size_t, unsigned int);
+ extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
+               struct file *out, loff_t *, size_t len, unsigned int flags);
+ extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
+               size_t len, unsigned int flags);
+ 
  extern void
  file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
  extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 

diff --combined include/linux/kernel.h
index c73ed0b05591ab97ba07e61d7020e53a10dbee5f,e1bd0842f6a13e71ad0b781d4a5bdf6605986fbe..2ae50277f581a030cd2f235c4c955baa9d4fb49f
--- 1/include/linux/kernel.h
--- 2/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -29,7 -29,6 +29,7 @@@ extern const char linux_banner[]
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
 +#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
  
  #define       KERN_EMERG      "<0>"   /* system is unusable                   */
  #define       KERN_ALERT      "<1>"   /* action must be taken immediately     */
@@@ -177,7 -176,7 +177,7 @@@ static inline void console_verbose(void
  
  extern void bust_spinlocks(int yes);
  extern int oops_in_progress;          /* If set, an oops, panic(), BUG() or die() is in progress */
- extern __deprecated_for_modules int panic_timeout;
+ extern int panic_timeout;
  extern int panic_on_oops;
  extern int tainted;
  extern const char *print_tainted(void);