diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-09-08 14:41:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-09-08 14:41:40 +1000 |
| commit | ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf (patch) | |
| tree | 3a54614d597b7b92ada36c5ea26dc994216b628b /drivers/hv/hv_kvp.c | |
| parent | 3393649977f9a8847c659e282ea290d4b703295c (diff) | |
| parent | f4d51dffc6c01a9e94650d95ce0104964f8ae822 (diff) | |
Merge tag 'v5.9-rc4' into drm-next
Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/hv/hv_kvp.c')
| -rw-r--r-- | drivers/hv/hv_kvp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c index e74b144b8f3d..754d35a25a1c 100644 --- a/drivers/hv/hv_kvp.c +++ b/drivers/hv/hv_kvp.c @@ -354,7 +354,7 @@ static void process_ib_ipinfo(void *in_msg, void *out_msg, int op) out->body.kvp_ip_val.dhcp_enabled = in->kvp_ip_val.dhcp_enabled; - /* fallthrough */ + fallthrough; case KVP_OP_GET_IP_INFO: utf16s_to_utf8s((wchar_t *)in->kvp_ip_val.adapter_id, |