Re: [PATCH mptcp-next] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock"

[Mat Martineau <mathew.j.martineau@linux.intel.com>]

On Sat, 14 May 2022, Matthieu Baerts wrote:

> Hi Mat, Geliang,
>
> On 11/05/2022 01:03, Mat Martineau wrote:
>> On Tue, 10 May 2022, Geliang Tang wrote:
>>
>>> Drop bpf_mptcp_helpers.h, squash into bpf_tcp_helpers.h (Andrii)
>
> Thank you for the patch!
>
>> Hi Geliang -
>>
>> Since there are 6 different commits touching bpf_mptcp_helpers.h, maybe
>> it would be easier for Matthieu if you posted the full patches for
>> "selftests/bpf: test bpf_skc_to_mptcp_sock" and all the bpf patches
>> after that, instead of squash changes / instructions?
>>
>> I'm not sure the instructions below translate well to topgit.
>
> Sorry for the late reply. In fact, I prefer to get squash-to patches
> instead of reworded patches where I need to find differences :-)
>

Noted, I should have spoken for myself :)

I was hoping you would not need to find any differences if the old patches 
were dropped in favor of a fresh import of the new ones, but I was 
making a lot of assumptions there.

> If there are conflicts, I'm usually fine with some explanations in the
> commit message. Here, the conflicts are easy to resolve: just move the
> content of one file to another one. For these conflicts, I don't even
> need the detailed instructions but that's always useful, just in case.
>
> If the conflicts are harder to resolve, sharing a Git branch on a public
> repo is an easy way for me to compare the resolution I did with the
> expected one.

I do agree this is the best thing to do in general.


--
Mat Martineau
Intel