From patchwork Thu Feb 9 02:12:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 54672 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp79371wrn; Wed, 8 Feb 2023 18:29:40 -0800 (PST) X-Google-Smtp-Source: AK7set+zIGXnhkz3aeSq3NSrSiTICuiOiKCMxoVuNQ48lCYIQFwm/mjstJQuki2rZsZIhYKlMRva X-Received: by 2002:a17:906:51cd:b0:88d:a8e5:bfc3 with SMTP id v13-20020a17090651cd00b0088da8e5bfc3mr9414112ejk.5.1675909779913; Wed, 08 Feb 2023 18:29:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675909779; cv=none; d=google.com; s=arc-20160816; b=FdbioDvi4ikpkuIiAR2gGFfkrg0ui1R33zUSHeBFm+YbOKwwDKWX/K7cpWcdke/R1D UJC2O/N/CYfFVQ2GI7CKCjuyUsriGJTjkK1oHokf7Jwg/uKm1h421XY2N7K3sKF1+x/S YTtTF8CLwKQAKnEj639wtfwCVNRmZjzClpeExV5BygE6MC58OkVDJWOLtlTmTYXs+SrV qTAzyCYCPMEpV6MXZe46w8q+YpKNZZV2Jc+DU3RUbQsCMIJvQW7rkPxZ4aEab7dQWSoY W5uspWorZR3RqegWANrQ7urkcWf3p3i/Ml8ogIWL5HZB+XWpVSl09DcjYrOXOtwv3OoW UPLA== 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=SqqF476/gbjX9ylAeRVbe5SjYoh4ca/kGQLCtFrnXwo=; b=BwnQFtoZmPknuHaFdwq5xJNrFxF+0eYYaJnUB58Se/JnApZTMihBviNDabLPU5Gh2T doRyIEFKaos6zadqUbHTwjf7EML7sfyqoku4H0i6INcTqk/2RpUlKaFUUFqD5GdxgnOu oMoDmje/pdiu1Hb6s5bqV2iDhgEYk50WzIBg3OXTLUXJ6zdFnJql95IM2peb1ca+oEMX 2Y0JUj0v27PnBhKMRATS9uqxTuEQwCFoZd3XyUKcGsOaHrEfmmNoeIwGuReUXoSogrwE dvD6vTviA37yE//Y3HfkuUpTQJvtdXyb7g7DbY8phgHN1MQqBy9mkyTeQJ4BYdN1UYWI vVwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=KrD358W7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f24-20020a170906739800b0088c0e9677b5si856937ejl.552.2023.02.08.18.29.16; Wed, 08 Feb 2023 18:29:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=KrD358W7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231710AbjBICNN (ORCPT + 99 others); Wed, 8 Feb 2023 21:13:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231666AbjBICNL (ORCPT ); Wed, 8 Feb 2023 21:13:11 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1ECFD14229; Wed, 8 Feb 2023 18:13:01 -0800 (PST) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4PC0kz3RSnz4xxJ; Thu, 9 Feb 2023 13:12:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1675908779; bh=SqqF476/gbjX9ylAeRVbe5SjYoh4ca/kGQLCtFrnXwo=; h=Date:From:To:Cc:Subject:From; b=KrD358W7irL6HmUqJ8Xn7pLiYicHck4q2w0fVK50bvaKAQh8J9+7jA6LUZ+J/0CaQ 21rguaLdlMHo7JJU8Ic+jGFhsEAd+QKyGy/E2n17FrFTaQ1aYG5EngpufEsyw2rPTM uDmmrPIBgny1igi9IkFbZDg77yHsM/h5vscoQmXYk8R3DAQ54prVi83aONbwJuE/Z2 SrMGEB7hfXLplKUGqC+Vt+PPS6p0tdKHeSGoPmklcQqDOZBhJy1NbUPoYrW0XWhr2M AXzsAGnoF4AcG0tI1ZhkA8bpkduV83Xm8aSXo3DWs6Oext9NXpC2Ua5qw32PU/CPq2 q28C4rEXdNU1w== Date: Thu, 9 Feb 2023 13:12:58 +1100 From: Stephen Rothwell To: Andrew Morton , Jonathan Corbet Cc: Linux Kernel Mailing List , Linux Next Mailing List , "Mike Rapoport (IBM)" , SeongJae Park Subject: linux-next: manual merge of the mm-stable tree with the jc_docs tree Message-ID: <20230209131258.1d7a28fb@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757318773365852194?= X-GMAIL-MSGID: =?utf-8?q?1757318773365852194?= Hi all, Today's linux-next merge of the mm-stable tree got a conflict in: Documentation/admin-guide/mm/numaperf.rst between commit: 00cba6b60fed ("docs/admin-guide/mm: remove useless markup") from the jc_docs tree and commit: 6c364edc194e ("Docs/admin-guide/mm/numaperf: increase depth of subsections") from the mm-stable 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 Documentation/admin-guide/mm/numaperf.rst index 24e63e740420,544a6d16c801..000000000000 --- a/Documentation/admin-guide/mm/numaperf.rst