Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1744137pxb; Mon, 22 Feb 2021 09:46:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJysUybj8wvzVl1VDiksjumJShi16yDr7i2LeNvqG/+7Mx4lqWXYazWbNmtL+tvu3mW1iMd5 X-Received: by 2002:a17:906:27d3:: with SMTP id k19mr17779305ejc.73.1614015969343; Mon, 22 Feb 2021 09:46:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614015969; cv=none; d=google.com; s=arc-20160816; b=brjGMX9vjmRgD3HHS+xyMAZmkfAeFTryo9RtvGdQaXzLKv/m0U6Tk8wZCD3FuxznPy 8+zh15WVXwvtjQ7EwSgFRHCIXbxsfw87NnzAlsY73+wZ6d6dCYr+/D5BsDfLad5d7A8C /76HiIVjze08aYNNT5DwlZRI+fzCG6XxUQvJnYpkbhe59VjDh4mllTYYoC9PkDXcVy1Q 2uODhL3FRHOVNW/xO7t99s8JQ6WvQer1/2iKrL2mXfVGqHJ5R7qDu2hCaTkS4luFOQ99 5KzBfL+Jge/EN+Z8jwzl7heoyO6cLjYWNtx76vBaLUnnHnYJzzzqTus19iaoUyy/WvEY A9YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=ucpe8l1xlT3KE7H9NkJLSoHHuTstbkJCkhSCSRIJhcA=; b=rwm4xRsWyUr9djGtI2+l5cyZDsdd9vtAfDV8qFYl5oT4/rUmp384MYwfk5/hjK4wot wD4xjPx00OKhD9oKQT/sld3qs9WdOU9S5sR7Qab0RjH3+lw4tb79o3vvj8rqaUkkFbT2 LKQu+kxRbwe5AGkyp5qlBF5nMaLf3mbNtgrrVXDs7N7DvQFEeHDshXZLA/g9Jnsq8b+i hR0NvmtjXBykbZSxaF6ssu0dr5MO9zSXXjhgCerAUREKd96B9HQ/SO/SSUxVayZ9DEf/ 202jjDVZt6vbxszlN8Y/KCq4Qr/ZhpNXcxJoUw/nsKrNXxtTKpDM4dAgyt4TM3VkAsC3 frbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ESuLuDMj; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y13si13132768edd.436.2021.02.22.09.45.45; Mon, 22 Feb 2021 09:46:09 -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=@kernel.org header.s=k20201202 header.b=ESuLuDMj; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231665AbhBVRnX (ORCPT + 99 others); Mon, 22 Feb 2021 12:43:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:60634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231652AbhBVRmu (ORCPT ); Mon, 22 Feb 2021 12:42:50 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A719164F02 for ; Mon, 22 Feb 2021 17:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614015729; bh=ucpe8l1xlT3KE7H9NkJLSoHHuTstbkJCkhSCSRIJhcA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=ESuLuDMj05PhMn89mmnvnN5D7nx95cA8aPpEXmEx2ZxqaVvyqLP7wQ+/b/yC2xKww IV8w8seoshTPFqoKNvWscwxeHk7BKF+3pRm8eQNfrykduRSYQh8NF/9sLeP084HRWH lIPvxkAG1h7XpusBmK4UwJ98+uQtWUk8Pz16eW40M4oVN/oZV/JprALs0hVZlrhgOa EdI+FDZ8Tb1MgI5yHrFGftIWMZoF6VVhITr42i8lh6xfAMoKvQmPxrQa+4nKq3C84M 5EXVvcftHsB3VRty66ynYI5hxuVnosGlGSFVtzKOTC+F/X0ulHJkYgNNtzjkSrn/89 HB4hHurGM9lKA== Received: by mail-ej1-f48.google.com with SMTP id w1so30621083ejf.11 for ; Mon, 22 Feb 2021 09:42:09 -0800 (PST) X-Gm-Message-State: AOAM531CNdwSeppFnA0Bv0qomHrsMkiN45wWw6GS8z8wXnLyZVimM6lD 5XFFVm5e31kdckQ88NyXkQ5EvGzvsvifWGblQw== X-Received: by 2002:a17:906:f85:: with SMTP id q5mr21544446ejj.108.1614015727967; Mon, 22 Feb 2021 09:42:07 -0800 (PST) MIME-Version: 1.0 References: <87o8gctii6.fsf@mpe.ellerman.id.au> In-Reply-To: <87o8gctii6.fsf@mpe.ellerman.id.au> From: Rob Herring Date: Mon, 22 Feb 2021 11:41:56 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.12-1 tag To: Michael Ellerman 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Rob