Auto merge with /home/aegl/GIT/linus

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index e38407a23d04..3029cad63a01 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -14,6 +14,7 @@
 #define NETLINK_SELINUX         7       /* SELinux event notifications */
 #define NETLINK_ARPD            8
 #define NETLINK_AUDIT           9       /* auditing */
+#define NETLINK_FIB_LOOKUP      10      
 #define NETLINK_ROUTE6          11      /* af_inet6 route comm channel */
 #define NETLINK_IP6_FW          13
 #define NETLINK_DNRTMSG         14      /* DECnet routing messages */
@@ -146,7 +147,7 @@ struct netlink_callback
         int             (*dump)(struct sk_buff * skb, struct netlink_callback *cb);
         int             (*done)(struct netlink_callback *cb);
         int             family;
-        long            args[4];
+        long            args[5];
 };
 
 struct netlink_notify