From patchwork Mon Jul 27 01:32:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1336579 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BFMlr4n62z9sR4 for ; Mon, 27 Jul 2020 11:34:00 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: 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=h2Oie2Tg; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BFMln63h3zDsNZ for ; Mon, 27 Jul 2020 11:33:57 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (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 4BFMjv08FXzDsGD for ; Mon, 27 Jul 2020 11:32:19 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au 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=h2Oie2Tg; 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 4BFMjt2QB1z9sRR; Mon, 27 Jul 2020 11:32:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595813538; bh=Sd0QMp+dL8Xl9I/23zPlRtnU55UdXgSaX9CBCoroSaY=; h=Date:From:To:Cc:Subject:From; b=h2Oie2Tgxe4VdqETiQbQPK/848q7x4sw/9l/prnYyLvbOhKsCZ9UIgmG9Dqh7W+T0 MESoCYuo5yiuk9mdpmSe6fBrERJ5TEB9EBctlZ6lmYdscXolmqwb4gqpVfXW3twlmc MhpNE+cQDNe2a9dKRPs4XVvbsShmFXdM9Y9yPwMWPIgQ8+RGRInCabPyPOy8B9A1KN FA0QINKwjs+M1XSPOZwToARjGS8b2Y8D0Dw0E9i/Kxs3RHMMDiBBYNUpjFN3sZmcmu rN0ANM9JrzeTa+pfxld+NWPnvyPq5G1ScTvw/ou3HJBRETtCQXBB+eHsvG+aHH5Ycu tq4+doTKIoj9Q== Date: Mon, 27 Jul 2020 11:32:16 +1000 From: Stephen Rothwell To: Al Viro , Michael Ellerman Subject: linux-next: manual merge of the vfs tree with the powerpc tree Message-ID: <20200727113216.6620d08d@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: "Aneesh Kumar K.V" , Linux Next Mailing List , PowerPC , Linux Kernel Mailing List Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, Today's linux-next merge of the vfs tree got a conflict in: arch/powerpc/kernel/ptrace/ptrace-view.c between commit: e0d8e991be64 ("powerpc/book3s64/kuap: Move UAMOR setup to key init function") from the powerpc tree and commit: 5e39a71bddb3 ("powerpc: switch to ->regset_get()") from the vfs tree. I fixed it up (I thnk - 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/kernel/ptrace/ptrace-view.c index ac7d480cb9c1,13208a9a02ca..000000000000 --- a/arch/powerpc/kernel/ptrace/ptrace-view.c