Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Sun, 9 Aug 2020 18:18:38 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Linus Torvalds <torvalds@linux-foundation.org>
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>,
        Guenter Roeck <linux@roeck-us.net>
Subject: Re: linux-next: build failure after merge of the thunderbolt tree
Message-ID: <20200809181838.23c6b829@canb.auug.org.au>
In-Reply-To: <20200630160346.696f6419@canb.auug.org.au>
References: <20200630160346.696f6419@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/uLNdZKn8oKfs6EIHutgeU2g";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/uLNdZKn8oKfs6EIHutgeU2g
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Linus,

On Tue, 30 Jun 2020 16:03:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the thunderbolt tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>=20
>=20
> Caused by commit
>=20
>   54509f5005ca ("thunderbolt: Add KUnit tests for path walking")
>=20
> interacting with commit
>=20
>   d4cdd146d0db ("kunit: generalize kunit_resource API beyond allocated re=
sources")
>=20
> from the kunit-next tree.
>=20
> I have applied the following merge fix patch.
>=20
> 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
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/thunderbolt/test.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> 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, voi=
d *context)
>  	struct ida *ida =3D context;
> =20
>  	ida_init(ida);
> -	res->allocation =3D ida;
> +	res->data =3D ida;
>  	return 0;
>  }
> =20
>  static void __ida_destroy(struct kunit_resource *res)
>  {
> -	struct ida *ida =3D res->allocation;
> +	struct ida *ida =3D res->data;
> =20
>  	ida_destroy(ida);
>  }
> --=20
> 2.27.0
>=20
> --=20
> Cheers,
> Stephen Rothwell

I looks like the above report got lost along the way to you :-(

Here's the patch in case you want to directly apply it:

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 =3D context;
=20
 	ida_init(ida);
-	res->allocation =3D ida;
+	res->data =3D ida;
 	return 0;
 }
=20
 static void __ida_destroy(struct kunit_resource *res)
 {
-	struct ida *ida =3D res->allocation;
+	struct ida *ida =3D res->data;
=20
 	ida_destroy(ida);
 }


--=20
Cheers,
Stephen Rothwell

--Sig_/uLNdZKn8oKfs6EIHutgeU2g
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8vsV4ACgkQAVBC80lX
0GxxvggAkwBgTVCErSJxweAYYV171zZEPU7+MpFd4WzZsJSxG0Bih2yrOF9TMqKj
WN3IFrliFsTAZUIrSFZ83NHBT3v4Lk5V/t0cdHiDHDdVJrcA5twlA6cGwjl/Qjqc
NVmOIIEFg1GsVHMhtDzHxqz2G8uMBrICkkgqSh5Ys6fQV6kwifqDcKj0ufpudbRV
AL+PVLMbiaEvlaisSw4e/qkcOktDIyvy76pSGg3wwZJCshv8G1FXDFwTFk6gqaVx
aVweehWuIq7JPl8Su8NqvSoCL3PW5Uj0TkYZ4OSZY5hNNh101Z1iCWXlBKeNoGEf
L6hRJajG+g1mlSrzLPLcGKWrkjVYHg==
=eU45
-----END PGP SIGNATURE-----

--Sig_/uLNdZKn8oKfs6EIHutgeU2g--