mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission.com>,
	"Michael S. Tsirkin" <mst@redhat.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Mike Christie <michael.christie@oracle.com>
Subject: linux-next: manual merge of the userns tree with the vhost tree
Date: Fri, 24 Dec 2021 15:11:01 +1100	[thread overview]
Message-ID: <20211224151101.5e56b7b5@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1486 bytes --]

Hi all,

Today's linux-next merge of the userns tree got a conflict in:

  kernel/fork.c

between commit:

  d109de6eb40d ("fork/vm: Move common PF_IO_WORKER behavior to new flag")

from the vhost tree and commit:

  329b30af470a ("kthread: Generalize pf_io_worker so it can point to struct kthread")

from the userns tree.

I fixed it up (see below) 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

diff --cc kernel/fork.c
index e3e7150bcb1a,6f0293cb29c9..000000000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -2012,15 -2032,6 +2012,9 @@@ static __latent_entropy struct task_str
  		siginitsetinv(&p->blocked, sigmask(SIGKILL)|sigmask(SIGSTOP));
  	}
  
 +	if (args->worker_flags & USER_WORKER)
 +		p->flags |= PF_USER_WORKER;
 +
- 	/*
- 	 * This _must_ happen before we call free_task(), i.e. before we jump
- 	 * to any of the bad_fork_* labels. This is to avoid freeing
- 	 * p->set_child_tid which is (ab)used as a kthread's data pointer for
- 	 * kernel threads (PF_KTHREAD).
- 	 */
  	p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? args->child_tid : NULL;
  	/*
  	 * Clear TID on mm_release()?

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

                 reply	other threads:[~2021-12-24  4:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20211224151101.5e56b7b5@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=michael.christie@oracle.com \
    --cc=mst@redhat.com \
    /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

all inboxes | Powered by JetHome®