linux-kernel - Re: [PATCH] coresight: etm4x: Fix merge resolution for amba rework

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 5 Feb 2021 15:04:08 +0100
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Uwe Kleine-König <uwe@...ine-koenig.org>
Cc:     Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Dmitry Torokhov <dmitry.torokhov@...il.com>,
        kvm@...r.kernel.org, David Airlie <airlied@...ux.ie>,
        Linus Walleij <linus.walleij@...aro.org>,
        linux-fbdev@...r.kernel.org, dri-devel@...ts.freedesktop.org,
        Jaroslav Kysela <perex@...ex.cz>,
        Eric Anholt <eric@...olt.net>,
        Uwe Kleine-König 
        <u.kleine-koenig.org@...gutronix.de>, linux-i2c@...r.kernel.org,
        Jiri Slaby <jirislaby@...nel.org>,
        linux-stm32@...md-mailman.stormreply.com,
        linux-watchdog@...r.kernel.org, linux-rtc@...r.kernel.org,
        Herbert Xu <herbert@...dor.apana.org.au>,
        Takashi Iwai <tiwai@...e.com>,
        Russell King - ARM Linux admin <linux@...linux.org.uk>,
        Krzysztof Kozlowski <krzk@...nel.org>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        linux-serial@...r.kernel.org, linux-input@...r.kernel.org,
        Ulf Hansson <ulf.hansson@...aro.org>,
        Guenter Roeck <linux@...ck-us.net>,
        Mike Leach <mike.leach@...aro.org>,
        Maxime Coquelin <mcoquelin.stm32@...il.com>,
        Alexandre Torgue <alexandre.torgue@...com>,
        alsa-devel@...a-project.org,
        Suzuki K Poulose <suzuki.poulose@....com>,
        coresight@...ts.linaro.org, Vladimir Zapolskiy <vz@...ia.com>,
        Eric Auger <eric.auger@...hat.com>,
        Alex Williamson <alex.williamson@...hat.com>,
        Mark Brown <broonie@...nel.org>,
        Matt Mackall <mpm@...enic.com>,
        Dan Williams <dan.j.williams@...el.com>,
        Wim Van Sebroeck <wim@...ux-watchdog.org>,
        kernel@...gutronix.de, linux-arm-kernel@...ts.infradead.org,
        Alessandro Zummo <a.zummo@...ertech.it>,
        Mathieu Poirier <mathieu.poirier@...aro.org>,
        Cornelia Huck <cohuck@...hat.com>, linux-mmc@...r.kernel.org,
        linux-kernel@...r.kernel.org, linux-spi@...r.kernel.org,
        Vinod Koul <vkoul@...nel.org>, Arnd Bergmann <arnd@...db.de>,
        linux-crypto@...r.kernel.org, Daniel Vetter <daniel@...ll.ch>,
        Leo Yan <leo.yan@...aro.org>, dmaengine@...r.kernel.org
Subject: Re: [PATCH] coresight: etm4x: Fix merge resolution for amba rework

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 <uwe@...ine-koenig.org>

Now queued up, thanks!

greg k-h