From patchwork Wed Feb 28 23:17:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 208071 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:a1a:b0:17b:cd04:e0c6 with SMTP id 26csp251575rwa; Wed, 28 Feb 2024 15:17:46 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWAt1qBA0JOCbFh6luIGmk2k/HjJkYwIatcIKkeRTIwyB0RkpMSubZM+F9DtrJrLo/aQrn9pxIn2sFdXIFnEYc+QYFiRw== X-Google-Smtp-Source: AGHT+IFipaxn0vU3Szg5gHk7VUYiZKJZ4qlpXnmjCackdGIdnBm4hkhfpB5c6s3xcp6VDSHSURDE X-Received: by 2002:a05:6a21:1506:b0:1a0:e184:d0e8 with SMTP id nq6-20020a056a21150600b001a0e184d0e8mr938534pzb.13.1709162266256; Wed, 28 Feb 2024 15:17:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709162266; cv=pass; d=google.com; s=arc-20160816; b=jBv4WGmqhFjCDPoi9NK17zi50b/gXNbqpl3Z2bwlIEX32iN936zByqbb9cxG6i2Vf9 s1TT01BNR1TPSchRHDPwQe/5kOQY2igC3vT6p7yJfCP2/ifYx/4JzhSjobcWTqHbOqEe oeeFkivx9b9MUAS6Efb318hcNI56iGwsewODnjki2bguL+YeHuaplZEHDQcaX7X35Qtq 9BnSIDrSQCeF6Y8NXBc96OAAdvUbDiB1U1FBWcdu8kJ8Qdqs1YnGxqHnp4VdU8k/ZBC+ 4ig3kalZC8dOV3xJpJiOg+eDRcAXsT1npBikSexRGyE1UPzFPb7evuaGlSBbqTR2mU6J 4gfw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=ZL/XInIJt5Cjmb6tbB31oFlzL2jGhkTDoNVbNzl3oks=; fh=3yk+xISonzEl8cVAv2+uVuNFbygQqY4/5O+zpig1iSQ=; b=qLOvMiP3oBPTfaHMkyoTA1Eb/w+ZVZxF/kQAJSpKsS6/ftpsQ0Tw3+CVzknWC/NCgZ KyztD7Tc9NPTotAaZYCdMWHpGxWlgAq/0tMZtWafCGx53cuW6ePcQkiLbVtQjC4w1W65 Y1vQ9FtvbQxpLMXnA9YPcfSY1n86SsZ+ANI39wYE6BXJpSljWLEdaE4bNXm4WZwC/KnW zTYu4866Fn6ShYJofzJ0mcL57XzVRgBp6e37sP6VoYlM7/nz584PRHgj3f79DeGQ2wDR ML9+aO6CDoIlIcba3SCG3XkazPPHnx81/lvcYm3eoX65dcSQBMglmNTObkp7CKD/DFml GWyA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=nezoDe1j; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-85838-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85838-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d6-20020a63fd06000000b005dc8368c55esi65118pgh.633.2024.02.28.15.17.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 15:17:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-85838-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=nezoDe1j; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-85838-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85838-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 10625282361 for ; Wed, 28 Feb 2024 23:17:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BEDFC13D315; Wed, 28 Feb 2024 23:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="nezoDe1j" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 784FF13D2F2; Wed, 28 Feb 2024 23:17:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709162251; cv=none; b=Y0qS3Q6Vc0rr52R+rZYYIwfBzRB0+q6votoaSbZmHnzS7RUFZsLotKxdtkCLY+CDP134Llm1K48lREXQnQ2WYx/uisx0ycGRkkutZh9ccHwxOrmg1Gn687vVyEXlj4J9HJR1Q5NjG1YYp5xAdH8lsexbtjwiRfTScV+Y2T48bn8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709162251; c=relaxed/simple; bh=r60eb2e8alPRaEUcbAn6sqeiAkSCW7JPQkjwOYrrwdo=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=SKP6BJReWO7ibQne2hpv6nDvD2AtE1e36wQdZXuxLlmJOBhQ9SOeWj3dL3a0YIOOyhGdnpnWGDyVsAjcDqvnN6+UiepupCZee7LFCuInfqg8r06Zkd9iK+B6Rj6o/ZS+0XphjdiK9ASGsl8cdnUCPQfcimcluLbS+yoYqvtHYJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=nezoDe1j; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1709162243; bh=ZL/XInIJt5Cjmb6tbB31oFlzL2jGhkTDoNVbNzl3oks=; h=Date:From:To:Cc:Subject:From; b=nezoDe1jULxhYuf/bJjayZMTPtC1mFWM7SV034TzbFm3Ff62W3foLUTH7eoaNXQnk P/cqOCSpeqs643DM1yST2mEJRfzSg/i+NPaBL9ZnpDAcy8idn700KkVYnytS+lsrpl x/yFS/OzbnwCvUW3sDiUi3xPgZQh3HPw/1AygzxOkBtnufVGsXZxuEW6hWN9B4PeO7 U1YXGAWwrBAqIXj5t0ulMsoJ/bUCzg/PyGt2PeT6tA7DsphcIfIA2TrVKNJGGFWhbD Se4r4ju1LbngVhi3oS8lP1RycJr9GSRlPpwxejmRSeXPEvl8UWNxNIbVMMW1VlWgeC pF7OLkwQXZP6w== 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 4TlVcf6Gvyz4wb2; Thu, 29 Feb 2024 10:17:22 +1100 (AEDT) Date: Thu, 29 Feb 2024 10:17:21 +1100 From: Stephen Rothwell To: Michael Ellerman , PowerPC , Andrew Morton Cc: Christophe Leroy , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the powerpc tree with the mm-stable tree Message-ID: <20240229101721.58569685@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792186532475190038 X-GMAIL-MSGID: 1792186532475190038 Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/mm/pgtable_32.c between commit: a5e8131a0329 ("arm64, powerpc, riscv, s390, x86: ptdump: refactor CONFIG_DEBUG_WX") from the mm-stable tree and commit: 8f17bd2f4196 ("powerpc: Handle error in mark_rodata_ro() and mark_initmem_nx()") from the powerpc 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/powerpc/mm/pgtable_32.c index 12498017da8e,4be97b4a44f9..000000000000 --- a/arch/powerpc/mm/pgtable_32.c