From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CD58C4727E for ; Thu, 1 Oct 2020 20:25:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 271762074B for ; Thu, 1 Oct 2020 20:25:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732829AbgJAUYB (ORCPT ); Thu, 1 Oct 2020 16:24:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726741AbgJAUYA (ORCPT ); Thu, 1 Oct 2020 16:24:00 -0400 Received: from smtp-190a.mail.infomaniak.ch (smtp-190a.mail.infomaniak.ch [IPv6:2001:1600:4:17::190a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CE9CC0613D0 for ; Thu, 1 Oct 2020 13:24:00 -0700 (PDT) Received: from smtp-3-0000.mail.infomaniak.ch (unknown [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4C2PjB3MxpzlhX62; Thu, 1 Oct 2020 22:23:58 +0200 (CEST) Received: from ns3096276.ip-94-23-54.eu (unknown [94.23.54.103]) by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4C2Pj72KZtzllmgR; Thu, 1 Oct 2020 22:23:55 +0200 (CEST) Subject: Re: [PATCH v11 2/3] arch: Wire up trusted_for(2) To: Tycho Andersen , Arnd Bergmann Cc: Al Viro , Andrew Morton , James Morris , Jonathan Corbet , Shuah Khan , Aleksa Sarai , Alexei Starovoitov , Andy Lutomirski , Casey Schaufler , Christian Brauner , Christian Heimes , Daniel Borkmann , Deven Bowers , Dmitry Vyukov , Eric Biggers , Eric Chiang , Florian Weimer , Jan Kara , Jann Horn , Kees Cook , Lakshmi Ramasubramanian , "Madhavan T . Venkataraman" , Matthew Garrett , Matthew Wilcox , Michael Kerrisk , Miklos Szeredi , Mimi Zohar , =?UTF-8?Q?Philippe_Tr=c3=a9buchet?= , Scott Shell , Sean Christopherson , Steve Dower , Steve Grubb , Tetsuo Handa , Thibaut Sautereau , Vincent Strubel , kernel-hardening@lists.openwall.com, linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= , Thibaut Sautereau References: <20201001170232.522331-1-mic@digikod.net> <20201001170232.522331-3-mic@digikod.net> <20201001193306.GE1260245@cisco> From: =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= Message-ID: <7ccdf4b0-8158-fb82-fb4f-ad78518dbc30@digikod.net> Date: Thu, 1 Oct 2020 22:23:54 +0200 User-Agent: MIME-Version: 1.0 In-Reply-To: <20201001193306.GE1260245@cisco> Content-Type: text/plain; charset=iso-8859-15 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/10/2020 21:33, Tycho Andersen wrote: > On Thu, Oct 01, 2020 at 07:02:31PM +0200, Mickaël Salaün wrote: >> --- a/include/uapi/asm-generic/unistd.h >> +++ b/include/uapi/asm-generic/unistd.h >> @@ -859,9 +859,11 @@ __SYSCALL(__NR_openat2, sys_openat2) >> __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd) >> #define __NR_faccessat2 439 >> __SYSCALL(__NR_faccessat2, sys_faccessat2) >> +#define __NR_trusted_for 443 >> +__SYSCALL(__NR_trusted_for, sys_trusted_for) >> >> #undef __NR_syscalls >> -#define __NR_syscalls 440 >> +#define __NR_syscalls 444 > > Looks like a rebase problem here? No, it is a synchronization with the -next tree (cf. changelog) as asked (and acked for a previous version) by Arnd.