Merge v3.9-rc5 into usb-next

We want the fixes here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-04-01 12:14:26 -07:00
parent b983e51a73 07961ac7c0
commit 44e63941e7
256 changed files with 2952 additions and 1456 deletions
@@ -33,9 +33,11 @@ enum {
 	PACKET_DIAG_TX_RING,
 	PACKET_DIAG_FANOUT,

-	PACKET_DIAG_MAX,
+	__PACKET_DIAG_MAX,
 };

+#define PACKET_DIAG_MAX (__PACKET_DIAG_MAX - 1)
+
 struct packet_diag_info {
 	__u32	pdi_index;
 	__u32	pdi_version;
@@ -39,9 +39,11 @@ enum {
 	UNIX_DIAG_MEMINFO,
 	UNIX_DIAG_SHUTDOWN,

-	UNIX_DIAG_MAX,
+	__UNIX_DIAG_MAX,
 };

+#define UNIX_DIAG_MAX (__UNIX_DIAG_MAX - 1)
+
 struct unix_diag_vfs {
 	__u32	udiag_vfs_ino;
 	__u32	udiag_vfs_dev;