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=-10.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 5C63EC433E0 for ; Tue, 23 Feb 2021 01:14:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1130464E2E for ; Tue, 23 Feb 2021 01:14:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230333AbhBWBOW (ORCPT ); Mon, 22 Feb 2021 20:14:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229886AbhBWBOT (ORCPT ); Mon, 22 Feb 2021 20:14:19 -0500 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED604C06174A for ; Mon, 22 Feb 2021 17:13:38 -0800 (PST) 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 Cc: Linus Torvalds , Alexey Kardashevskiy , ananth@linux.ibm.com, "Aneesh Kumar K.V" , atrajeev@linux.vnet.ibm.com, Qian Cai , christophe.leroy@csgroup.eu, =?utf-8?Q?C=C3=A9dric?= Le Goater , cmr@codefail.de, cy.fan@huawei.com, eerykitty@gmail.com, SF Markus Elfring , Florian Fainelli , fbarrat@linux.ibm.com, ganeshgr@linux.ibm.com, Haren Myneni , Hari Bathini , jiapeng.chong@linux.alibaba.com, kernelfans@gmail.com, kjain@linux.ibm.com, "linux-kernel@vger.kernel.org" , linuxppc-dev , Michal Suchanek , nathanl@linux.ibm.com, Nicholas Piggin , Oliver O'Halloran , po-hsu.lin@canonical.com, Randy Dunlap , sandipan@linux.ibm.com, skirmisher@protonmail.com, Bhaskar Chowdhury , zhengyongjun3@huawei.com, Mark Brown 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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