Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1997500pxb; Mon, 22 Feb 2021 17:16:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJxuaSE/vaQ7sXbOu/t8pVEqv3fSiUduHsm4d1V5xyP1W3hjpcJZV9axvraDEBMSIpenQPpI X-Received: by 2002:a17:906:3c1:: with SMTP id c1mr22979856eja.428.1614042976846; Mon, 22 Feb 2021 17:16:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614042976; cv=none; d=google.com; s=arc-20160816; b=JOZxPcqBW+FMefyWY5/XVeH6OGX2m7jteWcz3I7lijfcKLamcspfg/+JviZ10t1MAX mLbHQ17S896yKVCqAc9Gzo1QzXYe94Tevog8H/GCH0svJUdEx+y6OMyw+nyDrdvnscKA Z1ns4gWaAe/KK3fJ/ZaVMTjHv7jHPiXPmoZGTvE9u2Mj52MZVU3pCy6V2Hlf9tTxv+oL FGFiDC0x8HTK9CMISizZByZBWOAXyRSmq/Eo+BCmDrFQOHUSbHdT0vRUhsXdJqtou0AA njDvVCUlj7T/yz/20hNQKSAQgYsnYdzTarDIpXibl26Ly5VyLnw1R4IilV3RqM4ly0z5 blyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:dkim-signature; bh=FAcIZ5QF9ArI7FFOyovUOaKnveLQ6XJR1r7QpX3zQzg=; b=JyW0IG1A906+/aQ9m+gARtFhWyhaop8fPTugrO5D0kMgjQ/+Sw8ibihIjNMbTDrGzo hkHLunSv9mNEUchVh3fgT7e6rowmUBPf/HKnw4Cb1B0kPe8XOwTzKCzi+5nlRe8OvM+s KXdYQ0vqqy/bkT7YGgVkajp8+r7rvyXQApPLjxrx7E70Y+1scnOGy3gQQJfJW4T7fDJJ WTzTiqqzj0m186eleGxIBcjvJNODZM/KOqoPmj7XxRkhwdwpkGo1W47An9puh69FRrch rRFZakoIyPuu9whPzPpedPZKLmlCbJnlEKMYS8TstXDQU7pp2fiqyB6WwxhkEmK151Cj +k6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=ib8ZIzG1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m29si11638263edb.412.2021.02.22.17.15.50; Mon, 22 Feb 2021 17:16:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=ib8ZIzG1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230042AbhBWBOV (ORCPT + 99 others); Mon, 22 Feb 2021 20:14:21 -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