From patchwork Fri Oct 27 01:50:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 158725 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp295873vqb; Thu, 26 Oct 2023 18:52:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5MDSdT44hKQ8xBiGZSbH1c4YwkN0DzmraIgmvQF9zxFIql9jyXMLgYiH7jfkkx+dvTPZa X-Received: by 2002:a1f:ab14:0:b0:49b:289a:cc44 with SMTP id u20-20020a1fab14000000b0049b289acc44mr1426302vke.6.1698371536312; Thu, 26 Oct 2023 18:52:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698371536; cv=none; d=google.com; s=arc-20160816; b=iVKsPGIYYBkUyYBSDgJjiIjE0+MhAJbuxHsCRYFXhy/V8OT8psrSUKDp9PYkpKHtKJ Ru7zb1WZIUqb02conz2JkWaQ0Vc6/3u3dhWiRYB36iUhAUuSCB4rfejG732/t+0W3Ii/ tglDPyn9TGTXQVuJg1milqEV0yjDTiJ+Tb/16/j1+IE9ksekc1cOhrlJwIsKfJnZLYig 2VOMst6scKyZODHAjoo6XDHACdrQDTbI4xwrycxDRIry7R4y2cAcx1qQjFOaC0nBDOkB RF9fOi6Jgbu1tqIXIgg7qVbQRDe1mI1wvj9M0AJL6VJag9uPw1Bk8BQEyLvelI+DX5+P 0g7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=FxqQioxgFWQDzlULRuwZiUIrEuL3ELgNmRP4kxtbK9w=; fh=08TJvbIz9MCq4A81zy5Y1Y0gaK8OoQj9M+G1kJ9RCJQ=; b=eVwvUBdRy+M7l0qcV7PgdDbiQrdeWI/2kqQL++aunSZCABh9V3IaCzS288f4x2ZkOr GYB2xIpL1kOJb8zgJzWeB/E7F4lpCFM9jwZymkf6CrjkA4kLOUNm6FNdj7zEiW6OsS0B +oRjDKCG6J+h6hG4RRuv1I0hMrSrilH0yRmymiXw6vcOgV9r13Dx0yzomc3gp2Xfu6qb sIiQ9LMYRrQi+2oujaPeUOxsp1cMGA5U8LxRkCc7OVi+bmVrymNjuYLLAmB0MPHsJPo6 XsvKdXaTWhOmYd4fjCmpV3Fz94aOoQbKYGKo7uzjm35B5uhistWO7//Bjj5I3Odnc5oi dnfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=N3PUQeqO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTP id z10-20020a0dd70a000000b0059290308f8bsi955928ywd.11.2023.10.26.18.52.15; Thu, 26 Oct 2023 18:52:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=N3PUQeqO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id EFC6680A7741; Thu, 26 Oct 2023 18:50:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229633AbjJ0BuW (ORCPT + 26 others); Thu, 26 Oct 2023 21:50:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjJ0BuU (ORCPT ); Thu, 26 Oct 2023 21:50:20 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44CB7111; Thu, 26 Oct 2023 18:50:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698371411; bh=FxqQioxgFWQDzlULRuwZiUIrEuL3ELgNmRP4kxtbK9w=; h=Date:From:To:Cc:Subject:From; b=N3PUQeqO5qyYL/6gVce3rB4YIAa460QObyawMmiw4InubVmGe2pU6E4XnZVtePtIL ClL3myGSTD9cAAfPrmeLtN/dPyaYB9rtsgI47J+ynSHK8R2frk9BL36VWP0oMhxYkw RUmjj6AEBnU7OEwixfZd1VdT8uz1LQb8XFE8AykmrUwgBBTrWEa6BOj6RutUN/qkz3 5ae+tIAj/Pn0EIwhkZP65MOsAJWQKgl09Uqw8dvsWqfZIw6C7CRSXvJ0kuRS9QhSrU unWjN3K/NMeui8qGXUoEBFyzRDljxPiyGqg5O0M+UbwhsGQJPkYj1CPmA8zMKWrTDa UHaJLxrhwubfQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SGlwb6lBKz4wd1; Fri, 27 Oct 2023 12:50:07 +1100 (AEDT) Date: Fri, 27 Oct 2023 12:50:06 +1100 From: Stephen Rothwell To: Paul Moore , Arnd Bergmann , Jens Axboe , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Casey Schaufler , Linux Kernel Mailing List , Linux Next Mailing List , Sohil Mehta Subject: linux-next: manual merge of the security tree with the asm-generic, block and tip trees Message-ID: <20231027125006.58d5e94f@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 26 Oct 2023 18:50:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780871631892182968 X-GMAIL-MSGID: 1780871631892182968 Hi all, 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/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 commits: 2fd0ebad27bc ("arch: Reserve map_shadow_stack() syscall number for all architectures") 9f6c532f59b2 ("futex: Add sys_futex_wake()") cb8c4312afca ("futex: Add sys_futex_wait()") 0f4b5f972216 ("futex: Add sys_futex_requeue()") from the asm-generic, block and tip trees and commit: 6d54f25e4605 ("LSM: wireup Linux Security Module 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. diff --cc arch/alpha/kernel/syscalls/syscall.tbl index 18c842ca6c32,01f4d0889a36..000000000000 --- a/arch/alpha/kernel/syscalls/syscall.tbl diff --cc arch/arm/tools/syscall.tbl index 584f9528c996,e12db7b9fb8d..000000000000 --- a/arch/arm/tools/syscall.tbl diff --cc arch/arm64/include/asm/unistd.h index 531effca5f1f,f33190f17ebb..000000000000 --- a/arch/arm64/include/asm/unistd.h diff --cc arch/arm64/include/asm/unistd32.h index 9f7c1bf99526,557345b38893..000000000000 --- a/arch/arm64/include/asm/unistd32.h diff --cc arch/m68k/kernel/syscalls/syscall.tbl index 7a4b780e82cb,215547a74374..000000000000 --- a/arch/m68k/kernel/syscalls/syscall.tbl diff --cc arch/microblaze/kernel/syscalls/syscall.tbl index 5b6a0b02b7de,24174dc2045f..000000000000 --- a/arch/microblaze/kernel/syscalls/syscall.tbl diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl index a842b41c8e06,dc3395c37b1e..000000000000 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl index 116ff501bf92,06cad00543e8..000000000000 --- a/arch/mips/kernel/syscalls/syscall_n64.tbl diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl index 525cc54bc63b,6ecc14091da3..000000000000 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl diff --cc arch/parisc/kernel/syscalls/syscall.tbl index a47798fed54e,5b321bb46374..000000000000 --- a/arch/parisc/kernel/syscalls/syscall.tbl diff --cc arch/powerpc/kernel/syscalls/syscall.tbl index 7fab411378f2,491eea2f88ba..000000000000 --- a/arch/powerpc/kernel/syscalls/syscall.tbl diff --cc arch/s390/kernel/syscalls/syscall.tbl index 7fa9b531d095,653400f82211..000000000000 --- a/arch/s390/kernel/syscalls/syscall.tbl diff --cc arch/sh/kernel/syscalls/syscall.tbl index 363fae0fe9bf,a4bc4047858e..000000000000 --- a/arch/sh/kernel/syscalls/syscall.tbl diff --cc arch/sparc/kernel/syscalls/syscall.tbl index 7bcaa3d5ea44,b134ad689789..000000000000 --- a/arch/sparc/kernel/syscalls/syscall.tbl diff --cc arch/x86/entry/syscalls/syscall_32.tbl index c8fac5205803,e921e0d6c4b3..000000000000 --- a/arch/x86/entry/syscalls/syscall_32.tbl diff --cc arch/x86/entry/syscalls/syscall_64.tbl index 8cb8bf68721c,b70920626b8c..000000000000 --- a/arch/x86/entry/syscalls/syscall_64.tbl diff --cc arch/xtensa/kernel/syscalls/syscall.tbl index 06eefa9c1458,e1fe5ed7cad8..000000000000 --- a/arch/xtensa/kernel/syscalls/syscall.tbl diff --cc include/uapi/asm-generic/unistd.h index d087a2cf86c7,f10906c71711..000000000000 --- a/include/uapi/asm-generic/unistd.h