Received: by 2002:a05:7412:da14:b0:e2:908c:2ebd with SMTP id fe20csp1779579rdb; Mon, 9 Oct 2023 02:39:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHvicI6yumu4FYgAA0dxORQjzS2gRQ2A0eI7H1Vi7OE5Hv3Qdi7CgRdjQqEPWm/Pdv0iWQz X-Received: by 2002:a05:6808:1786:b0:3af:63a0:d8aa with SMTP id bg6-20020a056808178600b003af63a0d8aamr19623370oib.51.1696844373982; Mon, 09 Oct 2023 02:39:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696844373; cv=none; d=google.com; s=arc-20160816; b=iWymXfiWdEQUNNBlOUz9zQjIL4VmNaDo7RRCilpBSysIUT0EFYkQQKvAgANOrKPYUM EMaqOo55hzZsA5Dwx7ga0uNTekJhF6RSy1Hy04SrADDTBBTDLGVwLm0XanoPjhQEf8R+ ncEjbJtHJAoPZn1lyrIBZ5ZGZnkI+8p73Foi8ZI3Pf4amdRgnjnChJwGAFsaGMtCtpOv /0F78Biy73tdi/p/QUZKIYE3prGpZwVN/tZAGZh1eEPwceX2L2MnDcWqigX5wr77VJxY Wyl7OJt+vc1xvbcjd/KvfSES2oBvZhZCFet4ZsQ7nyQUy686NzhkAAikqvXG4qxea3nZ deEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :subject:cc:to:from:date:dkim-signature; bh=7Tii3g9U6G/x9SePXuUyMBs1rZtti85D/mR5NtmK/qE=; fh=ciNp2z2ky3OYEVjvR5k1JG/crKLTovLvOlhFh8aDkcA=; b=vPk3cc6zduli0dhTXXVSBExdrFXOdLHGr/T2d0gtlVdnkzaq/0Q/8P7bwj5Cv5R9n2 kEBsmVrQcOom89wgvuaIwzqhiUuy0NU1pULMIZlm3Q9Dh/qfQIPyZUsHHvfN+V3QTbZs QLggOxzlnZbGhxa0X403P1GI0+e0nhAKyugi5aS5BURvelE27nb6BRhC3D9j4hfrZO2c zZmfMBVeOQJRW+WdAtN4VWagjbokd/Vz2u8kWRla1b3EpnGcc5BrBSleGjz9nRTvHUXF G67VrDIcdPBTVIGbErNMGIBYXiexJCm75Elakq/ER1nkKSViINPEudLQspjUdJTZZChw flfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rothwell.id.au header.s=201702 header.b="q7iW/nXM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=rothwell.id.au Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id c3-20020a633503000000b005789abf4414si7261223pga.399.2023.10.09.02.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 02:39:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@rothwell.id.au header.s=201702 header.b="q7iW/nXM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=rothwell.id.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3D5B7807BEE6; Mon, 9 Oct 2023 02:39:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345972AbjJIJjX (ORCPT + 99 others); Mon, 9 Oct 2023 05:39:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345950AbjJIJjV (ORCPT ); Mon, 9 Oct 2023 05:39:21 -0400 X-Greylist: delayed 323 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 09 Oct 2023 02:39:19 PDT Received: from gimli.rothwell.id.au (unknown [IPv6:2404:9400:2:0:216:3eff:fee1:997a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C898ABA; Mon, 9 Oct 2023 02:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothwell.id.au; s=201702; t=1696844030; bh=7Tii3g9U6G/x9SePXuUyMBs1rZtti85D/mR5NtmK/qE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=q7iW/nXMZFqka2P7UXx4t3Vn70Dq7yAJQKdkKBIhSR7IF3bfSV5cM7lOdpad9vYLC cey0b8iaoz8y+ENHu1XHBD5/fJbpBuoSvFEoQdqZSWcAiX3lSdgqXLCxtkQXksFDh/ X7nw0JgLHNVFXoTgFDl7zzBC63Ljgul0p9jmsZ2BsEjwqCo7hDzA5DLdyL4l2SXQ2x hpL2SB0SM6RXfa5Qx0waQ/VIAPygqxKl4dXR8YeIDXQiNteTDflmPJgD5LlK8K075z oB8vplm8gl4J3AvlP1wv9YxHCY3vqpBqvWRQdC41eVCFJO8Y7m2+5IhWr/Rog0PVtS 47+uuWb2b5paA== Received: from authenticated.rothwell.id.au (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.rothwell.id.au (Postfix) with ESMTPSA id 4S3v3s2vcZzyP5; Mon, 9 Oct 2023 20:33:45 +1100 (AEDT) Date: Mon, 9 Oct 2023 20:33:24 +1100 From: Stephen Rothwell To: Peter Zijlstra Cc: Stephen Rothwell , Jens Axboe , Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List , Sohil Mehta Subject: Re: linux-next: manual merge of the block tree with the asm-generic tree Message-ID: <20231009203324.4199996a@li-c0a070c6-1ab2-11ed-80f2-9c2dcd447373> In-Reply-To: <20231009084812.GB14330@noisy.programming.kicks-ass.net> References: <20231009123118.4487a0e1@canb.auug.org.au> <20231009084812.GB14330@noisy.programming.kicks-ass.net> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/4/QzaOFuP7i.EOVOmikz9T+"; protocol="application/pgp-signature"; micalg=pgp-sha256 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Mon, 09 Oct 2023 02:39:31 -0700 (PDT) X-Spam-Level: ** --Sig_/4/QzaOFuP7i.EOVOmikz9T+ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Peter, On Mon, 9 Oct 2023 10:48:12 +0200 Peter Zijlstra wro= te: > > > #define __NR_fchmodat2 452 > > __SYSCALL(__NR_fchmodat2, sys_fchmodat2) > > + #define __NR_futex_wake 454 > > + __SYSCALL(__NR_futex_wake, sys_futex_wake) > > + #define __NR_futex_wait 455 > > + __SYSCALL(__NR_futex_wait, sys_futex_wait) > > + #define __NR_futex_requeue 456 > > + __SYSCALL(__NR_futex_requeue, sys_futex_requeue) > > =20 > > +#define __NR_map_shadow_stack 453 > > +__SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack) > > + > > #undef __NR_syscalls > > - #define __NR_syscalls 454 > > + #define __NR_syscalls 457 > > =20 > > /* > > * 32 bit systems traditionally used different =20 >=20 > This seems to have the hunks in the wrong order, 453 should come before > 454 no? Oops, fixed thanks. --=20 Cheers, Stephen Rothwell --Sig_/4/QzaOFuP7i.EOVOmikz9T+ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUjyOQACgkQAVBC80lX 0GxJkgf/V9M3tXfSUDDtjMGFt3l0mBHvvrZV/qOYoRDWmqSpZViaAuuKgeUA89OO +tTkNN1fnSBAkHAPb/WAfDFl9pj9a/3rV9R3vhLhIyU8zgEUhGQDV7e9kT0fYtF3 ttitXpVLxEmB0vtAB8fQf7JIh205Xuoj7uqkcdSBHKCwmamq+Yck42uk+ujrV5c2 lkgtzdF3PNDnwBAfXt2WXeZx85ZEqZgmJyUJ9oyz9v76FFbL7OlC8UVUZxFfL+FG Tdefdc+sn2nKBzM1wItAU0OPsKYcbahG5yVVkVjzC3dxscGmydWD1XWhk7tyjPy5 Y239TROjJ1wHeDRfdVot9VNqsHOnZw== =SS1c -----END PGP SIGNATURE----- --Sig_/4/QzaOFuP7i.EOVOmikz9T+--