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:   Tue, 30 Jun 2020 16:03:46 +1000
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
Message-ID: <20200630160346.696f6419@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/PANaBPwAFEIYYBZ6Zwr+7fT";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/PANaBPwAFEIYYBZ6Zwr+7fT
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 reso=
urces")

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 =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
Cheers,
Stephen Rothwell

--Sig_/PANaBPwAFEIYYBZ6Zwr+7fT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl761cIACgkQAVBC80lX
0Gwv1AgAhslxYtdHIbnYIMtfrNpPxK4oDcoq7vGVyOOTt7r2lWHdpfnk+u52pQrn
umb5XC7d0al0OBPr0/vjkaWOtZfctxJHo8/zI96uRsMMpIrJvCJ6SY+AGMe/FRaX
/Y+pLRHSWNJB/ls8q7/gmrQP+ss4MHWMMpYXd8Rcp12Zw5uZnHPBa9qNmpXLxaPg
/6A3MT6XUXoF9Poa/ebszs1OfomX75d1xMiObJjSjsbmtQWIdBIU3YIiqb8r5vTN
BlI9IpxebQIuJIDzS7qJV6zvOjLC4oDDRk06fU9HTa8P5MjCmMciOnuCPySDa8Iv
Ts0TWOO1IR4G6J1WfQQs7Hh9aks/Nw==
=zmmO
-----END PGP SIGNATURE-----

--Sig_/PANaBPwAFEIYYBZ6Zwr+7fT--