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=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 2008AC33CB6 for ; Fri, 17 Jan 2020 16:59:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EAF592072B for ; Fri, 17 Jan 2020 16:59:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="EN2yOUmj"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="iAHrtXXO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729075AbgAQQ7Q (ORCPT ); Fri, 17 Jan 2020 11:59:16 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:38723 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726559AbgAQQ7P (ORCPT ); Fri, 17 Jan 2020 11:59:15 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 8947122022; Fri, 17 Jan 2020 11:59:12 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 17 Jan 2020 11:59:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=NBrDhIy8eEyYhuxfQaqDFlK5PD1 nOIBhbHxOQiXIM/A=; b=EN2yOUmjgN0bvAvLK+0GRYiokaf/38It9Hh5+pOCRC6 CO48owweftGksIgxq18Ru9qqKqqVBAGyAHkRwVSyYy5XbIHV0YJIXIO/dk8k2eVx 8pD+8R25WeiEdEiSV4NDfNRWYfiYe9Gn0gDTIING967LA2yDFAjYMk5Vk/YYBDeV uQQd6zxHacpB7MnFSuVTHVvOu1DW2f7ZO4eeKsyp7q78opgZrMfDh4ezqBCBqtdW WT/eR5UDlGwJupSQrhT0gV+xBP2DE6gi3zhTd+12e6duYTG9qqNLLUBiW8rTiuaB SXupCEpFgGMMktVlSH05XXTRiUw2rbJSY31aKUtOoXw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=NBrDhI y8eEyYhuxfQaqDFlK5PD1nOIBhbHxOQiXIM/A=; b=iAHrtXXO58x3KevYTmn+Nu yqJvL5VY1yUNQdCACdVct00zYFkL4o3uSZaJ1D4pXWiRdEqruinGdXEIxB5I0w/H 0YZbxsdQeCedyYeE2saAlzjclvLLpkFR3/Tj1xK+nxjN+eQINp+3J88fm/2d6oV5 jcWFDugu/OA0l8S2u1+ovGnKpw9W3Bf3tVk4loTP1RXvdHxthVfKNb0LsSjJik1N 0jlCpt5QILgQiGNAo6wwAc211QPYYI1w+H+LovUZpzc9EkIbJuj/BbO2CspenW3I D9fw9D19riyawJsU8vfWrG6r8Wj4XVNyyqwW629Pq9T0P/gJ0hSXoxTTQm1w4sQw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrtdekgddtudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghgucfm jfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecukfhppeekfedrkeeirdekledruddtje enucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id F2C073060AEC; Fri, 17 Jan 2020 11:59:11 -0500 (EST) Date: Fri, 17 Jan 2020 17:59:09 +0100 From: Greg KH To: Steven Price Cc: Sasha Levin , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" , Dan Carpenter , Rob Herring , "dri-devel@lists.freedesktop.org" Subject: Re: [PATCH AUTOSEL 5.4 002/205] drm/panfrost: Add missing check for pfdev->regulator Message-ID: <20200117165909.GA1949937@kroah.com> References: <20200116164300.6705-1-sashal@kernel.org> <20200116164300.6705-2-sashal@kernel.org> <20200117161226.GA8472@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200117161226.GA8472@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 17, 2020 at 04:12:27PM +0000, Steven Price wrote: > On Thu, Jan 16, 2020 at 04:39:37PM +0000, Sasha Levin wrote: > > From: Steven Price > > > > [ Upstream commit 52282163dfa651849e905886845bcf6850dd83c2 ] > > This commit is effectively already in 5.4. Confusingly there were two > versions of this upstream: > > 52282163dfa6 ("drm/panfrost: Add missing check for pfdev->regulator") > c90f30812a79 ("drm/panfrost: Add missing check for pfdev->regulator") > > It got merged both through a -fixes branch and through the normal merge > window. The two copies caused a bad merge in mainline and this was > effectively reverted in commit 603e398a3db2 ("drm/panfrost: Remove NULL > check for regulator"). > > c90f30812a79 is included in v5.4 so should already be in any v5.4.y > release. Have I mentioned this month just how much I hate the way the DRM tree handles stable patches like this? This kind of fallout is a pain for stable maintainers, I dred every time I see a drm patch tagged for stable. But we've been over this all before :( greg k-h