Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp885875pxb; Tue, 19 Oct 2021 15:23:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMPxbrGSbZPaYslMMYY4UyPmggCPfNNbOHYxvx5s7TQnR9LYBq8k8YY1cZdrJfa70OgYtj X-Received: by 2002:a63:6e8b:: with SMTP id j133mr21153165pgc.48.1634682193973; Tue, 19 Oct 2021 15:23:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634682193; cv=none; d=google.com; s=arc-20160816; b=00UTAZpI6QrBxEZ1xh1Is1ARdfliA8MK4d5WPxoyObTs88mfbHhAYkqgINjFLjLDtm 4SfxZK+pp80Yq3OvHjvuMGhJf18GBJAWO9BxcyhjPwTzNm9p8WZ3N/LJYrI2YdAktqzv 1cp+GwcXL9gtjSGfSDb0aknq6j4qRhg1FxfP5qcQtlHkvaljU5wPcWF+W9u2e5dM206f Z/V09d8vNQjfyRWVvQhTUCTb6ltV5dCGxIg1yURHw+htI5ytJSU4IEinhLli5Bevsoy0 kdTd3+4alJxn0lVVaHpwesBE0qlTEcXmNoAQCD+bWMaGvKKoo1jbKLjg0Ne4RnfMP01+ KAzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :subject:cc:to:from:date:dkim-signature; bh=BsZDeOgDiE+nxryU78tK9C1iGM3YQmcPupQaMFCpk1U=; b=ETYaXpHWnfuUDUb+vuCXf6eOn0NmVGTyZpKzN2WCzZs6p0GziSVSjNRa8ZE9DDQGM1 6NdeaDJAqJ87TfXun7ljA2P4pl3U2yfrBBBiwma3Eh3RrMfzpmh7iUjGyLuU0whU4NKP Y6B7BgSIdFioPltYuhrxp2ueE2Cm6wPN3kX44eBgaD5UfI0YBC/9HmkgHBSgfVnbREnQ AnlqDbK+6DOWvTpY/tQsy162R8jlvQwWb+q84IgfRqGwwhLoQMiT8azsCK+E5xClTZi9 uwxDlJo8/nBpdC/ErVNX3x6cRomfDF77ZPE69wRdMt9zYsQyxTvFR4d9Y3LtbMvNTh0y NClQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rothwell.id.au header.s=201702 header.b=bgou3IHI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y13si351634plg.270.2021.10.19.15.22.58; Tue, 19 Oct 2021 15:23:13 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@rothwell.id.au header.s=201702 header.b=bgou3IHI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229707AbhJSWWw (ORCPT + 99 others); Tue, 19 Oct 2021 18:22:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbhJSWWv (ORCPT ); Tue, 19 Oct 2021 18:22:51 -0400 Received: from gimli.rothwell.id.au (gimli.rothwell.id.au [IPv6:2404:9400:2:0:216:3eff:fee1:997a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EC60C06161C; Tue, 19 Oct 2021 15:20:38 -0700 (PDT) Received: from authenticated.rothwell.id.au (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.rothwell.id.au (Postfix) with ESMTPSA id 4HYp8m57WDzytn; Wed, 20 Oct 2021 09:20:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothwell.id.au; s=201702; t=1634682025; bh=BsZDeOgDiE+nxryU78tK9C1iGM3YQmcPupQaMFCpk1U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=bgou3IHIlEt/VAzdjlzPBFqvFJEBBnwf1+V8X5UbWhuE+xTkzyCEjn6wH2ahaAoRK wVoJzLPz1Pg1AUhgwkzZkx6P6lzDrBctxifLMnCTfODeUwxzPvPuU5wmH7NdwzFedB Vh2ZBINRD/6gbt/oKMTC8RK1Y3AVHiyNSgQD7SAZQGb+HkUysUG5iXFiPjWli3u2UW oOjK239Q+eLSbQaaM6ADGIGBB5fGauxbHV4iA7lZ2elbCJf+uxKIIQJ0fN61jJm0/x LArjTu0oH2Bt2Fx5IwbKD41FWr3weHCRC8xASibA3IrsTgjQRLSACiSWLkvDpC7B2z BPjdLTtWBVoUA== Date: Wed, 20 Oct 2021 09:20:23 +1100 From: Stephen Rothwell To: Shuah Khan Cc: Stephen Rothwell , Daniel Latypov , Linux Kernel Mailing List , Linux Next Mailing List , Brendan Higgins Subject: Re: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree Message-ID: <20211020092023.0a9a43f4@elm.ozlabs.ibm.com> In-Reply-To: <009188fd-a744-fb50-a9d2-ca1ce9b7905f@linuxfoundation.org> References: <20211008152930.03787395@canb.auug.org.au> <009188fd-a744-fb50-a9d2-ca1ce9b7905f@linuxfoundation.org> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/BzRp6QoQu6qcixc9NvWUnLH"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/BzRp6QoQu6qcixc9NvWUnLH Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Shuah, On Tue, 19 Oct 2021 15:26:40 -0600 Shuah Khan w= rote: > > I fixed the merge conflict in kunit-next tree after rebase to Linux 5.15-= rc6. > There is no need to carry this fix. >=20 > Daniel! Please review to see if it looks good. It was very minor fix-up. There was really no need to rebase. A simple merge of the kunit-fixes tree into the kunit-next tree would has sufficed, maintained history and allowed a place for an explanation. Or you could have mentioned the conflict to Linus during the merge window. --=20 Cheers, Stephen Rothwell --Sig_/BzRp6QoQu6qcixc9NvWUnLH Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmFvRKcACgkQAVBC80lX 0Gx+tQf9HDBDLRVl7P07Du15kl3+IGaOfgj9kaeB6iX937OsYZfoAHG0OnIYp+p1 w83dQ5xeZmwhPVEvNx3Kg6JzpRA3mef2Yt0TiFJ3GBsdL7MMvNJzLD5XniI4DwbA hTnARKAc4RMznnYHJXDvleT1VMemJDeGp2gxwLOTX7VJQ8kHtOUwvIQ4m4p/xQmw CRepOLhJrMQCQO51/fdWUxDfL3KAG/qUG7J6aGskjpftR6nZjNTYaGcj5QSvRO8C IMc8UiRCcCnwhr6iN8XvTTsEKRTWV4k2Jn+r3DYjrFlsAZE4r/o9x7isAqIdiKsJ 0/9obqTxw6FqWf+koI5Z7T6aqRmnSg== =0iCm -----END PGP SIGNATURE----- --Sig_/BzRp6QoQu6qcixc9NvWUnLH--