* Re: [EXTERNAL] Re: linux-next: build failure after merge of the net-next tree [not found] <SN6PR2101MB1069AC2DC98C74F7C2A71EA3E4C59@SN6PR2101MB1069.namprd21.prod.outlook.com> @ 2020-12-16 10:07 ` Stephen Rothwell 2020-12-16 16:00 ` Steve French 0 siblings, 1 reply; 2+ messages in thread From: Stephen Rothwell @ 2020-12-16 10:07 UTC (permalink / raw) To: Steven French Cc: David Miller, Networking, Jakub Kicinski, Samuel Cabrero, Francis Laniel, Linux Kernel Mailing List, Linux Next Mailing List, linux-cifs [-- 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 --] ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [EXTERNAL] Re: linux-next: build failure after merge of the net-next tree 2020-12-16 10:07 ` [EXTERNAL] Re: linux-next: build failure after merge of the net-next tree Stephen Rothwell @ 2020-12-16 16:00 ` Steve French 0 siblings, 0 replies; 2+ messages in thread From: Steve French @ 2020-12-16 16:00 UTC (permalink / raw) To: Stephen Rothwell Cc: Steven French, David Miller, Networking, Jakub Kicinski, Samuel Cabrero, Francis Laniel, Linux Kernel Mailing List, Linux Next Mailing List, linux-cifs On Wed, Dec 16, 2020 at 4:08 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > 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. Done. Removed. -- Thanks, Steve ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-16 16:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <SN6PR2101MB1069AC2DC98C74F7C2A71EA3E4C59@SN6PR2101MB1069.namprd21.prod.outlook.com>
2020-12-16 10:07 ` [EXTERNAL] Re: linux-next: build failure after merge of the net-next tree Stephen Rothwell
2020-12-16 16:00 ` Steve French
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).