Merge tag 'flex-array-transformations-6.4-rc1' of git://git.kernel.org/pub/scm/linux...

Pull flexible-array updates from Gustavo Silva:
 "Transform more zero-length and one-element arrays into C99
  flexible-array members"

* tag 'flex-array-transformations-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  uapi: net: ipv6: Replace fake flex-array with flex-array member
  drm/vmwgfx: Replace one-element array with flexible-array member
  ASoC: uapi: Replace zero-length arrays with __DECLARE_FLEX_ARRAY() helper

diff --combined drivers/gpu/drm/vmwgfx/vmwgfx_so.c
index 5af4db6d1f1881228247cfb285278a0e4b67877b,0f696ccaddc6129240bb9d25969104e358ae8f4d..d199e718cb2d21865b24d3cc8de6326db842700e
--- 1/drivers/gpu/drm/vmwgfx/vmwgfx_so.c
--- 2/drivers/gpu/drm/vmwgfx/vmwgfx_so.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_so.c
@@@ -24,7 -24,6 +24,7 @@@
   *
   **************************************************************************/
  
 +#include "vmwgfx_bo.h"
  #include "vmwgfx_drv.h"
  #include "vmwgfx_resource_priv.h"
  #include "vmwgfx_so.h"
@@@ -71,7 -70,7 +71,7 @@@ struct vmw_view 
        unsigned view_id;              /* Immutable */
        u32 cmd_size;                  /* Immutable */
        bool committed;                /* Protected by binding_mutex */
-       u32 cmd[1];                    /* Immutable */
+       u32 cmd[];                     /* Immutable */
  };
  
  static int vmw_view_create(struct vmw_resource *res);
@@@ -82,11 -81,10 +82,11 @@@ static void vmw_view_commit_notify(stru
  
  static const struct vmw_res_func vmw_view_func = {
        .res_type = vmw_res_view,
 -      .needs_backup = false,
 +      .needs_guest_memory = false,
        .may_evict = false,
        .type_name = "DX view",
 -      .backup_placement = NULL,
 +      .domain = VMW_BO_DOMAIN_SYS,
 +      .busy_domain = VMW_BO_DOMAIN_SYS,
        .create = vmw_view_create,
        .commit_notify = vmw_view_commit_notify,
  };