Merge commit 'v3.7-rc1' into stable/for-linus-3.7

* commit 'v3.7-rc1': (10892 commits)
  Linux 3.7-rc1
  x86, boot: Explicitly include autoconf.h for hostprogs
  perf: Fix UAPI fallout
  ARM: config: make sure that platforms are ordered by option string
  ARM: config: sort select statements alphanumerically
  UAPI: (Scripted) Disintegrate include/linux/byteorder
  UAPI: (Scripted) Disintegrate include/linux
  UAPI: Unexport linux/blk_types.h
  UAPI: Unexport part of linux/ppp-comp.h
  perf: Handle new rbtree implementation
  procfs: don't need a PATH_MAX allocation to hold a string representation of an int
  vfs: embed struct filename inside of names_cache allocation if possible
  audit: make audit_inode take struct filename
  vfs: make path_openat take a struct filename pointer
  vfs: turn do_path_lookup into wrapper around struct filename variant
  audit: allow audit code to satisfy getname requests from its names_list
  vfs: define struct filename and have getname() return it
  btrfs: Fix compilation with user namespace support enabled
  userns: Fix posix_acl_file_xattr_userns gid conversion
  userns: Properly print bluetooth socket uids
  ...

1 files changed, 71 insertions, 0 deletions

diff --git a/include/uapi/linux/ncp_mount.h b/include/uapi/linux/ncp_mount.h
new file mode 100644
index 000000000000..dfcbea2d889f
--- /dev/null
+++ b/include/uapi/linux/ncp_mount.h
@@ -0,0 +1,71 @@
+/*
+ *  ncp_mount.h
+ *
+ *  Copyright (C) 1995, 1996 by Volker Lendecke
+ *
+ */
+
+#ifndef _LINUX_NCP_MOUNT_H
+#define _LINUX_NCP_MOUNT_H
+
+#include <linux/types.h>
+#include <linux/ncp.h>
+
+#define NCP_MOUNT_VERSION 3     /* Binary */
+
+/* Values for flags */
+#define NCP_MOUNT_SOFT          0x0001
+#define NCP_MOUNT_INTR          0x0002
+#define NCP_MOUNT_STRONG        0x0004  /* enable delete/rename of r/o files */
+#define NCP_MOUNT_NO_OS2        0x0008  /* do not use OS/2 (LONG) namespace */
+#define NCP_MOUNT_NO_NFS        0x0010  /* do not use NFS namespace */
+#define NCP_MOUNT_EXTRAS        0x0020
+#define NCP_MOUNT_SYMLINKS      0x0040  /* enable symlinks */
+#define NCP_MOUNT_NFS_EXTRAS    0x0080  /* Enable use of NFS NS meta-info */
+
+struct ncp_mount_data {
+        int version;
+        unsigned int ncp_fd;    /* The socket to the ncp port */
+        __kernel_uid_t mounted_uid;     /* Who may umount() this filesystem? */
+        __kernel_pid_t wdog_pid;                /* Who cares for our watchdog packets? */
+
+        unsigned char mounted_vol[NCP_VOLNAME_LEN + 1];
+        unsigned int time_out;  /* How long should I wait after
+                                   sending a NCP request? */
+        unsigned int retry_count;       /* And how often should I retry? */
+        unsigned int flags;
+
+        __kernel_uid_t uid;
+        __kernel_gid_t gid;
+        __kernel_mode_t file_mode;
+        __kernel_mode_t dir_mode;
+};
+
+#define NCP_MOUNT_VERSION_V4    (4)     /* Binary or text */
+
+struct ncp_mount_data_v4 {
+        int version;
+        unsigned long flags;    /* NCP_MOUNT_* flags */
+        /* MIPS uses long __kernel_uid_t, but... */
+        /* we neever pass -1, so it is safe */
+        unsigned long mounted_uid;      /* Who may umount() this filesystem? */
+        /* MIPS uses long __kernel_pid_t */
+        long wdog_pid;          /* Who cares for our watchdog packets? */
+
+        unsigned int ncp_fd;    /* The socket to the ncp port */
+        unsigned int time_out;  /* How long should I wait after
+                                   sending a NCP request? */
+        unsigned int retry_count;       /* And how often should I retry? */
+
+        /* MIPS uses long __kernel_uid_t... */
+        /* we never pass -1, so it is safe */
+        unsigned long uid;
+        unsigned long gid;
+        /* MIPS uses unsigned long __kernel_mode_t */
+        unsigned long file_mode;
+        unsigned long dir_mode;
+};
+
+#define NCP_MOUNT_VERSION_V5    (5)     /* Text only */
+
+#endif