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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20220328093228.3c2a6019@canb.auug.org.au>
Date:   Mon, 28 Mar 2022 09:32:28 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steve French <smfrench@...il.com>,
        CIFS <linux-cifs@...r.kernel.org>
Cc:     "Gustavo A. R. Silva" <gustavoars@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Steve French <stfrench@...rosoft.com>
Subject: linux-next: manual merge of the cifs tree with Linus' tree

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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ksmbd/smb2pdu.h
index d49468426576,4db2896b977b..000000000000
--- a/fs/ksmbd/smb2pdu.h
+++ b/fs/ksmbd/smb2pdu.h
@@@ -818,13 -402,9 +402,9 @@@ struct smb2_file_stream_info 
  	__le32  StreamNameLength;
  	__le64 StreamSize;
  	__le64 StreamAllocationSize;
 -	char   StreamName[0];
 +	char   StreamName[];
  } __packed;
  
- struct smb2_file_eof_info { /* encoding of request for level 10 */
- 	__le64 EndOfFile; /* new end of file value */
- } __packed; /* level 20 Set */
- 
  struct smb2_file_ntwrk_info {
  	__le64 CreationTime;
  	__le64 LastAccessTime;

Content of type "application/pgp-signature" skipped