From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta1.migadu.com (out-58.mta1.migadu.com [95.215.58.58]) (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 B24394AA02F for ; Thu, 24 Sep 2026 16:12:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.58 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790266335; cv=none; b=FF8ChcGRnZQMX40ys+Jy5xAQRqQSax3HM0hXqum547mLJkqyAWeVvcINTDeDCJfcO2QBB6Z2U1m4cyc/H7dAdhd1enYGGQbNOi/jpsp0zb9xuwYtsV1T/2EcHR3+GGWAQ3ga167nBQ1Y4WFjKGMqCmHdNyypUvM1brHc2ErrEfQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790266335; c=relaxed/simple; bh=Vea53w4EejSjq+kT9Ps3RZlh+GYWjMqH6GTQQitn++E=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HQIJpYxjBd455YE+WENTr45OaJjxGZO2ZG1aivi8NCjZQQO5mmOKLxb49xzEnpwJENmCAOBIWujIVYEMtUvZal3sQawKxeKeFWsVmBJI8LlvyJhUD3ziuUazdV9XWcEuRNKYZvlt/3cSRYxEfO6iSNl7WF+UV1ZAfMSbwMC6bDY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=KztvoK12; arc=none smtp.client-ip=95.215.58.58 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="KztvoK12" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=Vea53w4EejSjq+kT9Ps3RZlh+GYWjMqH6GTQQitn++E=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1790266330; v=1; x=1790871130; b=KztvoK12FtvhdHVC0pkBT/8I8EPf8DOBRnBqkfs+ROVJpnhL8mPmjT2MaKjPgROVcceJGKOP 8GjhpMYEX2KOuECLfGO0Fqwh53xH7r0IYBr3w9czNpWgBqaSJD2pyJhsSZBKyzUEmrUGnJckAXL nVgUu7U0zIt/8mrpurUrQIzs= X-Envelope-To: linux-kernel@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 08ef9eb8afe2fe83; Thu, 24 Sep 2026 16:12:10 +0000 X-Mizu-Trace-ID: 08ef9eb8afe2fe83 X-Migadu-Flow: FLOW_OUT Message-ID: Date: Thu, 24 Sep 2026 09:12:01 -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 bpf-next tree with the bpf tree To: Mark Brown , Kumar Kartikeya Dwivedi , Eduard Zingerman , Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , bpf , Networking Cc: Linux Kernel Mailing List , Linux Next Mailing List References: Content-Language: en-US From: Ihor Solodrai In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 9/24/26 5:39 AM, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the bpf-next tree got a conflict in: > > tools/testing/selftests/bpf/prog_tests/cb_refs.c > > between commit: > > 04ae4ffc57a6b ("selftests/bpf: Check callback map value lock identity") > > from the bpf tree and commit: > > 11300f54bd887 ("selftests/bpf: Refactor cb_refs selftests") > > from the bpf-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. > > (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.