From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven French <Steven.French@microsoft.com>
Cc: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Jakub Kicinski <kuba@kernel.org>,
Samuel Cabrero <scabrero@suse.de>,
Francis Laniel <laniel_francis@privacyrequired.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"linux-cifs@vger.kernel.org" <linux-cifs@vger.kernel.org>
Subject: Re: [EXTERNAL] Re: linux-next: build failure after merge of the net-next tree
Date: Wed, 16 Dec 2020 21:07:35 +1100 [thread overview]
Message-ID: <20201216210735.2893dd92@canb.auug.org.au> (raw)
In-Reply-To: <SN6PR2101MB1069AC2DC98C74F7C2A71EA3E4C59@SN6PR2101MB1069.namprd21.prod.outlook.com>
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
Hi Steven,
On Wed, 16 Dec 2020 02:21:26 +0000 Steven French <Steven.French@microsoft.com> wrote:
>
> I applied your patch to the tip of my tree (cifs-2.6.git for-next) -
> hopefully that makes it easier when I sent the PR in a day or two for
> cifs/smb3 changes.
I think you have just made your tree fail to build as nla_strscpy does
not exist in your tree ... Just remove that commit and tell Linus about
the necessary change and he can add it to the merge.
And, no, rebasing your tree in Linus', or even doing a merge with
Linus' tree is not really a reasonable option at this point.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next parent reply other threads:[~2020-12-16 10:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <SN6PR2101MB1069AC2DC98C74F7C2A71EA3E4C59@SN6PR2101MB1069.namprd21.prod.outlook.com>
2020-12-16 10:07 ` Stephen Rothwell [this message]
2020-12-16 16:00 ` [EXTERNAL] Re: linux-next: build failure after merge of the net-next tree Steve French
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201216210735.2893dd92@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Steven.French@microsoft.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=laniel_francis@privacyrequired.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=scabrero@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).