LKML Archive on
help / color / mirror / Atom feed
From: Steve French <>
To: Stephen Rothwell <>
Cc: CIFS <>,
	Linux-Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Kees Cook <>,
	Ronnie Sahlberg <>,
	Aurelien Aptel <>
Subject: Re: linux-next: manual merge of the cifs tree with Linus' tree
Date: Wed, 13 Jun 2018 19:40:43 -0500	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>


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 <> 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



  reply	other threads:[~2018-06-14  0:41 UTC|newest]

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

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 \
    --in-reply-to='' \ \ \ \ \ \ \ \ \
    --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).