On Wed, 14 Jun 2023 10:51:16 +0200 Matthieu Baerts wrote: > I added a note about the conflicts on the cover-letter: > > https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@xxxxxxxxxxxx/ > > Maybe it was not a good place? I didn't know where to put it as there > were multiple patches that were conflicting with each others even if the > major conflicts were between 47867f0a7e83 ("selftests: mptcp: join: skip > check if MIB counter not supported") and 0639fa230a21 ("selftests: > mptcp: add explicit check for new mibs"). I guess next time I should add > a comment referring to the cover-letter in the patches creating conflicts. Hm, yeah, I think the cover letter may not be the best way. Looks like Stephen didn't use it, anyway, and it confused patchwork. No better idea where to put it tho :( Maybe a link to a git rerere resolution uploaded somewhere we can wget from easily?
