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, URIBL_BLOCKED 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 A7A36C433B4 for ; Fri, 9 Apr 2021 08:48:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 55E6E61185 for ; Fri, 9 Apr 2021 08:48:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231761AbhDIItG (ORCPT ); Fri, 9 Apr 2021 04:49:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231127AbhDIItE (ORCPT ); Fri, 9 Apr 2021 04:49:04 -0400 Received: from smtp-42ae.mail.infomaniak.ch (smtp-42ae.mail.infomaniak.ch [IPv6:2001:1600:4:17::42ae]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8EB8C061760 for ; Fri, 9 Apr 2021 01:48:51 -0700 (PDT) Received: from smtp-3-0001.mail.infomaniak.ch (unknown [10.4.36.108]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4FGsHQ0xDNzMqVFY; Fri, 9 Apr 2021 10:48:50 +0200 (CEST) Received: from ns3096276.ip-94-23-54.eu (unknown [23.97.221.149]) by smtp-3-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4FGsHN47Lwzlh8TL; Fri, 9 Apr 2021 10:48:48 +0200 (CEST) Subject: Re: linux-next: manual merge of the security tree with the ext3 tree To: Stephen Rothwell , James Morris , Jan Kara Cc: James Morris , Linux Kernel Mailing List , Linux Next Mailing List , =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= , Sascha Hauer References: <20210319130551.76ce2b8f@canb.auug.org.au> <20210409143954.22329cfa@canb.auug.org.au> From: =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= Message-ID: Date: Fri, 9 Apr 2021 10:50:41 +0200 User-Agent: MIME-Version: 1.0 In-Reply-To: <20210409143954.22329cfa@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Looks good, thanks Stephen! On 09/04/2021 06:39, Stephen Rothwell wrote: > Hi all, > > On Fri, 19 Mar 2021 13:05:51 +1100 Stephen Rothwell wrote: >> >> Today's linux-next merge of the security tree got conflicts in: >> >> arch/alpha/kernel/syscalls/syscall.tbl >> arch/arm/tools/syscall.tbl >> arch/arm64/include/asm/unistd.h >> arch/arm64/include/asm/unistd32.h >> arch/ia64/kernel/syscalls/syscall.tbl >> arch/m68k/kernel/syscalls/syscall.tbl >> arch/microblaze/kernel/syscalls/syscall.tbl >> arch/mips/kernel/syscalls/syscall_n32.tbl >> arch/mips/kernel/syscalls/syscall_n64.tbl >> arch/mips/kernel/syscalls/syscall_o32.tbl >> arch/parisc/kernel/syscalls/syscall.tbl >> arch/powerpc/kernel/syscalls/syscall.tbl >> arch/s390/kernel/syscalls/syscall.tbl >> arch/sh/kernel/syscalls/syscall.tbl >> arch/sparc/kernel/syscalls/syscall.tbl >> arch/x86/entry/syscalls/syscall_32.tbl >> arch/x86/entry/syscalls/syscall_64.tbl >> arch/xtensa/kernel/syscalls/syscall.tbl >> include/uapi/asm-generic/unistd.h >> >> between commit: >> >> fa8b90070a80 ("quota: wire up quotactl_path") >> >> from the ext3 tree and commit: >> >> 818946f8b806 ("arch: Wire up Landlock syscalls") > > This is now commit > > 9fbebb70210a ("arch: Wire up Landlock syscalls") > >> from the security 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. > > The resolution now looks like below (since the lanlock syscall number > have been updated). >