Received-SPF: pass (google.com: domain of linux-kernel+bounces-36738-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Subject: Re: linux-next: manual merge of the bpf-next tree with the mm tree
To: Andrew Morton <akpm@linux-foundation.org>,
 Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
 Alexei Starovoitov <ast@kernel.org>, Andrii Nakryiko <andrii@kernel.org>,
 bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 Nathan Chancellor <nathan@kernel.org>
References: <20240124121605.1c4cc5bc@canb.auug.org.au>
 <CAADnVQKBCpkwx1HVaNy1wmHqVrekgkd4LEZm9UzqOkOBniTOyw@mail.gmail.com>
 <20240124001808.bfff657f089afe10e5b0824c@linux-foundation.org>
From: Daniel Borkmann <daniel@iogearbox.net>
Message-ID: <8cd3a7f4-db72-dc8f-581c-40d115562c55@iogearbox.net>
Date: Wed, 24 Jan 2024 10:46:34 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.7.2
Precedence: bulk
MIME-Version: 1.0
In-Reply-To: <20240124001808.bfff657f089afe10e5b0824c@linux-foundation.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit

On 1/24/24 9:18 AM, Andrew Morton wrote:
> On Tue, 23 Jan 2024 17:18:55 -0800 Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote:
> 
>>> Today's linux-next merge of the bpf-next tree got a conflict in:
>>>
>>>    tools/testing/selftests/bpf/README.rst
>>>
>>> between commit:
>>>
>>>    0d57063bef1b ("selftests/bpf: update LLVM Phabricator links")
>>>
>>> from the mm-nonmm-unstable branch of the mm tree and commit:
>>>
>>>    f067074bafd5 ("selftests/bpf: Update LLVM Phabricator links")
>>>
>>> from the bpf-next tree.
>>
>> Andrew,
>> please drop the bpf related commit from your tree.
> 
> um, please don't cherry-pick a single patch from a multi-patch series
> which I have already applied.

The BPF one was actually a stand-alone patch targetted at bpf-next:

https://lore.kernel.org/bpf/20240111-bpf-update-llvm-phabricator-links-v2-1-9a7ae976bd64@kernel.org/