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

2021-02-05 Thread Greg Kroah-Hartman
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

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

2021-02-05 Thread Uwe Kleine-König
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 b