Hi all, After merging the thunderbolt tree, today's linux-next build (powerpc allyesconfig) failed like this: Caused by commit 54509f5005ca ("thunderbolt: Add KUnit tests for path walking") interacting with commit d4cdd146d0db ("kunit: generalize kunit_resource API beyond allocated resources") from the kunit-next tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Tue, 30 Jun 2020 15:51:50 +1000 Subject: [PATCH] thunderbolt: merge fix for kunix_resource changes Signed-off-by: Stephen Rothwell --- drivers/thunderbolt/test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/thunderbolt/test.c b/drivers/thunderbolt/test.c index acb8b6256847..a4d78811f7e2 100644 --- a/drivers/thunderbolt/test.c +++ b/drivers/thunderbolt/test.c @@ -17,13 +17,13 @@ static int __ida_init(struct kunit_resource *res, void *context) struct ida *ida = context; ida_init(ida); - res->allocation = ida; + res->data = ida; return 0; } static void __ida_destroy(struct kunit_resource *res) { - struct ida *ida = res->allocation; + struct ida *ida = res->data; ida_destroy(ida); } -- 2.27.0 -- Cheers, Stephen Rothwell