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

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

[Stephen Rothwell]

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

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;

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

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

[Ronnie Sahlberg]

Steve,

Looks good. It builds and seems to work in my testing.
Thanks.

----- Original Message -----
From: "Steve French" <smfrench@gmail.com>
To: "Stephen Rothwell" <sfr@canb.auug.org.au>
Cc: "CIFS" <linux-cifs@vger.kernel.org>, "Linux-Next Mailing List" <linux-next@vger.kernel.org>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Kees Cook" <keescook@chromium.org>, "Ronnie Sahlberg" <lsahlber@redhat.com>, "Aurelien Aptel" <aaptel@suse.com>
Sent: Thursday, 14 June, 2018 10:40:43 AM
Subject: Re: linux-next: manual merge of the cifs tree with Linus' tree

Ronnie,

I fixed up that patch and repushed to cifs-2.6.git for-next.  Seems
trivial. Let me know if any issues.

On Wed, Jun 13, 2018 at 6:01 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the cifs tree got a conflict in:
>
>   fs/cifs/transport.c
>
> between commit:
>
>   6da2ec56059c ("treewide: kmalloc() -> kmalloc_array()")
>
> from Linus' tree and commit:
>
>   1560d69e21c6 ("cifs: push rfc1002 generation down the stack")
>
> from the cifs tree.
>
> I fixed it up (the latter removed the code modified by the former) 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



-- 
Thanks,

Steve

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

[Steve French]

Ronnie,

I fixed up that patch and repushed to cifs-2.6.git for-next.  Seems
trivial. Let me know if any issues.

On Wed, Jun 13, 2018 at 6:01 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the cifs tree got a conflict in:
>
>   fs/cifs/transport.c
>
> between commit:
>
>   6da2ec56059c ("treewide: kmalloc() -> kmalloc_array()")
>
> from Linus' tree and commit:
>
>   1560d69e21c6 ("cifs: push rfc1002 generation down the stack")
>
> from the cifs tree.
>
> I fixed it up (the latter removed the code modified by the former) 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



-- 
Thanks,

Steve

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

[Stephen Rothwell]

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

Hi all,

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

  fs/cifs/transport.c

between commit:

  6da2ec56059c ("treewide: kmalloc() -> kmalloc_array()")

from Linus' tree and commit:

  1560d69e21c6 ("cifs: push rfc1002 generation down the stack")

from the cifs tree.

I fixed it up (the latter removed the code modified by the former) 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

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