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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,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 58908C433DB for ; Fri, 5 Feb 2021 22:41:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2DFF064FEB for ; Fri, 5 Feb 2021 22:41:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233202AbhBEWlQ (ORCPT ); Fri, 5 Feb 2021 17:41:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:44342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232881AbhBEOwM (ORCPT ); Fri, 5 Feb 2021 09:52:12 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 36E5C64FC9; Fri, 5 Feb 2021 14:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1612533851; bh=T1jLO24sF0pYkT3lQr2onlwV1fj0AbfnrcXXdUAochg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BZOBBDws+/yhmPTxNLP4zonarclKLQMtK4MPPXtDYExmUzHRLjxXcJnfGq14VQa4L yZhVB9oNHiU0DzaVx6si8j0aXHMHTj1MM3VS8xDsEeLmU5/b+5mHQBkgW7cT1CQKhX bLMDr8tZSM1SipNLwaZFpx+i2Ki4uOTJ99+ziw0o= Date: Fri, 5 Feb 2021 15:04:08 +0100 From: Greg Kroah-Hartman To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Cc: Alexandre Belloni , Dmitry Torokhov , kvm@vger.kernel.org, David Airlie , Linus Walleij , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Jaroslav Kysela , Eric Anholt , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , linux-i2c@vger.kernel.org, Jiri Slaby , linux-stm32@st-md-mailman.stormreply.com, linux-watchdog@vger.kernel.org, linux-rtc@vger.kernel.org, Herbert Xu , Takashi Iwai , Russell King - ARM Linux admin , Krzysztof Kozlowski , Alexander Shishkin , linux-serial@vger.kernel.org, linux-input@vger.kernel.org, Ulf Hansson , Guenter Roeck , Mike Leach , Maxime Coquelin , Alexandre Torgue , alsa-devel@alsa-project.org, Suzuki K Poulose , coresight@lists.linaro.org, Vladimir Zapolskiy , Eric Auger , Alex Williamson , Mark Brown , Matt Mackall , Dan Williams , Wim Van Sebroeck , kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, Alessandro Zummo , Mathieu Poirier , Cornelia Huck , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Vinod Koul , Arnd Bergmann , linux-crypto@vger.kernel.org, Daniel Vetter , Leo Yan , dmaengine@vger.kernel.org Subject: Re: [PATCH] coresight: etm4x: Fix merge resolution for amba rework Message-ID: References: <20210205130848.20009-1-uwe@kleine-koenig.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210205130848.20009-1-uwe@kleine-koenig.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 05, 2021 at 02:08:47PM +0100, Uwe Kleine-König wrote: > This was non-trivial to get right because commits > c23bc382ef0e ("coresight: etm4x: Refactor probing routine") and > 5214b563588e ("coresight: etm4x: Add support for sysreg only devices") > changed the code flow considerably. With this change the driver can be > built again. > > Fixes: 0573d3fa4864 ("Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next") > Signed-off-by: Uwe Kleine-König Now queued up, thanks! greg k-h