# Re: \[PATCH\] coresight: etm4x: Fix merge resolution for amba rework

- From: Greg Kroah-Hartman \<gregkh@linuxfoundation.org\>
- Date: 2021-02-05 22:41:53 
- List: linux-input
- Page: https://ratatoskr.run/linux-input/2021/02/6260517
- Thread: https://ratatoskr.run/kvm/2021/02/6259976/t.md

```text
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 <redacted>

Now queued up, thanks!

greg k-h
```