From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 423A5C433E0 for ; Tue, 23 Feb 2021 01:14:06 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F93964E2E for ; Tue, 23 Feb 2021 01:14:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F93964E2E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Dl1KR58RCz3cSg for ; Tue, 23 Feb 2021 12:14:03 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=ib8ZIzG1; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ellerman.id.au (client-ip=203.11.71.1; helo=ozlabs.org; envelope-from=mpe@ellerman.id.au; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=ib8ZIzG1; dkim-atps=neutral Received: from ozlabs.org (ozlabs.org [203.11.71.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Dl1Jy0pwMz30LT for ; Tue, 23 Feb 2021 12:13:37 +1100 (AEDT) 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 4Dl1Js3xT9z9sS8; Tue, 23 Feb 2021 12:13:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1614042816; bh=FAcIZ5QF9ArI7FFOyovUOaKnveLQ6XJR1r7QpX3zQzg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ib8ZIzG1GEbGcHcBE1SB4ZyJSeZWWenriFLSahoMqCiVPPPyFHLBAgI5S9mB7CY4f PapNrBrGhVMP01t8FXhxqZABzcaNn6Fk9lwUFdsZqPIqofMSlo7pR5vKA+6Z4ZLrFD XOMGiDYTlqtryPeeKOQQj6KkIkXKn3YDo9PMyloUTQhQHk+ZsvHV8z6QWdUfYSwaJD SwN2ZD2EfMuNgqpo5bKflJq+gVIQ8/H5HeMjvAgVL61GUvtO4N+bHY/bZbZjOC3aFo YuYo9rJ9Z/PFtk13tejf7P5/7o6QzWkaCGANjpMAm+2ErvJ/W3pyG7EBFpjJbiblmM iYlCp/DdbhkIw== From: Michael Ellerman To: Rob Herring Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.12-1 tag In-Reply-To: References: <87o8gctii6.fsf@mpe.ellerman.id.au> Date: Tue, 23 Feb 2021 12:13:33 +1100 Message-ID: <87h7m3twle.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain 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: ananth@linux.ibm.com, Alexey Kardashevskiy , kernelfans@gmail.com, cmr@codefail.de, zhengyongjun3@huawei.com, Oliver O'Halloran , sandipan@linux.ibm.com, cy.fan@huawei.com, SF Markus Elfring , jiapeng.chong@linux.alibaba.com, skirmisher@protonmail.com, Florian Fainelli , Bhaskar Chowdhury , eerykitty@gmail.com, "Aneesh Kumar K.V" , Haren Myneni , ganeshgr@linux.ibm.com, Michal Suchanek , nathanl@linux.ibm.com, kjain@linux.ibm.com, Nicholas Piggin , Mark Brown , Qian Cai , =?utf-8?Q?C=C3=A9dric?= Le Goater , Hari Bathini , atrajeev@linux.vnet.ibm.com, Linus Torvalds , Randy Dunlap , "linux-kernel@vger.kernel.org" , fbarrat@linux.ibm.com, po-hsu.lin@canonical.com, linuxppc-dev Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Rob Herring writes: > On Mon, Feb 22, 2021 at 6:05 AM Michael Ellerman wrote: >> >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA256 >> >> Hi Linus, >> >> Please pull powerpc updates for 5.12. >> >> There will be a conflict with the devicetree tree. It's OK to just take their >> side of the conflict, we'll fix up the minor behaviour change that causes in a >> follow-up patch. > > The issues turned out to be worse than just this, so I've dropped the > conflicting change for 5.12. OK, no worries. cheers