From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mika Westerberg <mika.westerberg@linux•intel.com>,
Shuah Khan <skhan@linuxfoundation•org>,
Brendan Higgins <brendanhiggins@google•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Alan Maguire <alan.maguire@oracle•com>
Subject: linux-next: build failure after merge of the thunderbolt tree
Date: Tue, 30 Jun 2020 16:03:46 +1000 [thread overview]
Message-ID: <20200630160346.696f6419@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]
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@canb•auug.org.au>
Date: Tue, 30 Jun 2020 15:51:50 +1000
Subject: [PATCH] thunderbolt: merge fix for kunix_resource changes
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-06-30 6:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 6:03 Stephen Rothwell [this message]
2020-06-30 9:27 ` linux-next: build failure after merge of the thunderbolt tree Alan Maguire
2020-06-30 11:33 ` Mika Westerberg
2020-08-09 0:50 ` Guenter Roeck
2020-08-09 8:18 ` Stephen Rothwell
2020-08-09 18:04 ` Linus Torvalds
2020-08-09 23:10 ` Stephen Rothwell
2020-08-10 10:12 ` Mika Westerberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200630160346.696f6419@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alan.maguire@oracle$(echo .)com \
--cc=brendanhiggins@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mika.westerberg@linux$(echo .)intel.com \
--cc=skhan@linuxfoundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox