mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'misc' into for-next
Conflicts: drivers/infiniband/core/uverbs_main.c
This commit is contained in:
commit
fe8875e5a4
8 changed files with 15 additions and 71 deletions
|
|
@ -232,6 +232,7 @@ void ib_unpack(const struct ib_field *desc,
|
|||
|
||||
void ib_ud_header_init(int payload_bytes,
|
||||
int grh_present,
|
||||
int immediate_present,
|
||||
struct ib_ud_header *header);
|
||||
|
||||
int ib_ud_header_pack(struct ib_ud_header *header,
|
||||
|
|
|
|||
Loading…
Reference in a new issue