Received: by 2002:a05:7208:13ce:b0:7f:395a:35b6 with SMTP id r14csp295281rbe; Wed, 28 Feb 2024 22:42:01 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXUK7V1DN9KtHh5FUBI0Fs9hXGiyvOdb51hWqnTZefEpAN1Kk0GXsE+/e5qKZyQyWoVIpj2LBRV9JccfTuKe9MCUZSy8fEOuptmoRpUwA== X-Google-Smtp-Source: AGHT+IE8owOhXJ2uH96MtLzBB6ceI726OSmSBW17Kblj4fO4KD0N2ZvlGwHwPfD0Hnp2IHpRhWnj X-Received: by 2002:a05:6358:7e10:b0:17a:ebb9:d26a with SMTP id o16-20020a0563587e1000b0017aebb9d26amr1816176rwm.31.1709188920872; Wed, 28 Feb 2024 22:42:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709188920; cv=pass; d=google.com; s=arc-20160816; b=ykyWC7VJJE5O4rM1/k66vPG2c8nwt+SwIcwNKj+12sKDqmhQ56vf6JDLyLKLtPLyTq rgYl+aoyv1UfUzuhuUc+9sMleZq7gPAlBRwpeKJBWD1s4YRmf9l7TiPM5MkCs5TFjl2a E2eqUID+t50QhnXoz0PrfNv7h4yHDnwB3skR2bxAFuLiyBulxij9uqKfeL3CSFyK8dJG jxbGNk9UWY9tsVJAe3FyKR8Obuh3ubwCejn0Gu0KSfNDBXwz1HT0uG7zF8JDOo9gIr0W T5SG7DziUOMvyTksjPJYy5av+EpJZTQaRO5Ko6RGhwC18eb4cwirGd2NHobneVU9GuM9 N6Uw== 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:date:references:in-reply-to:subject:cc:to:from :dkim-signature; bh=8jp6tWwTFbOuHhqd3QihKvXNUZOM/iJjGERmYJI7sHk=; fh=JdqnlqqRcdnUHW6fFgFWkhYLd6cZjbqqIQQvbDKfBh4=; b=rhwG+DWP8rfDfkrAMof570WzTeXoKhAFj2ffrjxnnR4xNaktmGBdzxlf/19gCbjcM9 E+fjoTHCskSHBsu50URkylI/k7VftI9/CJTUFIr2lL2bb3qimVGD9LrRaRSvgr346FPX pnckO1J9y+3VLkrFnmNGY1/vlCu4WiGXnJQYAqkonGgsze/gYlLfcYFBAmkKJ22ByqnD LYEldYtwuHWvoYFyvJYiNkQWOrV5/Ja3zHtmKPKveeVjXI7s50ocJkA544tsgRPMgopA 2ytNMoWjhaYbCjj2rgrKQsc4Ltc4mMBkxTB+skkavhRE3uqBCYz6vhUkVz1oE5trLTGs mK2g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=Arly37qj; arc=pass (i=1 spf=pass spfdomain=ellerman.id.au dkim=pass dkdomain=ellerman.id.au); spf=pass (google.com: domain of linux-kernel+bounces-86182-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86182-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id 34-20020a630e62000000b005d8b2b582dfsi744806pgo.837.2024.02.28.22.42.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 22:42:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-86182-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=Arly37qj; arc=pass (i=1 spf=pass spfdomain=ellerman.id.au dkim=pass dkdomain=ellerman.id.au); spf=pass (google.com: domain of linux-kernel+bounces-86182-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86182-linux.lists.archive=gmail.com@vger.kernel.org" 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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 67592B226E7 for ; Thu, 29 Feb 2024 06:38:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25B1344C92; Thu, 29 Feb 2024 06:38:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="Arly37qj" 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 6645A44C60; Thu, 29 Feb 2024 06:37:59 +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=1709188682; cv=none; b=U4Le7Um+sc9Efda1RKmL7J9nQQ2wg1weQXkVfsftj3mwP70g9bW6rWqVEfkH4UE5EDKUcl6T7KJpu+4UYM/NemXC5BlGgmDwEUbujnaMbN2g0khKBacLiP2yjk2MyNoaMi+NDoVQs17iw1sqvGMm5MWdzno5b1tCW/uF2smi0xQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709188682; c=relaxed/simple; bh=TYRAVAH4IMfHLxfWypr9OolYo0gumgQZwdK+S3nsvvo=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=t9w++9p0LMUKebGTfEzarCcnjQqfAp88uIztcqIYyUCbH11wM8W80ZIiFzbWGkKpsgRAjbYQJwNHms9ooydIKotq1o6qvHp6XENpDVev3aHI7Z/0nvbY0TboYnBF15ndZ3yN33KUfZ39/s8clB6pqBPVnO2mbwHPXHhRdt2500w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au; spf=pass smtp.mailfrom=ellerman.id.au; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b=Arly37qj; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ellerman.id.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1709188677; bh=8jp6tWwTFbOuHhqd3QihKvXNUZOM/iJjGERmYJI7sHk=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Arly37qjNDRDE7QhxbFdyAL000Qjzjoq28bx+VH7Z6wIOdjVZ71anNzdtIiVkQKg5 ZX2fM0qrQc9sDT3jR85bk4fSubV6lggkWPDNA9ZyRDuHHWaQ5k/WICwdTrUMB8XyCz ZNfzQF5lcttHCAlQs8lGTz23/CMHOAjYwYDAz3it386OpTELvrVukqRdhI6UUasuJE LuzRpZIBkwVYdBEMq0AQsiN6Nx0bawnrtCk1Y6MqbUZesV0tEh79E1CutcW1JRIJxQ eoVf+cEN/G+T51n1XPZ99AvBUf6peStnrS88s51bmvv7gGZU2jp/+FvQ4D4vaOlEmC 97niIGWdGcvcQ== 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 4TlhP12CMDz4wcH; Thu, 29 Feb 2024 17:37:57 +1100 (AEDT) From: Michael Ellerman To: Stephen Rothwell , PowerPC , Andrew Morton Cc: Christophe Leroy , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the powerpc tree with the mm-stable tree In-Reply-To: <20240229101721.58569685@canb.auug.org.au> References: <20240229101721.58569685@canb.auug.org.au> Date: Thu, 29 Feb 2024 17:37:57 +1100 Message-ID: <87ttlrg4hm.fsf@mail.lhotse> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Stephen Rothwell writes: > 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. Thanks. That's a fairly ugly conflict. Maybe I'll drop that patch until the generic change has gone in. cheers