From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CC4CC05027 for ; Wed, 1 Feb 2023 05:37:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231285AbjBAFhY (ORCPT ); Wed, 1 Feb 2023 00:37:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229488AbjBAFhU (ORCPT ); Wed, 1 Feb 2023 00:37:20 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC83453E4E; Tue, 31 Jan 2023 21:37:18 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4P69fK4GxFz4x1S; Wed, 1 Feb 2023 16:37:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1675229834; bh=kapy6U1iqS5EQIskebYq13LmQ07B6ujHYfriERONEXQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=R/WnssNQhNX73eMWsvq6FTfHhaUN/C/lhtpwYXo3f8J27Qd8HL/JLD7V6CX26j6tG MtTXbvV2oi8JFFAtOoO0CZRbXm/PNG4kKvcTDNX/x9nFQbz3TyXsTaiJxD8yM4Q/IV eGEbTz7JWzw+QAWOf7AfX2ZpkwKDEOuhPD5XdrAC8A2DzyJXsAqGh0tUzq6CY5mMZX kiV04nl0fQJ4ZrFWUFUxHy23mo3EQoPB3ZYTG0ibI06wGvjJ1GQZycIoTzxCJSJ6GO BDJd9FQLDGADFzRk6pLCGCrYngs/swcEIaCfdhVBjE9r690ZuAdVc/5TKjTFRpcA9E KLWPwze2HpzPA== Date: Wed, 1 Feb 2023 16:37:12 +1100 From: Stephen Rothwell To: David Gow Cc: Shuah Khan , Brendan Higgins , Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree Message-ID: <20230201163712.4336d3a1@canb.auug.org.au> In-Reply-To: References: <20230201134941.46b02711@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/cacTfJJmz./29rDCTs0UjNS"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/cacTfJJmz./29rDCTs0UjNS Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi David, On Wed, 1 Feb 2023 12:31:49 +0800 David Gow wrote: > > As you noted, the "hooks" patch is meant to supersede "kunit: Export > kunit_running()", which is really meant as a fix for older kernels > which won't get the "hooks" patch. >=20 > I imagine we'll rebase this once the fixes go upstream. Or just merge what you ask Linus to merge, for a minimal change. --=20 Cheers, Stephen Rothwell --Sig_/cacTfJJmz./29rDCTs0UjNS Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPZ+ogACgkQAVBC80lX 0GwDFwf/XgDnfYlBcpjsG7a13zUvBFZYnjr+bF63Qf/Y81tb8NgIO2MoTx4Aa58c H9yTmuNumKfwOP1lVQiMuLeqpr40248qR2JSKi+6wngDsVgkwEr6gHPDiPZcpB6e mu3jSexWoq1lNP/W4AzuDkNPXJVTyO/k510qiY7nqSAvXGcGrwlcSSUA/7XYR0+y sh/wESUHZrRLvF/YeVgrQabwlYOFYZc9gYs+n8u1ypnvE6s/oHJBMpvDr/WI0vEW CQC+cxy6Dl3ZTw02FYfue5COCNfDB7UHkVjhAiulncXOqtktXt/tF1Ah/yAzQ9DA aoDBnQBXT5IYr6biVpxjpDCpCkI0Nw== =J2Wt -----END PGP SIGNATURE----- --Sig_/cacTfJJmz./29rDCTs0UjNS--