linux-next: manual merge of the cifs tree with Linus' tree

Commit Message

Stephen Rothwell March 27, 2022, 10:32 p.m. UTC

Hi all,

Today's linux-next merge of the cifs tree got a conflict in:

  fs/ksmbd/smb2pdu.h

between commit:

  5224f7909617 ("treewide: Replace zero-length arrays with flexible-array members")

from Linus' tree and commit:

  be1350004392 ("smb3: move defines for query info and query fsinfo to smbfs_common")

from the cifs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Patch

diff --cc fs/ksmbd/smb2pdu.h
index d49468426576,4db2896b977b..000000000000
--- a/fs/ksmbd/smb2pdu.h