On Tue, 30 Jun 2020, Stephen Rothwell wrote: > 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 <sfr@xxxxxxxxxxxxxxxx> > Date: Tue, 30 Jun 2020 15:51:50 +1000 > Subject: [PATCH] thunderbolt: merge fix for kunix_resource changes > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Thanks Stephen, resolution looks good to me! If you need it Reviewed-by: Alan Maguire <alan.maguire@xxxxxxxxxx> Once the kunit and thunderbolt trees are merged there may be some additional things we can do to simplify kunit resource utilization in the thuderbolt tests using the new kunit resource APIs; no hurry with that though. Nice to see the kunit resources code being used! Alan