On Wed, Oct 5, 2022 at 5:46 AM Hans de Goede <hdegoede@xxxxxxxxxx> wrote: > > There also is a small conflict in drivers/platform/mellanox/mlxreg-lc.c > due to a locking fix which landed mid 6.0 mixing unlock + return with > goto style exits in error paths. My tree has a fix on top to consistently > use the goto style. Here you can just take the version from me tree. Ugh. Why use goto when a simple 'break' would work for all but the first case? I took your side rather than clean things up and not being able to test the end result, but it does seem pointlessly complicated. Linus