History

Merge branch 'mlx5_active_speed' into rdma.git for-next

Leon Romanovsky says: ==================== IBTA declares speed as 16 bits, but kernel stores it in u8. This series fixes in-kernel declaration while keeping external interface intact. ==================== Based on the mlx5-next branch at git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux due to dependencies. * branch 'mlx5_active_speed': RDMA: Fix link active_speed size RDMA/mlx5: Delete duplicated mlx5_ptys_width enum net/mlx5: Refactor query port speed functions

Jason Gunthorpe committed 6 years ago

Commit 5dee5872 parents c0a6b5e 376ceb3598 files · +5521 −2770Browse files

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

Unified · Split

3 files
  1. include/uapi/linux/in.h +1 −1
  2. include/uapi/linux/kvm.h +4 −2
  3. include/uapi/linux/netfilter/nf_tables.h +1 −1
include/uapi/linux/in.h+1−1
@@ -135,7 +135,7 @@ struct in_addr { · 134 unmodified lines
135 * this socket to prevent accepting spoofed ones.135 * this socket to prevent accepting spoofed ones.
136 */136 */
137#define IP_PMTUDISC_INTERFACE 4137#define IP_PMTUDISC_INTERFACE 4
138/* weaker version of IP_PMTUDISC_INTERFACE, which allos packets to get138/* weaker version of IP_PMTUDISC_INTERFACE, which allows packets to get
139 * fragmented if they exeed the interface mtu139 * fragmented if they exeed the interface mtu
140 */140 */
141#define IP_PMTUDISC_OMIT 5141#define IP_PMTUDISC_OMIT 5
include/uapi/linux/kvm.h+4−2
@@ -790,9 +790,10 @@ struct kvm_ppc_resize_hpt { · 789 unmodified lines
790#define KVM_VM_PPC_HV 1790#define KVM_VM_PPC_HV 1
791#define KVM_VM_PPC_PR 2791#define KVM_VM_PPC_PR 2
792 792
793/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */793/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */
794#define KVM_VM_MIPS_TE 0794#define KVM_VM_MIPS_AUTO 0
795#define KVM_VM_MIPS_VZ 1795#define KVM_VM_MIPS_VZ 1
796#define KVM_VM_MIPS_TE 2
796 797
797#define KVM_S390_SIE_PAGE_OFFSET 1798#define KVM_S390_SIE_PAGE_OFFSET 1
798 799
@@ -1035,6 +1036,7 @@ struct kvm_ppc_resize_hpt { · 236 unmodified lines
1035#define KVM_CAP_LAST_CPU 1841036#define KVM_CAP_LAST_CPU 184
1036#define KVM_CAP_SMALLER_MAXPHYADDR 1851037#define KVM_CAP_SMALLER_MAXPHYADDR 185
1037#define KVM_CAP_S390_DIAG318 1861038#define KVM_CAP_S390_DIAG318 186
1039#define KVM_CAP_STEAL_TIME 187
1038 1040
1039#ifdef KVM_CAP_IRQ_ROUTING1041#ifdef KVM_CAP_IRQ_ROUTING
1040 1042
include/uapi/linux/netfilter/nf_tables.h+1−1
@@ -133,7 +133,7 @@ enum nf_tables_msg_types { · 132 unmodified lines
133 * @NFTA_LIST_ELEM: list element (NLA_NESTED)133 * @NFTA_LIST_ELEM: list element (NLA_NESTED)
134 */134 */
135enum nft_list_attributes {135enum nft_list_attributes {
136 NFTA_LIST_UNPEC,136 NFTA_LIST_UNSPEC,
137 NFTA_LIST_ELEM,137 NFTA_LIST_ELEM,
138 __NFTA_LIST_MAX138 __NFTA_LIST_MAX
139};139};