Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 76603ee136a8..22e4ef7bb701 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2496,6 +2496,13 @@ struct netdev_notifier_info {
         struct netlink_ext_ack  *extack;
 };
 
+struct netdev_notifier_info_ext {
+        struct netdev_notifier_info info; /* must be first */
+        union {
+                u32 mtu;
+        } ext;
+};
+
 struct netdev_notifier_change_info {
         struct netdev_notifier_info info; /* must be first */
         unsigned int flags_changed;