diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-04-13 16:04:28 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-04-13 16:04:28 -0700 |
| commit | 800e68c44ffe71f9715f745b38fd1af6910b3773 (patch) | |
| tree | 898caef9a109e429776e65c1083d1503207bebed /include/ufs | |
| parent | 4033eaa68af6e3e9a8ec3819a9369d29aee8a2c4 (diff) | |
| parent | 829cca4d1783088e43bace57a555044cc937c554 (diff) | |
| download | linux-stable-800e68c44ffe71f9715f745b38fd1af6910b3773.tar.gz linux-stable-800e68c44ffe71f9715f745b38fd1af6910b3773.tar.bz2 linux-stable-800e68c44ffe71f9715f745b38fd1af6910b3773.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
tools/testing/selftests/net/config
62199e3f1658 ("selftests: net: Add VXLAN MDB test")
3a0385be133e ("selftests: add the missing CONFIG_IP_SCTP in net config")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/ufs')
| -rw-r--r-- | include/ufs/ufshcd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index 25aab8ec4f86..431c3afb2ce0 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -979,7 +979,6 @@ struct ufs_hba { struct completion *uic_async_done; enum ufshcd_state ufshcd_state; - bool logical_unit_scan_finished; u32 eh_flags; u32 intr_mask; u16 ee_ctrl_mask; |