From patchwork Mon Dec 18 04:45:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 180136 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1028408dyi; Sun, 17 Dec 2023 20:45:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHH15+LQy2M///MZh3DfFcDGNmgj2I6P8jNMR9zKld5Ntwd7UcEC7EtlBbiM4n8oKd/q46p X-Received: by 2002:a50:ccdd:0:b0:553:5077:213c with SMTP id b29-20020a50ccdd000000b005535077213cmr380181edj.71.1702874744128; Sun, 17 Dec 2023 20:45:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702874744; cv=none; d=google.com; s=arc-20160816; b=PtBPF/RIzVLfm3OdZeZlxF9NEDOz0SNp0EnI0Da0I4xG9t/vijhU1dCDzVT0m5qIwM fSGn5pI4I+JmAw0+gufDmfOr60eKCtvOwi4tCz6YXxSb0tpxm40XY06/y98Ec4YJpUQR SpwLa+v4CBs+sr8fL5hMr77Rz9nWzjGU1oEkkurNSeH10gpf+aXKm1Qp5oZJ67Umtz0Y CheasO/j/sf3OmRI08Ho7ukdis5FeyWDctauQ3tLJ3gWU2e5sWhbx1o6A/fimkPvfTCf h4dClL184KX9sFp0ldXzaDCsDu5xb4Vb2bf2E2p1r94cd0Y2/aDpo38fCxX0whYpdJ+h 7T7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=ZXB6ZFNDe3ozZs3/77x3SEORE0DodjB1qFk+2S8Q/yQ=; fh=8b35riDmCzdl5+MivkTUuQPKLuzCe2Vs5uF8NBkg0DY=; b=yZp1V7vT2dN79qDQP1GEXs4ouUqx8l4LsvYsoZE00JCva10bS1kKnTxtBrO9UEN96E aBU1PlLz7gp9FvmqYBnNScE2Y1zQQM2T+n5IsBiSpVTrOQQUx2nxu1mtc1jbthJfDiAF ZKa3Mj61U7uVvT0IQZwtyjTuY91R6EZNIPcuWd1C+b9V9vwfJyfAXlzaybUXDIqc8RMN PrKrE0o2l+DFuiB03SR1axxJJF9YFGpslPzVtJFm2YGUMGRDtSK/Ue+88QCL/yvlgv6g 104xc+3S8Yr98QJl0Ns+JUizB6+w1EiRpssfRpgn9we7+AJyoTU8sCcqIkD+aoGkBfmM HD4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=tBbXiqYO; spf=pass (google.com: domain of linux-kernel+bounces-2995-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2995-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id n25-20020a5099d9000000b0055338ce8e90si868001edb.610.2023.12.17.20.45.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 20:45:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-2995-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=tBbXiqYO; spf=pass (google.com: domain of linux-kernel+bounces-2995-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2995-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B9BFA1F2153B for ; Mon, 18 Dec 2023 04:45:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 949F68477; Mon, 18 Dec 2023 04:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="tBbXiqYO" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6714479C0; Mon, 18 Dec 2023 04:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702874722; bh=ZXB6ZFNDe3ozZs3/77x3SEORE0DodjB1qFk+2S8Q/yQ=; h=Date:From:To:Cc:Subject:From; b=tBbXiqYOBeKWtzw+O+tG1vINmSfIyLCknz+OApbqSrsFqywrUjYeHMIjgCKlDUO6Q q+MNphtZy6ee+3ROqfPu1L2hCuWLzFFuwMzjX9zvCEN2tcNic8ptuxd9MSsc32p7cM xTCrZ1Eltfwg2y4x2R1Rfj0NSl7wbBB2JgrHFQZgwC1/PpMBDxFpxNzbQjmmkG6511 A33pw27eMKrwnDluq/niZkCRivsNyXIVzuvgqk/2Ujbcagj0ksw63XNWX6HY2hj/dx qgkyJ72XtDmoiBQd98xDzrFzgk24jIuzbmnSkiYFvYANDrqa1jth4c9ILZGKsc5ure ybQfhdwW9xIug== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4StnLp30zHz4xM2; Mon, 18 Dec 2023 15:45:22 +1100 (AEDT) Date: Mon, 18 Dec 2023 15:45:21 +1100 From: Stephen Rothwell To: Shuah Khan , Brendan Higgins Cc: Linux Kernel Mailing List , Linux Next Mailing List , Michal Wajdeczko , Rae Moar Subject: linux-next: manual merge of the kunit-next tree with Linus' tree Message-ID: <20231218154521.2394ed2c@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785593587701783041 X-GMAIL-MSGID: 1785593587701783041 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. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc lib/kunit/test.c index 7aceb07a1af9,e803d998e855..000000000000 --- a/lib/kunit/test.c