mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
This commit is contained in:
commit
fb7ffeb11b
21 changed files with 287 additions and 352 deletions
|
|
@ -88,7 +88,6 @@ enum ib_atomic_cap {
|
|||
|
||||
struct ib_device_attr {
|
||||
u64 fw_ver;
|
||||
__be64 node_guid;
|
||||
__be64 sys_image_guid;
|
||||
u64 max_mr_size;
|
||||
u64 page_size_cap;
|
||||
|
|
@ -951,6 +950,7 @@ struct ib_device {
|
|||
u64 uverbs_cmd_mask;
|
||||
int uverbs_abi_ver;
|
||||
|
||||
__be64 node_guid;
|
||||
u8 node_type;
|
||||
u8 phys_port_cnt;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue