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

diff --git a/include/uapi/linux/firewire-constants.h b/include/uapi/linux/firewire-constants.h
new file mode 100644
index 000000000000..9b4bb5fbba4b
--- /dev/null
+++ b/include/uapi/linux/firewire-constants.h
@@ -0,0 +1,92 @@
+/*
+ * IEEE 1394 constants.
+ *
+ * Copyright (C) 2005-2007  Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _LINUX_FIREWIRE_CONSTANTS_H
+#define _LINUX_FIREWIRE_CONSTANTS_H
+
+#define TCODE_WRITE_QUADLET_REQUEST     0x0
+#define TCODE_WRITE_BLOCK_REQUEST       0x1
+#define TCODE_WRITE_RESPONSE            0x2
+#define TCODE_READ_QUADLET_REQUEST      0x4
+#define TCODE_READ_BLOCK_REQUEST        0x5
+#define TCODE_READ_QUADLET_RESPONSE     0x6
+#define TCODE_READ_BLOCK_RESPONSE       0x7
+#define TCODE_CYCLE_START               0x8
+#define TCODE_LOCK_REQUEST              0x9
+#define TCODE_STREAM_DATA               0xa
+#define TCODE_LOCK_RESPONSE             0xb
+
+#define EXTCODE_MASK_SWAP               0x1
+#define EXTCODE_COMPARE_SWAP            0x2
+#define EXTCODE_FETCH_ADD               0x3
+#define EXTCODE_LITTLE_ADD              0x4
+#define EXTCODE_BOUNDED_ADD             0x5
+#define EXTCODE_WRAP_ADD                0x6
+#define EXTCODE_VENDOR_DEPENDENT        0x7
+
+/* Linux firewire-core (Juju) specific tcodes */
+#define TCODE_LOCK_MASK_SWAP            (0x10 | EXTCODE_MASK_SWAP)
+#define TCODE_LOCK_COMPARE_SWAP         (0x10 | EXTCODE_COMPARE_SWAP)
+#define TCODE_LOCK_FETCH_ADD            (0x10 | EXTCODE_FETCH_ADD)
+#define TCODE_LOCK_LITTLE_ADD           (0x10 | EXTCODE_LITTLE_ADD)
+#define TCODE_LOCK_BOUNDED_ADD          (0x10 | EXTCODE_BOUNDED_ADD)
+#define TCODE_LOCK_WRAP_ADD             (0x10 | EXTCODE_WRAP_ADD)
+#define TCODE_LOCK_VENDOR_DEPENDENT     (0x10 | EXTCODE_VENDOR_DEPENDENT)
+
+#define RCODE_COMPLETE                  0x0
+#define RCODE_CONFLICT_ERROR            0x4
+#define RCODE_DATA_ERROR                0x5
+#define RCODE_TYPE_ERROR                0x6
+#define RCODE_ADDRESS_ERROR             0x7
+
+/* Linux firewire-core (Juju) specific rcodes */
+#define RCODE_SEND_ERROR                0x10
+#define RCODE_CANCELLED                 0x11
+#define RCODE_BUSY                      0x12
+#define RCODE_GENERATION                0x13
+#define RCODE_NO_ACK                    0x14
+
+#define SCODE_100                       0x0
+#define SCODE_200                       0x1
+#define SCODE_400                       0x2
+#define SCODE_800                       0x3
+#define SCODE_1600                      0x4
+#define SCODE_3200                      0x5
+#define SCODE_BETA                      0x3
+
+#define ACK_COMPLETE                    0x1
+#define ACK_PENDING                     0x2
+#define ACK_BUSY_X                      0x4
+#define ACK_BUSY_A                      0x5
+#define ACK_BUSY_B                      0x6
+#define ACK_DATA_ERROR                  0xd
+#define ACK_TYPE_ERROR                  0xe
+
+#define RETRY_1                         0x00
+#define RETRY_X                         0x01
+#define RETRY_A                         0x02
+#define RETRY_B                         0x03
+
+#endif /* _LINUX_FIREWIRE_CONSTANTS_H */