From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: linux-next: manual merge of the pidfd tree with the y2038 tree Date: Mon, 21 Jan 2019 15:44:17 -0700 Message-ID: References: <20190121143951.68956db3@canb.auug.org.au> <20190121191306.ifga5aw5atu2vvb7@brauner.io> <20190121202328.rgrv54lybilsvitu@brauner.io> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20190121202328.rgrv54lybilsvitu@brauner.io> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Christian Brauner , Arnd Bergmann Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , linux-arch List-Id: linux-arch.vger.kernel.org On 1/21/19 1:23 PM, Christian Brauner wrote: > On Mon, Jan 21, 2019 at 09:15:27PM +0100, Arnd Bergmann wrote: >> On Mon, Jan 21, 2019 at 8:13 PM Christian Brauner wrote: >>> On Mon, Jan 21, 2019 at 06:16:22PM +0100, Arnd Bergmann wrote: >>>> On Mon, Jan 21, 2019 at 4:40 AM Stephen Rothwell wrote: >>> >>> I plan on sending the pidfd branch with the new pidfd_send_signal() >>> syscall for the 5.1 window. Should we somehow coordinate so that our >>> branches don't conflict? Any suggestions? >> >> A conflict can't be avoided, but if you pick system call number 427 >> for pidfd_send_signal, and Jens picks numbers 424 through 426 for > > That sounds good to me. Since it's only one syscall for the pidfd branch > is there anything that speaks against me using 424? Given that the other > patchset has 4 new syscalls. :) > Jens, any objections? I'm fine with either one, I'll have to renumber in any case. But it's 3 new syscalls (424, 425, 426), not 4. Arnd, what's the best way to make this switch now, in my tree? Would be great if I didn't have to change it again once I make the change. -- Jens Axboe From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-f177.google.com ([209.85.210.177]:39995 "EHLO mail-pf1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727442AbfAUWoX (ORCPT ); Mon, 21 Jan 2019 17:44:23 -0500 Received: by mail-pf1-f177.google.com with SMTP id i12so10743776pfo.7 for ; Mon, 21 Jan 2019 14:44:22 -0800 (PST) Subject: Re: linux-next: manual merge of the pidfd tree with the y2038 tree References: <20190121143951.68956db3@canb.auug.org.au> <20190121191306.ifga5aw5atu2vvb7@brauner.io> <20190121202328.rgrv54lybilsvitu@brauner.io> From: Jens Axboe Message-ID: Date: Mon, 21 Jan 2019 15:44:17 -0700 MIME-Version: 1.0 In-Reply-To: <20190121202328.rgrv54lybilsvitu@brauner.io> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Christian Brauner , Arnd Bergmann Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , linux-arch Message-ID: <20190121224417.VghlK1yDUXlYR-LVYIi6oYBywJx8Dr5hNS9fQNC2D0A@z> On 1/21/19 1:23 PM, Christian Brauner wrote: > On Mon, Jan 21, 2019 at 09:15:27PM +0100, Arnd Bergmann wrote: >> On Mon, Jan 21, 2019 at 8:13 PM Christian Brauner wrote: >>> On Mon, Jan 21, 2019 at 06:16:22PM +0100, Arnd Bergmann wrote: >>>> On Mon, Jan 21, 2019 at 4:40 AM Stephen Rothwell wrote: >>> >>> I plan on sending the pidfd branch with the new pidfd_send_signal() >>> syscall for the 5.1 window. Should we somehow coordinate so that our >>> branches don't conflict? Any suggestions? >> >> A conflict can't be avoided, but if you pick system call number 427 >> for pidfd_send_signal, and Jens picks numbers 424 through 426 for > > That sounds good to me. Since it's only one syscall for the pidfd branch > is there anything that speaks against me using 424? Given that the other > patchset has 4 new syscalls. :) > Jens, any objections? I'm fine with either one, I'll have to renumber in any case. But it's 3 new syscalls (424, 425, 426), not 4. Arnd, what's the best way to make this switch now, in my tree? Would be great if I didn't have to change it again once I make the change. -- Jens Axboe