Linux 4.12-rc7 Needed at least rc6 for drm-misc-next-fixes, may as well go to rc7
Showing the changes to include/uapi (2 of 461 files). Show all
Unified · Split
| @@ -1486,8 +1486,10 @@ enum ethtool_link_mode_bit_indices { · 1485 unmodified lines | |||
| 1486 | * it was forced up into this mode or autonegotiated. | 1486 | * it was forced up into this mode or autonegotiated. |
| 1487 | */ | 1487 | */ |
| 1488 | 1488 | ||
| 1489 | /* The forced speed, in units of 1Mb. All values 0 to INT_MAX are legal. */ | 1489 | /* The forced speed, in units of 1Mb. All values 0 to INT_MAX are legal. |
| 1490 | /* Update drivers/net/phy/phy.c:phy_speed_to_str() when adding new values */ | 1490 | * Update drivers/net/phy/phy.c:phy_speed_to_str() and |
| 1491 | * drivers/net/bonding/bond_3ad.c:__get_link_speed() when adding new values. | ||
| 1492 | */ | ||
| 1491 | #define SPEED_10 10 | 1493 | #define SPEED_10 10 |
| 1492 | #define SPEED_100 100 | 1494 | #define SPEED_100 100 |
| 1493 | #define SPEED_1000 1000 | 1495 | #define SPEED_1000 1000 |
| @@ -343,6 +343,7 @@ enum ovs_key_attr { · 342 unmodified lines | |||
| 343 | #define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1) | 343 | #define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1) |
| 344 | 344 | ||
| 345 | enum ovs_tunnel_key_attr { | 345 | enum ovs_tunnel_key_attr { |
| 346 | /* OVS_TUNNEL_KEY_ATTR_NONE, standard nl API requires this attribute! */ | ||
| 346 | OVS_TUNNEL_KEY_ATTR_ID, /* be64 Tunnel ID */ | 347 | OVS_TUNNEL_KEY_ATTR_ID, /* be64 Tunnel ID */ |
| 347 | OVS_TUNNEL_KEY_ATTR_IPV4_SRC, /* be32 src IP address. */ | 348 | OVS_TUNNEL_KEY_ATTR_IPV4_SRC, /* be32 src IP address. */ |
| 348 | OVS_TUNNEL_KEY_ATTR_IPV4_DST, /* be32 dst IP address. */ | 349 | OVS_TUNNEL_KEY_ATTR_IPV4_DST, /* be32 dst IP address. */ |