From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 865D17206D for ; Mon, 18 Dec 2023 20:41:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="f8AI2Eok" Received: by mail-io1-f43.google.com with SMTP id ca18e2360f4ac-7b7cea31f44so20194939f.1 for ; Mon, 18 Dec 2023 12:41:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1702932064; x=1703536864; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=YC2ApcGCGW2qvE4CACJnSNbqSSoP/6ip8YOKi/ifCQU=; b=f8AI2EokwTzCVQhV8Ca/FQw8f0cRrntGm7QcfsnsYReFVlafZAcCYAURJOJc1krLY/ j5P/dIS2yy3BKeZpxe3nXCdZrknftTg1b1PaOjbXPHgGI466I2hqPrdNcA7fydy9WUbG pPZiTShYRrn2QNh319GFRu1Gs+Z3j7Tr1x1jI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702932064; x=1703536864; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YC2ApcGCGW2qvE4CACJnSNbqSSoP/6ip8YOKi/ifCQU=; b=R7f2Cgt3eBE/CgYhW+6DFQH3TMhesPmj5948Or3lBKWgiv7oEWAnfTRg7yR0QHtMlD RmM7urUDTUNF6YrHbPLdBs4vTZ/6OjCgoRxUc/BWhl30f6wfldADtu93gCfRwvD1yGSH n6Ldkrm71Ai3bjvdMBKJcSfcppPnYTWuN07UrGRdQixH4wkNfGzvAd77iGYMDfVYkCQ2 MCdDPyBOKFgo3bzKtk2wfjOKXElFIv6NEQTF6R6iFbyl18bz7Gj+/Uuhwu9r9nHZJzPF GGgWivBZiZ0BggCxRcLcLHgXatACMJcHsu4OwjmvnHuw5n6In98TPEbJ9ysGmoxPmG2h J59g== X-Gm-Message-State: AOJu0Yyg9x7oLWvlx/lX7Vsog8N6peed/rRRlnqaH06tEKBgQmDxcw2/ qoPle9DQbcqdQ0g9l5yNphSBWA== X-Google-Smtp-Source: AGHT+IEAxg8wQ3BT55l+ibiyWZRcTjVaSdclFylTnDELsS7wTXG4Npgb3NeFlj/URt6rkv4A7LnzZA== X-Received: by 2002:a05:6e02:1d05:b0:35d:5779:4a5 with SMTP id i5-20020a056e021d0500b0035d577904a5mr29174645ila.0.1702932063952; Mon, 18 Dec 2023 12:41:03 -0800 (PST) Received: from [192.168.1.128] ([38.175.170.29]) by smtp.gmail.com with ESMTPSA id bb15-20020a056e02000f00b0035d58d00b7bsm526194ilb.56.2023.12.18.12.41.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 Dec 2023 12:41:03 -0800 (PST) Message-ID: Date: Mon, 18 Dec 2023 13:41:03 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 , Brendan Higgins Cc: Linux Kernel Mailing List , Linux Next Mailing List , Michal Wajdeczko , Rae Moar , Shuah Khan References: <20231218154521.2394ed2c@canb.auug.org.au> From: Shuah Khan 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