From patchwork Tue Mar 15 08:15:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1605473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=iD1LZR99; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KHmSY4VD7z9s1l for ; Tue, 15 Mar 2022 19:15:56 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KHmSX2v1Cz30Nj for ; Tue, 15 Mar 2022 19:15:56 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=iD1LZR99; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KHmSF0dnhz2yfZ for ; Tue, 15 Mar 2022 19:15:41 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=iD1LZR99; dkim-atps=neutral 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 4KHmSD0QY4z4xvr; Tue, 15 Mar 2022 19:15:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1647332140; bh=mONG+UlY5rxH+SXgTIx9QXycu8XqaesFU2xLTtjz1dU=; h=Date:From:To:Cc:Subject:From; b=iD1LZR99sgmEmlApVmJE9DZwTpB0t4ddd4zSWHV/UpaVJmDOCTLFogluAIn4tSOBL rKxgLPxAE/CBLpfU2Ul5uFIbmYMMsyDNsknznikFtWrRuVhsapMWjw2hicKZ8yutDC /PYuzpC2XDCggwQIfOBIgdQR+hifLS8fdQd+IXDZGjm15QQAU2zlhTz53VF6cLU8Kz Xo3mfcgnH+ycg9OoKe+O2D+aZPdEuDsmuVj247JDeXKlz9i4jyHE5KhvDPImdncu/5 9+m83HVW39pXxNBpF5LgTFw7g5uJmJcPJCbegLaduvv7xeX92S1+WE9HE+qOsfNWUS Xfu1vadW2AYMA== Date: Tue, 15 Mar 2022 19:15:38 +1100 From: Stephen Rothwell To: Dan Williams , Michael Ellerman , PowerPC Subject: linux-next: manual merge of the nvdimm tree with the powerpc tree Message-ID: <20220315191538.323eefbb@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kajol Jain , Linux Next Mailing List , Linux Kernel Mailing List , Shivaprasad G Bhat , Vaibhav Jain Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, Today's linux-next merge of the nvdimm tree got a conflict in: arch/powerpc/platforms/pseries/papr_scm.c between commit: bbbca72352bb ("powerpc/papr_scm: Implement initial support for injecting smart errors") from the powerpc tree and commit: 4c08d4bbc089 ("powerpc/papr_scm: Add perf interface support") from the nvdimm 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/platforms/pseries/papr_scm.c index 1238b94b3cc1,4dd513d7c029..000000000000 --- a/arch/powerpc/platforms/pseries/papr_scm.c