diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-27 16:59:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-27 16:59:56 -0800 |
| commit | 95f873f2fff96c592c5d863e2a39825bd8bf0500 (patch) | |
| tree | 0d2dd664964ba2c701aefea5b4d1e85b481045e1 /net/netlink/af_netlink.h | |
| parent | 8ea65f4a2dfaaf494ef42a16cbf2fea39b07450f (diff) | |
| parent | 59343cd7c4809cf7598789e1cd14563780ae4239 (diff) | |
| download | linux-95f873f2fff96c592c5d863e2a39825bd8bf0500.tar.gz linux-95f873f2fff96c592c5d863e2a39825bd8bf0500.tar.bz2 linux-95f873f2fff96c592c5d863e2a39825bd8bf0500.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
net/sched/cls_bpf.c
Two simple sets of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink/af_netlink.h')
| -rw-r--r-- | net/netlink/af_netlink.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.h b/net/netlink/af_netlink.h index 7518375782f5..89008405d6b4 100644 --- a/net/netlink/af_netlink.h +++ b/net/netlink/af_netlink.h @@ -2,6 +2,7 @@ #define _AF_NETLINK_H #include <linux/rhashtable.h> +#include <linux/atomic.h> #include <net/sock.h> #define NLGRPSZ(x) (ALIGN(x, sizeof(unsigned long) * 8) / 8) |