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
