Received-SPF: pass (google.com: domain of linux-kernel+bounces-4364-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <e5bd5748-5e4c-432b-be04-ac763c5412b6@linuxfoundation.org>
Date: Mon, 18 Dec 2023 13:41:03 -0700
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: manual merge of the kunit-next tree with Linus' tree
Content-Language: en-US
To: Stephen Rothwell <sfr@canb.auug.org.au>,
 Brendan Higgins <brendanhiggins@google.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 Michal Wajdeczko <michal.wajdeczko@intel.com>, Rae Moar <rmoar@google.com>,
 Shuah Khan <skhan@linuxfoundation.org>
References: <20231218154521.2394ed2c@canb.auug.org.au>
From: Shuah Khan <skhan@linuxfoundation.org>
In-Reply-To: <20231218154521.2394ed2c@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

On 12/17/23 21:45, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kunit-next tree got a conflict in:
> 
>    lib/kunit/test.c
> 
> between commit:
> 
>    2e3c94aed51e ("kunit: Reset suite counter right before running tests")
> 
> from Linus' tree and commit:
> 
>    6d696c4695c5 ("kunit: add ability to run tests after boot using debugfs")
> 
> from the kunit-next tree.
> 

Thank you Stephen. It is fixed now.

thanks,
-- Shuah