From patchwork Thu Feb 13 04:19:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13972814 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 01BD435949; Thu, 13 Feb 2025 04:19:31 +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=1739420375; cv=none; b=p0hI+/AZk3ajNMGWxH8vOLIaSqHlaRzqPvpbYbGFEqzkUZbIuc4dCBTMgCP1g8nl46Q9efPJFVL5nc6axHzXEf+l6YJZHjZxaLWeoNJ3IOzaw1P/GyKdHP2sz1M7ouLnWrS+cnEEmTTI51hRipgkf/M6doU8/CHHCv4osSb2ffk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739420375; c=relaxed/simple; bh=6HfRT/fnO/W8aeu78ZrIL+G349ObINelVdicx7iZ7qE=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=Tva8lkMoxZEyYQCBozWnD4G2e/VDs46IF5aa0IYORhiIFN3z4fv9UrguzwvSTaEkKadpk9qIgoYSFYACziBEPFKLzILL9FWzMsjz/7mcQyHlQR8zwIEz09c6pLS95O3gCYaMNAho0u7GiZa1f2VFgBkbyGOjwqctKzeCD+wbQKQ= 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=U6TQcmoS; 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="U6TQcmoS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1739420369; bh=2Ks13A/3NIuV2yBdwTh76NLt4bg5sihP3Ssn+/waTtM=; h=Date:From:To:Cc:Subject:From; b=U6TQcmoSAld8SCykcX+u1e38eyNHTQmzBknpoAie3cZ9ublmfy1frTWKt+7Vu8Ui1 pM749Qa45osqm3//mVNXti50q041Kovloa9Y5L0MH1Mj6oEarBqk7DVEnPV1nKpmBa tB/U1f56qOXF1s7CHbdXLAtlHaE6r3cMjAOZXiRvRK1ei8LEyi5kRxJ+pd/ilz8BYl qK4sjfcdJYkI0S3h2m/dpj7oUN0sT3vZ5VIH5Hpa0uuElnXz8/BBhNks4yHzcybgA9 45IXGOjkBJbNo/ftqTcy6t6J/C805SfADEehJts7v3Bcn01yijfI7Vooa8mK8T2IAI RIRHzhOCRgYHw== 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 4Ythlh4Knyz4x2J; Thu, 13 Feb 2025 15:19:28 +1100 (AEDT) Date: Thu, 13 Feb 2025 15:19:27 +1100 From: Stephen Rothwell To: Kees Cook , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Linux Kernel Mailing List , Linux Next Mailing List , Tamir Duberstein Subject: linux-next: manual merge of the kspp tree with the net-next tree Message-ID: <20250213151927.1674562e@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 kspp tree got a conflict in: lib/Makefile between commit: b341f6fd45ab ("blackhole_dev: convert self-test to KUnit") from the net-next tree and commit: db6fe4d61ece ("lib: Move KUnit tests into tests/ subdirectory") from the kspp tree. I fixed it up (I used the latter version of this file and applied the following merge fix patch) 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. From: Stephen Rothwell Date: Thu, 13 Feb 2025 14:50:27 +1100 Subject: [PATCH] fix up for "lib: Move KUnit tests into tests/ subdirectory" interacting with commit b341f6fd45ab ("blackhole_dev: convert self-test to KUnit") from the net-next tree. Signed-off-by: Stephen Rothwell --- lib/tests/Makefile | 1 + lib/{ => tests}/blackhole_dev_kunit.c | 0 2 files changed, 1 insertion(+) rename lib/{ => tests}/blackhole_dev_kunit.c (100%) diff --git a/lib/tests/Makefile b/lib/tests/Makefile index 8696d778d92f..8961fbcff7a4 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -6,6 +6,7 @@ CFLAGS_bitfield_kunit.o := $(DISABLE_STRUCTLEAK_PLUGIN) obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o obj-$(CONFIG_BITS_TEST) += test_bits.o +obj-$(CONFIG_BLACKHOLE_DEV_KUNIT_TEST) += blackhole_dev_kunit.o obj-$(CONFIG_CHECKSUM_KUNIT) += checksum_kunit.o obj-$(CONFIG_CMDLINE_KUNIT_TEST) += cmdline_kunit.o obj-$(CONFIG_CPUMASK_KUNIT_TEST) += cpumask_kunit.o diff --git a/lib/blackhole_dev_kunit.c b/lib/tests/blackhole_dev_kunit.c similarity index 100% rename from lib/blackhole_dev_kunit.c rename to lib/tests/blackhole_dev_kunit.c