From: Mark Brown <broonie@kernel.org>
To: "Eric W . Biederman" <ebiederm@xmission.com>
Cc: Chuck Lever <chuck.lever@oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
NeilBrown <neilb@suse.de>
Subject: Re: linux-next: manual merge of the userns tree with the cel tree
Date: Thu, 16 Dec 2021 20:22:32 +0000 [thread overview]
Message-ID: <YbugCP144uxXvRsk@sirena.org.uk> (raw)
In-Reply-To: <20211216193412.2441434-1-broonie@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-12-16 20:22 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 [this message]
2021-12-17 7:47 ` Stephen Rothwell
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=YbugCP144uxXvRsk@sirena.org.uk \
--to=broonie@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=neilb@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.