diff options
author | Dave Airlie | 2017-11-02 03:40:41 +0100 |
---|---|---|
committer | Dave Airlie | 2017-11-02 03:40:41 +0100 |
commit | 7a88cbd8d65d622c00bd76ba4ae1d893b292c91c (patch) | |
tree | 826df7ac42ca13c33828d0142046186b91df686b /net/ncsi/ncsi-rsp.c | |
parent | Merge tag 'drm-hisilicon-next-2017-11-01' of github.com:xin3liang/linux into ... (diff) | |
parent | Linux 4.14-rc7 (diff) | |
download | kernel-qcow2-linux-7a88cbd8d65d622c00bd76ba4ae1d893b292c91c.tar.gz kernel-qcow2-linux-7a88cbd8d65d622c00bd76ba4ae1d893b292c91c.tar.xz kernel-qcow2-linux-7a88cbd8d65d622c00bd76ba4ae1d893b292c91c.zip |
Backmerge tag 'v4.14-rc7' into drm-next
Linux 4.14-rc7
Requested by Ben Skeggs for nouveau to avoid major conflicts,
and things were getting a bit conflicty already, esp around amdgpu
reverts.
Diffstat (limited to 'net/ncsi/ncsi-rsp.c')
-rw-r--r-- | net/ncsi/ncsi-rsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c index 265b9a892d41..927dad4759d1 100644 --- a/net/ncsi/ncsi-rsp.c +++ b/net/ncsi/ncsi-rsp.c @@ -959,7 +959,7 @@ static struct ncsi_rsp_handler { { NCSI_PKT_RSP_EGMF, 4, ncsi_rsp_handler_egmf }, { NCSI_PKT_RSP_DGMF, 4, ncsi_rsp_handler_dgmf }, { NCSI_PKT_RSP_SNFC, 4, ncsi_rsp_handler_snfc }, - { NCSI_PKT_RSP_GVI, 36, ncsi_rsp_handler_gvi }, + { NCSI_PKT_RSP_GVI, 40, ncsi_rsp_handler_gvi }, { NCSI_PKT_RSP_GC, 32, ncsi_rsp_handler_gc }, { NCSI_PKT_RSP_GP, -1, ncsi_rsp_handler_gp }, { NCSI_PKT_RSP_GCPS, 172, ncsi_rsp_handler_gcps }, |