LKML Archive on
help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Steve French <>, CIFS <>
Cc: "Gustavo A. R. Silva" <>,
	Linux Kernel Mailing List <>,
	Linux Next Mailing List <>,
	Steve French <>
Subject: linux-next: manual merge of the cifs tree with Linus' tree
Date: Mon, 28 Mar 2022 09:32:28 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]

Hi all,

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


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.

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;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2022-03-27 22:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-27 22:32 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-06-13 23:01 Stephen Rothwell
2018-06-14  0:40 ` Steve French
2018-06-14  3:37   ` Ronnie Sahlberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \
    --subject='Re: linux-next: manual merge of the cifs tree with Linus'\'' tree' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).