diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2023-08-15 15:01:26 +0200 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2023-08-15 15:01:26 +0200 |
| commit | a35762dd14adb952442e487d8dad4bb50b614b2b (patch) | |
| tree | 4d21de11837f293860db8abbea8db161f1018edb /drivers/net/wireless/legacy/rayctl.h | |
| parent | iommufd/selftest: Make the mock iommu driver into a real driver (diff) | |
| parent | Linux 6.5-rc6 (diff) | |
| download | linux-a35762dd14adb952442e487d8dad4bb50b614b2b.tar.xz linux-a35762dd14adb952442e487d8dad4bb50b614b2b.zip | |
Merge tag 'v6.5-rc6' into iommufd for-next
Required for following patches.
Resolve merge conflict by using the hunk from the for-next branch and
shifting the iommufd_object_deref_user() into iommufd_hw_pagetable_put()
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/net/wireless/legacy/rayctl.h')
| -rw-r--r-- | drivers/net/wireless/legacy/rayctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/legacy/rayctl.h b/drivers/net/wireless/legacy/rayctl.h index 2b0f332043d7..1f3bde8ac73d 100644 --- a/drivers/net/wireless/legacy/rayctl.h +++ b/drivers/net/wireless/legacy/rayctl.h @@ -577,7 +577,7 @@ struct tx_msg { struct tib_structure tib; struct phy_header phy; struct mac_header mac; - UCHAR var[1]; + UCHAR var[]; }; /****** ECF Receive Control Structure (RCS) Area at Shared RAM offset 0x0800 */ |