History

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

The conflicts were two cases of overlapping changes in batman-adv and the qed driver.

David S. Miller committed 9 years ago

Commit 0ddead92 parents f7aec12 a090bd4451 files · +3846 −2246Browse files

Showing the changes to include/uapi/linux (3 of 451 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/ethtool.h +4 −2
  2. include/uapi/linux/keyctl.h +2 −2
  3. include/uapi/linux/openvswitch.h +1 −0
include/uapi/linux/ethtool.h+4−2
@@ -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 101493#define SPEED_10 10
1492#define SPEED_100 1001494#define SPEED_100 100
1493#define SPEED_1000 10001495#define SPEED_1000 1000
include/uapi/linux/keyctl.h+2−2
@@ -70,8 +70,8 @@ struct keyctl_dh_params { · 69 unmodified lines
70};70};
71 71
72struct keyctl_kdf_params {72struct keyctl_kdf_params {
73 char *hashname;73 char __user *hashname;
74 char *otherinfo;74 char __user *otherinfo;
75 __u32 otherinfolen;75 __u32 otherinfolen;
76 __u32 __spare[8];76 __u32 __spare[8];
77};77};
include/uapi/linux/openvswitch.h+1−0
@@ -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
345enum ovs_tunnel_key_attr {345enum 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. */