Merge tag 'v3.7-rc1' into staging/for_v3.8

Linux 3.7-rc1

* tag 'v3.7-rc1': (9579 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, 0 insertions, 64 deletions

diff --git a/include/linux/net_dropmon.h b/include/linux/net_dropmon.h
deleted file mode 100644
index 2a739462cae..00000000000
--- a/include/linux/net_dropmon.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef __NET_DROPMON_H
-#define __NET_DROPMON_H
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-
-struct net_dm_drop_point {
-	__u8 pc[8];
-	__u32 count;
-};
-
-#define is_drop_point_hw(x) do {\
-	int ____i, ____j;\
-	for (____i = 0; ____i < 8; i ____i++)\
-		____j |= x[____i];\
-	____j;\
-} while (0)
-
-#define NET_DM_CFG_VERSION  0
-#define NET_DM_CFG_ALERT_COUNT  1
-#define NET_DM_CFG_ALERT_DELAY 2
-#define NET_DM_CFG_MAX 3
-
-struct net_dm_config_entry {
-	__u32 type;
-	__u64 data __attribute__((aligned(8)));
-};
-
-struct net_dm_config_msg {
-	__u32 entries;
-	struct net_dm_config_entry options[0];
-};
-
-struct net_dm_alert_msg {
-	__u32 entries;
-	struct net_dm_drop_point points[0];
-};
-
-struct net_dm_user_msg {
-	union {
-		struct net_dm_config_msg user;
-		struct net_dm_alert_msg alert;
-	} u;
-};
-
-
-/* These are the netlink message types for this protocol */
-
-enum {
-	NET_DM_CMD_UNSPEC = 0,
-	NET_DM_CMD_ALERT,
-	NET_DM_CMD_CONFIG,
-	NET_DM_CMD_START,
-	NET_DM_CMD_STOP,
-	_NET_DM_CMD_MAX,
-};
-
-#define NET_DM_CMD_MAX (_NET_DM_CMD_MAX - 1)
-
-/*
- * Our group identifiers
- */
-#define NET_DM_GRP_ALERT 1
-#endif