From: Christian Brauner <christian.brauner@ubuntu.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: Tree for Nov 14
Date: Thu, 14 Nov 2019 17:43:19 +0100 [thread overview]
Message-ID: <20191114164318.vbtp32qgkjy4qmv7@wittgenstein> (raw)
In-Reply-To: <20111114144303.6ba32f099a9d10aed68fb872@canb.auug.org.au>
On Mon, Nov 14, 2011 at 02:43:03PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> The patch is still absent from kernel.org.
>
> Changes since 20111111:
>
> The m68knommu gained a conflict against the m68k tree.
>
> The wireless-next tree gained a conflict against the wireless tree.
>
> The pm tree lost its build failure but gained two others for which I
> reverted a commit and applied a patch.
>
> I removed 3 patches from the akpm tree that have shown up elsewhere.
Hey Stephen,
Just a heads up that tomorrow two new patches will show up in the
pidfd's for-next branch that will introduce a minor merge conflict in
linux/uapi/sched.h with what's in current mainline.
The merge conflict can be resolved as shown below.
Christian
diff --cc include/uapi/linux/sched.h
index 25b4fa00bad1,2e649cfa07f4..000000000000
--- a/include/uapi/linux/sched.h
+++ b/include/uapi/linux/sched.h
@@@ -36,28 -39,38 +39,42 @@@
#ifndef __ASSEMBLY__
/**
* struct clone_args - arguments for the clone3 syscall
- * @flags: Flags for the new process as listed above.
- * All flags are valid except for CSIGNAL and
- * CLONE_DETACHED.
- * @pidfd: If CLONE_PIDFD is set, a pidfd will be
- * returned in this argument.
- * @child_tid: If CLONE_CHILD_SETTID is set, the TID of the
- * child process will be returned in the child's
- * memory.
- * @parent_tid: If CLONE_PARENT_SETTID is set, the TID of
- * the child process will be returned in the
- * parent's memory.
- * @exit_signal: The exit_signal the parent process will be
- * sent when the child exits.
- * @stack: Specify the location of the stack for the
- * child process.
- * Note, @stack is expected to point to the
- * lowest address. The stack direction will be
- * determined by the kernel and set up
- * appropriately based on @stack_size.
- * @stack_size: The size of the stack for the child process.
- * @tls: If CLONE_SETTLS is set, the tls descriptor
- * is set to tls.
+ * @flags: Flags for the new process as listed above.
+ * All flags are valid except for CSIGNAL and
+ * CLONE_DETACHED.
+ * @pidfd: If CLONE_PIDFD is set, a pidfd will be
+ * returned in this argument.
+ * @child_tid: If CLONE_CHILD_SETTID is set, the TID of the
+ * child process will be returned in the child's
+ * memory.
+ * @parent_tid: If CLONE_PARENT_SETTID is set, the TID of
+ * the child process will be returned in the
+ * parent's memory.
+ * @exit_signal: The exit_signal the parent process will be
+ * sent when the child exits.
+ * @stack: Specify the location of the stack for the
+ * child process.
++ * Note, @stack is expected to point to the
++ * lowest address. The stack direction will be
++ * determined by the kernel and set up
++ * appropriately based on @stack_size.
+ * @stack_size: The size of the stack for the child process.
+ * @tls: If CLONE_SETTLS is set, the tls descriptor
+ * is set to tls.
+ * @set_tid: Pointer to an array of type *pid_t. The size
+ * of the array is defined using @set_tid_size.
+ * This array is used select PIDs/TIDs for newly
+ * created processes. The first element in this
+ * defines the PID in the most nested PID
+ * namespace. Each additional element in the array
+ * defines the PID in the parent PID namespace of
+ * the original PID namespace. If the array has
+ * less entries than the number of currently
+ * nested PID namespaces only the PIDs in the
+ * corresponding namespaces are set.
+ * @set_tid_size: This defines the size of the array referenced
+ * in @set_tid. This cannot be larger than the
+ * kernel's limit of nested PID namespaces.
*
* The structure is versioned by size and thus extensible.
* New struct members must go at the end of the struct and
next prev parent reply other threads:[~2019-11-14 16:43 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-14 3:43 linux-next: Tree for Nov 14 Stephen Rothwell
2019-11-14 16:43 ` Christian Brauner [this message]
2012-11-14 5:30 Stephen Rothwell
2012-11-14 5:37 ` Andrew Morton
2012-11-14 5:53 ` Andrew Morton
2012-11-14 6:47 ` Ingo Molnar
2012-11-14 6:56 ` Andrew Morton
2012-11-14 7:15 ` Stephen Rothwell
2012-11-14 7:24 ` Andrew Morton
2012-11-14 7:39 ` Ingo Molnar
2012-11-14 8:13 ` Hugh Dickins
2012-11-14 17:05 ` Rik van Riel
2012-11-15 12:10 ` Mel Gorman
2012-11-14 17:19 ` Linus Torvalds
2012-11-14 6:55 ` Stephen Rothwell
2012-11-14 7:03 ` Stephen Rothwell
2013-11-14 4:22 Stephen Rothwell
2014-11-14 8:27 Stephen Rothwell
2014-11-15 21:19 ` Guenter Roeck
2014-11-16 2:33 ` Jiang Liu
2014-11-16 3:22 ` Guenter Roeck
2014-11-16 4:20 ` Jiang Liu
2014-11-16 6:56 ` Guenter Roeck
2014-11-16 8:24 ` Jiang Liu
2014-11-16 8:37 ` Jiang Liu
2014-11-16 15:42 ` Guenter Roeck
2014-11-16 16:01 ` Guenter Roeck
2014-11-16 16:11 ` Guenter Roeck
2014-11-17 5:12 ` Jiang Liu
2014-11-17 17:02 ` Guenter Roeck
2016-11-14 7:23 Stephen Rothwell
2017-11-14 6:20 Stephen Rothwell
2018-11-14 5:26 Stephen Rothwell
2019-11-14 8:31 Stephen Rothwell
2019-11-14 18:38 ` Naresh Kamboju
2019-11-14 20:11 ` Jan Stancek
2019-11-14 21:19 ` Arnd Bergmann
2022-11-14 7:49 Stephen Rothwell
2023-11-14 3:19 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=20191114164318.vbtp32qgkjy4qmv7@wittgenstein \
--to=christian.brauner@ubuntu.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).