diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-11 08:55:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-11 08:55:10 +0200 |
| commit | 1cc18584e5acfd845464616b66fb2fd81eff467e (patch) | |
| tree | 4b16a54c9dd234c5fe9efb9b346249003b588e09 /include/uapi/scsi/scsi_bsg_fc.h | |
| parent | serial: samsung: 32-bit access for TX/RX hold registers (diff) | |
| parent | Linux 5.7-rc5 (diff) | |
| download | linux-1cc18584e5acfd845464616b66fb2fd81eff467e.tar.xz linux-1cc18584e5acfd845464616b66fb2fd81eff467e.zip | |
Merge 5.7-rc5 into tty-next
We need the tty fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/scsi/scsi_bsg_fc.h')
| -rw-r--r-- | include/uapi/scsi/scsi_bsg_fc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/scsi/scsi_bsg_fc.h b/include/uapi/scsi/scsi_bsg_fc.h index 7f5930801f72..3ae65e93235c 100644 --- a/include/uapi/scsi/scsi_bsg_fc.h +++ b/include/uapi/scsi/scsi_bsg_fc.h @@ -209,7 +209,7 @@ struct fc_bsg_host_vendor { __u64 vendor_id; /* start of vendor command area */ - __u32 vendor_cmd[]; + __u32 vendor_cmd[0]; }; /* Response: |