From patchwork Wed Jan 8 03:40:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13930101 Received: from mail.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 4718F259490; Wed, 8 Jan 2025 03:40:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736307612; cv=none; b=IUm49E9Oxl7Wqka5+V+5iyPgxYoK1mPbBqplnfgNopBpmmdhfSK41sL1ic56w/eGZuYwjCYTaJGL3LDEUlNYkSqcP9UDOD2Q+sfbASUBunHnTtg9TTX+utz1UrBq5TEdwUIcTWe6PP2y+7t/DyVQYQ/zlSBSVz/ki8f9mQE93rg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736307612; c=relaxed/simple; bh=nJzJDPkFr1R0vofj0FUp576AUzuwlj76/G9iJKmKKks=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=EPSDqkfeWWLU9WGfwjkHfTBd43cw4BpGunbstKhAzGcEHTPkPVvybIaRS9u0kvDqk7RytVmM7mgv6IHNz+Hu4UKnFqBkE3kXNeva0hEy8qW8GfBk1fTxQSpyaOQ2lugzDLp+Bf+Zk4vJ6DLoUnxxawE3yeIbm1CWkI4dN/29GpY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=TKlLXD31; arc=none smtp.client-ip=150.107.74.76 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 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="TKlLXD31" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1736307598; bh=7czeec3KX/3LjHKBxMfcaje8wAQStBDWRZm0Q0beq4Q=; h=Date:From:To:Cc:Subject:From; b=TKlLXD31EE36elOk6GEGnZI7+uZojo7TNJDenzh/3bPqiC9aFmX/Vf1LnLoNhQEvx L+Djw0YOk5XfuHABwNqWDlC6pkGfMLb0rnEMMf/Upjee2RmVArJwiXy9jeZj+iAG5t GNTOY3rTflBdKKzyDEzn/IKlfHEnV72lZESeUXNFzwdPHaWely8SUk6sjFhOcnduve PgJ4gMKjHQeOor6GD74ELZ0gVY9rxpmbh5JgzdSV0OHow6zQ3E3EuRPhypZ89n+1+Q YLTTWVr3u1IXS0JRZkXwWPU+/HdOtIjjyCQNDz+lMyzpMgDB8U+Wt+vWev/rGqzD5v g3Pe4cW6tTYwA== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4YSYZj0dG9z4wvb; Wed, 8 Jan 2025 14:39:57 +1100 (AEDT) Date: Wed, 8 Jan 2025 14:40:03 +1100 From: Stephen Rothwell To: Shuah Khan , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Laura Nao , Linux Kernel Mailing List , Linux Next Mailing List , Shuah Khan , Willem de Bruijn Subject: linux-next: manual merge of the kselftest tree with the net-next tree Message-ID: <20250108144003.67532649@canb.auug.org.au> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the kselftest tree got a conflict in: tools/testing/selftests/kselftest/ktap_helpers.sh between commit: 912d6f669725 ("selftests/net: packetdrill: report benign debug flakes as xfail") from the net-next tree and commit: 279e9403c5bd ("selftests: Warn about skipped tests in result summary") from the kselftest 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 tools/testing/selftests/kselftest/ktap_helpers.sh index 05a461890671,531094d81f03..000000000000 --- a/tools/testing/selftests/kselftest/ktap_helpers.sh