From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Eric W . Biederman" <ebiederm@xmission.com>
Cc: Mark Brown <broonie@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the userns tree with the cel tree
Date: Fri, 17 Dec 2021 18:47:25 +1100 [thread overview]
Message-ID: <20211217184725.6be885a1@canb.auug.org.au> (raw)
In-Reply-To: <YbugCP144uxXvRsk@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 1026 bytes --]
Hi Mark,
On Thu, 16 Dec 2021 20:22:32 +0000 Mark Brown <broonie@kernel.org> wrote:
>
> On Thu, Dec 16, 2021 at 07:34:12PM +0000, broonie@kernel.org wrote:
> > Hi all,
> >
> > Today's linux-next merge of the userns tree got a conflict in:
> >
> > fs/nfsd/nfssvc.c
>
> This is also causing further build errors including but not limited to:
>
> /tmp/next/build/kernel/fork.c: In function 'copy_process':
> /tmp/next/build/kernel/fork.c:2106:4: error: label 'bad_fork_cleanup_threadgroup_lock' used but not defined
> 2106 | goto bad_fork_cleanup_threadgroup_lock;
> | ^~~~
>
> Partly due to vaccine side effects and partly in the interest of time
> I'm going to use the userns tree from yesterday.
Caused by commit
40966e316f86 ("kthread: Ensure struct kthread is present for all kthreads")
The label is guarded by CONFIG_NUMA, but the new goto is not.
This is still failing, so I have used the userns tree from next-20211215
for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-12-17 7:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 19:34 linux-next: manual merge of the userns tree with the cel tree broonie
2021-12-16 20:22 ` Mark Brown
2021-12-17 7:47 ` Stephen Rothwell [this message]
2021-12-17 16:40 ` Eric W. Biederman
2021-12-17 6:48 ` 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:
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=20211217184725.6be885a1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@kernel.org \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).