From: Alan Maguire <alan.maguire@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
Shuah Khan <skhan@linuxfoundation.org>,
Brendan Higgins <brendanhiggins@google.com>,
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: Re: linux-next: build failure after merge of the thunderbolt tree
Date: Tue, 30 Jun 2020 10:27:12 +0100 (IST) [thread overview]
Message-ID: <alpine.LRH.2.21.2006301021590.13740@localhost> (raw)
In-Reply-To: <20200630160346.696f6419@canb.auug.org.au>
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@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>
Thanks Stephen, resolution looks good to me! If you need it
Reviewed-by: Alan Maguire <alan.maguire@oracle.com>
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
next prev parent reply other threads:[~2020-06-30 9:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 6:03 linux-next: build failure after merge of the thunderbolt tree Stephen Rothwell
2020-06-30 9:27 ` Alan Maguire [this message]
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=alpine.LRH.2.21.2006301021590.13740@localhost \
--to=alan.maguire@oracle.com \
--cc=brendanhiggins@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=sfr@canb.auug.org.au \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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