From patchwork Mon Oct 9 01:31:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 149807 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1611151vqo; Sun, 8 Oct 2023 19:06:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEZc4mEEGvmrgDLyUJG2y3LbKouYWrUvqnA5SKS4kmi6w+Xahvb44jcUIZoGs11L/LlTRm X-Received: by 2002:a05:6830:33b7:b0:6bd:b879:c313 with SMTP id dw23-20020a05683033b700b006bdb879c313mr13618669otb.10.1696817189422; Sun, 08 Oct 2023 19:06:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696817189; cv=none; d=google.com; s=arc-20160816; b=mpiEMZdel7DerMiGMOcXvaHlFJ+94pMFvB/6mw1gK2aCFlHOwwE7wTEEhzLafWgwuK Thn+JTi6H5balDkdJepZ/msvdNv9w9/kKnSTRVBBsntEroaDuA4XR9aNZTJvwl/p6dWb m3S5lBVmAEVAQWk764zYKKRoczhOTuiE2G0Tq6FcQWGHGy7FnySc+qDRtv5lg67p0uVg wyJ+SHtLPve4vcboj5XsByGWQJ0cSrce9wA0I+agtvEpK8DKOppgxf9qCdIEWcsLZ2aZ t42S6mAtDiwhQeHzq+KvsaE/iXKHkcxKeqfwRITjiUtQURrkzv8n6VOv7RMQ/V/0Crd0 q5Yg== 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=RF58q+xXgFqMy1W+kf6f5efUO8YDOhVnUo6mzSypuPA=; fh=D8L+r+GBd0IUgrJR9+oPitlOw94f+chq6tksXt86uYs=; b=OzsWe72C3r7eAyGNGQEBrnEBzVi6ML7TGChjzwCkkaC/8lACczBlMVStpizc0BWeuI GYofdQUpdnV7QNAOfYqW29Pys771+wJCJ+mRJPJ7qUHaboI9tgkl+XkvE+hxhq44WCXK 8sYf06vzXjz4V2BUTaN0PYH0FGXaHbXoLduLFgrJVRtTULMqt5SbtBWlSLqw469obqLv pluxj2zQ+2GiORPfEVDwfPa7YdvmdZkYDMbe8BuTme5vzEPm4TZNOg89jgUQKqVE1b4u 6X0EbgYvgc4uIP7owfBcIbqhDbk53deEcJXArHAJjvyNhlJVESF+3nY47iiQ1KpNuo9Q TttQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gEOc2+2P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id d24-20020a634f18000000b00577a519621bsi8219403pgb.231.2023.10.08.19.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 19:06:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gEOc2+2P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id 8A216802D1A7; Sun, 8 Oct 2023 19:06:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344847AbjJIBb3 (ORCPT + 19 others); Sun, 8 Oct 2023 21:31:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232267AbjJIBb1 (ORCPT ); Sun, 8 Oct 2023 21:31:27 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4101799; Sun, 8 Oct 2023 18:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1696815083; bh=RF58q+xXgFqMy1W+kf6f5efUO8YDOhVnUo6mzSypuPA=; h=Date:From:To:Cc:Subject:From; b=gEOc2+2PSwcdFd9tQ5V9fn/DDOwyYub5ThVajV3WkX3YFpbh+Rm9N5rNyTvX0olB2 2x2V4U/02u1iaJj5X3JkQTxnrfzpJXL8u017SvSxwxaSPnO9TN7n4CORz9UhKp4eep rQoWNLGOspz6WlyxLFI1/8yvDlrj3+2AkeGEvLlUt1YPWcRQyZDyFavGqZnDCGMxda RRsiVTdhXkphpaVAMAl5v1ESE9QPx0muS4OWQLVkcicXUUgT6z0Ep9gp74fR0CV9Yr MmGLFHWL8eKhlyyP5S7J524qVXXXsKYbirUO4+scEzgnFOeVflf2nvqeoudA0/iXVi j0S8dNU8cpCtQ== 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 4S3hMG4fTQz4x5q; Mon, 9 Oct 2023 12:31:20 +1100 (AEDT) Date: Mon, 9 Oct 2023 12:31:18 +1100 From: Stephen Rothwell To: Jens Axboe , Arnd Bergmann Cc: Linux Kernel Mailing List , Linux Next Mailing List , Peter Zijlstra , Sohil Mehta Subject: linux-next: manual merge of the block tree with the asm-generic tree Message-ID: <20231009123118.4487a0e1@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email 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 (fry.vger.email [0.0.0.0]); Sun, 08 Oct 2023 19:06:26 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779241781482453761 X-GMAIL-MSGID: 1779241781482453761 Hi all, Today's linux-next merge of the block 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/xtensa/kernel/syscalls/syscall.tbl include/uapi/asm-generic/unistd.h between commits: 2fd0ebad27bc ("arch: Reserve map_shadow_stack() syscall number for all architectures") from the asm-generic tree and commits: 9f6c532f59b2 ("futex: Add sys_futex_wake()") cb8c4312afca ("futex: Add sys_futex_wait()") 0f4b5f972216 ("futex: Add sys_futex_requeue()") from the block 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 5d05ab716a74,b1865f9bb31e..000000000000 --- a/arch/alpha/kernel/syscalls/syscall.tbl diff --cc arch/arm/tools/syscall.tbl index 45ec6e1dc872,93d0d46cbb15..000000000000 --- a/arch/arm/tools/syscall.tbl diff --cc arch/arm64/include/asm/unistd.h index 6a28fb91b85d,531effca5f1f..000000000000 --- a/arch/arm64/include/asm/unistd.h diff --cc arch/m68k/kernel/syscalls/syscall.tbl index 12d0ce43b094,f7f997a88bab..000000000000 --- a/arch/m68k/kernel/syscalls/syscall.tbl diff --cc arch/microblaze/kernel/syscalls/syscall.tbl index de8219c4300c,2967ec26b978..000000000000 --- a/arch/microblaze/kernel/syscalls/syscall.tbl diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl index a5096a064fb4,383abb1713f4..000000000000 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl index 0044031d9c70,c9bd09ba905f..000000000000 --- a/arch/mips/kernel/syscalls/syscall_n64.tbl diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl index cf44a6ac38fa,ba5ef6cea97a..000000000000 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl diff --cc arch/parisc/kernel/syscalls/syscall.tbl index 4048ed480a04,9f0f6df55361..000000000000 --- a/arch/parisc/kernel/syscalls/syscall.tbl diff --cc arch/powerpc/kernel/syscalls/syscall.tbl index d845e14c38f3,26fc41904266..000000000000 --- a/arch/powerpc/kernel/syscalls/syscall.tbl diff --cc arch/s390/kernel/syscalls/syscall.tbl index 416645f1c1fb,31be90b241f7..000000000000 --- a/arch/s390/kernel/syscalls/syscall.tbl diff --cc arch/sh/kernel/syscalls/syscall.tbl index bf36587b87b5,4bc5d488ab17..000000000000 --- a/arch/sh/kernel/syscalls/syscall.tbl diff --cc arch/sparc/kernel/syscalls/syscall.tbl index f45f8c5ed076,8404c8e50394..000000000000 --- a/arch/sparc/kernel/syscalls/syscall.tbl diff --cc arch/x86/entry/syscalls/syscall_32.tbl index 54748f6d7c45,31c48bc2c3d8..000000000000 --- a/arch/x86/entry/syscalls/syscall_32.tbl diff --cc arch/xtensa/kernel/syscalls/syscall.tbl index 10a7eecbedf0,dd71ecce8b86..000000000000 --- a/arch/xtensa/kernel/syscalls/syscall.tbl diff --cc include/uapi/asm-generic/unistd.h index 00df5af71ca1,d9e9cd13e577..000000000000 --- a/include/uapi/asm-generic/unistd.h