History

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

Trivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c

Jakub Kicinski committed 5 years ago

Commit 5c39f262 parents 6375da9 c84e1ef387 files · +6414 −2991Browse files

Showing the changes to include/uapi/linux (2 of 387 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/devlink.h +2 −0
  2. include/uapi/linux/openvswitch.h +2 −0
include/uapi/linux/devlink.h+2−0
@@ -526,6 +526,8 @@ enum devlink_attr { · 525 unmodified lines
526 DEVLINK_ATTR_RELOAD_STATS_LIMIT, /* u8 */526 DEVLINK_ATTR_RELOAD_STATS_LIMIT, /* u8 */
527 DEVLINK_ATTR_RELOAD_STATS_VALUE, /* u32 */527 DEVLINK_ATTR_RELOAD_STATS_VALUE, /* u32 */
528 DEVLINK_ATTR_REMOTE_RELOAD_STATS, /* nested */528 DEVLINK_ATTR_REMOTE_RELOAD_STATS, /* nested */
529 DEVLINK_ATTR_RELOAD_ACTION_INFO, /* nested */
530 DEVLINK_ATTR_RELOAD_ACTION_STATS, /* nested */
529 531
530 /* add new attributes above here, update the policy in devlink.c */532 /* add new attributes above here, update the policy in devlink.c */
531 533
include/uapi/linux/openvswitch.h+2−0
@@ -1058,4 +1058,6 @@ enum ovs_dec_ttl_attr { · 1057 unmodified lines
1058 __OVS_DEC_TTL_ATTR_MAX1058 __OVS_DEC_TTL_ATTR_MAX
1059};1059};
1060 1060
1061#define OVS_DEC_TTL_ATTR_MAX (__OVS_DEC_TTL_ATTR_MAX - 1)
1062
1061#endif /* _LINUX_OPENVSWITCH_H */1063#endif /* _LINUX_OPENVSWITCH_H */