diff options
| author | Jason Gunthorpe | 2019-06-29 02:18:23 +0200 |
|---|---|---|
| committer | Jason Gunthorpe | 2019-06-29 02:18:23 +0200 |
| commit | 371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4 (patch) | |
| tree | 9442ae9b22e3cf24fbe8dcefae8862a3e4e05629 /include/media/v4l2-dev.h | |
| parent | RDMA/hns: fix spelling mistake "attatch" -> "attach" (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | kernel-qcow2-linux-371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4.tar.gz kernel-qcow2-linux-371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4.tar.xz kernel-qcow2-linux-371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4.zip | |
Merge tag 'v5.2-rc6' into rdma.git for-next
For dependencies in next patches.
Resolve conflicts:
- Use uverbs_get_cleared_udata() with new cq allocation flow
- Continue to delete nes despite SPDX conflict
- Resolve list appends in mlx5_command_str()
- Use u16 for vport_rule stuff
- Resolve list appends in struct ib_client
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'include/media/v4l2-dev.h')
0 files changed, 0 insertions, 0 deletions