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

diff --git a/include/uapi/linux/rose.h b/include/uapi/linux/rose.h
new file mode 100644
index 000000000000..1fcfe95893b8
--- /dev/null
+++ b/include/uapi/linux/rose.h
@@ -0,0 +1,90 @@
+/*
+ * These are the public elements of the Linux kernel Rose implementation.
+ * For kernel AX.25 see the file ax25.h. This file requires ax25.h for the
+ * definition of the ax25_address structure.
+ */
+
+#ifndef ROSE_KERNEL_H
+#define ROSE_KERNEL_H
+
+#include <linux/socket.h>
+#include <linux/ax25.h>
+
+#define ROSE_MTU        251
+
+#define ROSE_MAX_DIGIS 6
+
+#define ROSE_DEFER      1
+#define ROSE_T1         2
+#define ROSE_T2         3
+#define ROSE_T3         4
+#define ROSE_IDLE       5
+#define ROSE_QBITINCL   6
+#define ROSE_HOLDBACK   7
+
+#define SIOCRSGCAUSE            (SIOCPROTOPRIVATE+0)
+#define SIOCRSSCAUSE            (SIOCPROTOPRIVATE+1)
+#define SIOCRSL2CALL            (SIOCPROTOPRIVATE+2)
+#define SIOCRSSL2CALL           (SIOCPROTOPRIVATE+2)
+#define SIOCRSACCEPT            (SIOCPROTOPRIVATE+3)
+#define SIOCRSCLRRT             (SIOCPROTOPRIVATE+4)
+#define SIOCRSGL2CALL           (SIOCPROTOPRIVATE+5)
+#define SIOCRSGFACILITIES       (SIOCPROTOPRIVATE+6)
+
+#define ROSE_DTE_ORIGINATED     0x00
+#define ROSE_NUMBER_BUSY        0x01
+#define ROSE_INVALID_FACILITY   0x03
+#define ROSE_NETWORK_CONGESTION 0x05
+#define ROSE_OUT_OF_ORDER       0x09
+#define ROSE_ACCESS_BARRED      0x0B
+#define ROSE_NOT_OBTAINABLE     0x0D
+#define ROSE_REMOTE_PROCEDURE   0x11
+#define ROSE_LOCAL_PROCEDURE    0x13
+#define ROSE_SHIP_ABSENT        0x39
+
+typedef struct {
+        char            rose_addr[5];
+} rose_address;
+
+struct sockaddr_rose {
+        __kernel_sa_family_t srose_family;
+        rose_address    srose_addr;
+        ax25_address    srose_call;
+        int             srose_ndigis;
+        ax25_address    srose_digi;
+};
+
+struct full_sockaddr_rose {
+        __kernel_sa_family_t srose_family;
+        rose_address    srose_addr;
+        ax25_address    srose_call;
+        unsigned int    srose_ndigis;
+        ax25_address    srose_digis[ROSE_MAX_DIGIS];
+};
+
+struct rose_route_struct {
+        rose_address    address;
+        unsigned short  mask;
+        ax25_address    neighbour;
+        char            device[16];
+        unsigned char   ndigis;
+        ax25_address    digipeaters[AX25_MAX_DIGIS];
+};
+
+struct rose_cause_struct {
+        unsigned char   cause;
+        unsigned char   diagnostic;
+};
+
+struct rose_facilities_struct {
+        rose_address    source_addr,   dest_addr;
+        ax25_address    source_call,   dest_call;
+        unsigned char   source_ndigis, dest_ndigis;
+        ax25_address    source_digis[ROSE_MAX_DIGIS];
+        ax25_address    dest_digis[ROSE_MAX_DIGIS];
+        unsigned int    rand;
+        rose_address    fail_addr;
+        ax25_address    fail_call;
+};
+
+#endif