From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx2-f41.google.com (mail-yx2-f41.google.com [74.125.224.169]) (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 A23DA3E168F for ; Thu, 24 Sep 2026 16:22:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790266951; cv=none; b=bzD3i6k285KAoeaYrdmBuZy/bfTb+WOzSrHRVUinnH0IDQThmTOYIdFLDNKE6TT7OwJ5w4tcV+RL5kFej4DExsEd7uIdCAQwpXXw5zeCMfldJSwLXF4D4TCQAEoZDVNCs/dGz/c9RJ+8ZG8/RVxm4Dy874GUWtAbFjaLQdnvz9w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790266951; c=relaxed/simple; bh=eFZ9P9S1QBRJHJr6dZQmKd+qYALkIC8DtqaHa/g1I0c=; h=Mime-Version:Content-Type:Date:Message-Id:Cc:Subject:From:To: References:In-Reply-To; b=ATtCQK3Re7t2OcpVF0FfmHz3N/op8PHgnGZ5t+RxGBul2j3HpcXEyj+b2vIYHc/nX6DMCkSrL82d0yNMe1rbeGUouDXQ3cI4bF0ny/GJ7eEwIzLE8SuaJw9WnJwTAhp8nslMQbq6SX5+6OeXX1AQjxltyni3J9hSQvPHlt3RtCY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WNWJPl+9; arc=none smtp.client-ip=74.125.224.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WNWJPl+9" Received: by mail-yx2-f41.google.com with SMTP id 00721157ae682-8a8288165fbso34497b3.0 for ; Thu, 24 Sep 2026 09:22:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790266948; x=1790871748; darn=vger.kernel.org; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-type:content-transfer-encoding:mime-version:from:to:cc :subject:date:message-id:reply-to:content-type; bh=i8/J+pxr/d/k38D5kAKE7gwMuHkeEk36qAmV1V7QTx0=; b=WNWJPl+9kSpzvM3tAkK3y8uW2TmbeZLfYkXkTYsb45DgkPrdzaCXYMRQ0RSJ2u8f0g 64PcxDIvrvg+MSvJBMasZEhWoShU2X0O+ruo0+ydmyHuAUsC2Wb1ga3LwKXcBga0JGjT k3r+mN0V20vR7zyWvtJ6SIHP4gNCspYdTtKg0Eydmb7An1mUFO/6VqtqT8riCHhL5GKy B6iUMlU9hebd/Jd8h7ogCrUXLjVbQ3OKdtiMHcQN1KISC/4ivCUsZFgfsJ1RUfUs3xHt ZROs5bkMt55zbV053xqee/LF17f/4/YBkB84NFfZnw0OQXk8YlCmX1/0wnQ1eRFLVZRu 9wfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790266948; x=1790871748; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-type:content-transfer-encoding:mime-version:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=i8/J+pxr/d/k38D5kAKE7gwMuHkeEk36qAmV1V7QTx0=; b=2vU6ZkBmQQlwMpXofXybFiPQc5LDi3XEghYwoUhVvb4tfdzGcPx0e0OccdghzzP+5R UxGCXKsfw5honhTQg11747u4i5sOQW/HmcO5ePZVQqMyrh5jkyqnHq0mL1ogLo8qLzPd K0+JqtA9RPvTDyFoy/I1JtlqtXP0XTyrKS1PtNPTtTfR6Y7y968qkpKKzKuDiCM+AKE7 D+PxGFvafo6dv8eeOTNap6Y5vmmEKTFz222xtafjY55CplX0Qqs0y5x9LaUHWROcIkGU rQnyYHclI1RaWplDKauCt/OZWM+lz1PRSN5ExOStv07XpCZ81k2c5qSGrbEDyELHBkDi 7FFg== X-Forwarded-Encrypted: i=1; AKwUvBxh7qyzwg5dQo7ZmYH1I71V7nHtVLLiXTS6x95tGRSDXqBbrdNiLIxIV+dHDx1wZBur1RyDorhJ9c6g@vger.kernel.org X-Gm-Message-State: AFuF++lnXZdagkmX6ZmZXNYleEJCO+HK+gBhDP5aSLDgVReg0eF0T18v O2YM4p7j47Es/1Adf6tJS581LJjPQcEDZjkjy5Po4ChYZs407LXrFQad X-Gm-Gg: AYBFou0om59JjB+RulyIpMmO1I5zXbvSBXDwwZWViPmn3y2CVoG8bk0eiqGUrFwNI8F WUmPXdT9tKNtFR/+/8UQItOeO4fbtT0BrReltSNsqdp77H0Hrj2bNtyRxqGsRDJC3HWtN6iVuhF TMX7qjl+ADxZs7PnJmIxO04TyOEUthYOrmdsfXRf9TSxoPYTkC31vY1/w9sM8bOZvsj7VIjGsVc kordmSEIWwQXTyLZbUfCHdpIe7wINfpdHfu+/nFdh2JvYojy8qvxt1UoVzl1oplt4iIAvafchDJ p/rVP6PoPCqZoPerhiBuECXgC71cBQ7EUhlAf2E23racF8F5uWRIOgj+7sZCZn/OoTxPMaNSYiJ KHJ2xou4h62voV8ryVPVgI30J6yWqVjBMzwsJ43auoluBSYYDJt7uNW0q3a2d9UZ1VAB6PdIfLu wBjsGKyD/PezV5Q5wh2SrkKaP+5ZM6bQ1YLHursi9Qyismv6QzQjmY00wwSQTtBg4DrPUkeTkgu ChA3OchgLeEYHym30YzJ76YyJJoQCeWULD4xRa8QOG28Wq35muT2HkW8JnFEyFaXc9aTnwJLpEk bFM= X-Received: by 2002:a05:690c:6607:b0:80c:8d09:3880 with SMTP id 00721157ae682-8a648ec365fmr21043007b3.15.1790266948251; Thu, 24 Sep 2026 09:22:28 -0700 (PDT) Received: from localhost ([153.61.198.248]) by smtp.gmail.com with ESMTPSA id 00721157ae682-8a6522ce69fsm10391847b3.27.2026.09.24.09.22.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Sep 2026 09:22:27 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Thu, 24 Sep 2026 16:22:25 +0000 Message-Id: Cc: "Linux Kernel Mailing List" , "Linux Next Mailing List" Subject: Re: linux-next: manual merge of the bpf-next tree with the bpf tree From: "Alexei Starovoitov" To: "Ihor Solodrai" , "Mark Brown" , "Kumar Kartikeya Dwivedi" , "Eduard Zingerman" , "Daniel Borkmann" , "Alexei Starovoitov" , "Andrii Nakryiko" , "bpf" , "Networking" X-Mailer: aerc 0.20.1-349-gb940a4174a3e-dirty References: In-Reply-To: On Thu Sep 24, 2026 at 4:12 PM UTC, Ihor Solodrai wrote: > On 9/24/26 5:39 AM, Mark Brown wrote: >> Hi all, >>=20 >> Today's linux-next merge of the bpf-next tree got a conflict in: >>=20 >> tools/testing/selftests/bpf/prog_tests/cb_refs.c >>=20 >> between commit: >>=20 >> 04ae4ffc57a6b ("selftests/bpf: Check callback map value lock identity"= ) >>=20 >> from the bpf tree and commit: >>=20 >> 11300f54bd887 ("selftests/bpf: Refactor cb_refs selftests") >>=20 >> from the bpf-next tree. >>=20 >> 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. >>=20 >> (deleted the file, which probably lost the test) > > Hi Mark. > > I submitted 11300f54bd887 ("selftests/bpf: Refactor cb_refs selftests") > yesterday to address a non-code conflict between bpf and bpf-next. A > test would start failing after bpf is merged into bpf-next. > > Deleting tools/testing/selftests/bpf/prog_tests/cb_refs.c is correct, > the tests were moved. > > Thank you for resolving this. +1 bpf tree was cross merged into bpf-next and all conflicts resolved. Next linux-next should be clean. fingers crossed.