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, 47 insertions, 0 deletions

diff --git a/include/uapi/linux/ipsec.h b/include/uapi/linux/ipsec.h
new file mode 100644
index 000000000000..d17a6302a0e9
--- /dev/null
+++ b/include/uapi/linux/ipsec.h
@@ -0,0 +1,47 @@
+#ifndef _LINUX_IPSEC_H
+#define _LINUX_IPSEC_H
+
+/* The definitions, required to talk to KAME racoon IKE. */
+
+#include <linux/pfkeyv2.h>
+
+#define IPSEC_PORT_ANY          0
+#define IPSEC_ULPROTO_ANY       255
+#define IPSEC_PROTO_ANY         255
+
+enum {
+        IPSEC_MODE_ANY          = 0,    /* We do not support this for SA */
+        IPSEC_MODE_TRANSPORT    = 1,
+        IPSEC_MODE_TUNNEL       = 2,
+        IPSEC_MODE_BEET         = 3
+};
+
+enum {
+        IPSEC_DIR_ANY           = 0,
+        IPSEC_DIR_INBOUND       = 1,
+        IPSEC_DIR_OUTBOUND      = 2,
+        IPSEC_DIR_FWD           = 3,    /* It is our own */
+        IPSEC_DIR_MAX           = 4,
+        IPSEC_DIR_INVALID       = 5
+};
+
+enum {
+        IPSEC_POLICY_DISCARD    = 0,
+        IPSEC_POLICY_NONE       = 1,
+        IPSEC_POLICY_IPSEC      = 2,
+        IPSEC_POLICY_ENTRUST    = 3,
+        IPSEC_POLICY_BYPASS     = 4
+};
+
+enum {
+        IPSEC_LEVEL_DEFAULT     = 0,
+        IPSEC_LEVEL_USE         = 1,
+        IPSEC_LEVEL_REQUIRE     = 2,
+        IPSEC_LEVEL_UNIQUE      = 3
+};
+
+#define IPSEC_MANUAL_REQID_MAX  0x3fff
+
+#define IPSEC_REPLAYWSIZE  32
+
+#endif  /* _LINUX_IPSEC_H */