On Thu, Dec 2, 2021 at 9:18 PM Maxime Coquelin <[email protected]> wrote: > > Hi Christian, > > On 12/2/21 14:45, Christian Ehrhardt wrote: > > On Tue, Nov 30, 2021 at 5:56 PM <[email protected]> wrote: > >> > >> Hi commit authors (and maintainers), > >> > >> Despite being selected by the DPDK maintenance tool > >> ./devtools/git-log-fixes.sh > >> I didn't apply following commits from DPDK main to 19.11 > >> stable branch, as conflicts or build errors occur. > >> > >> Can authors check your patches in the following list and either: > >> - Backport your patches to the 19.11 branch, or > >> - Indicate that the patch should not be backported > >> > >> Please do either of the above by December the 14th 2021 (More time than > >> usual as backports get harder). > > > > Sorry, but to meet some deadlines by test/verification I need to reduce the > > time for backports to make it into -rc1 to the 9th of December. > > > > That still is 7 days out from now and still longer than usual. > > > > > >> You can find the a temporary work-in-progress branch of the coming 19.11.11 > >> release at: > >> https://github.com/cpaelzer/dpdk-stable-queue > >> It is recommended to backport on top of that to minimize further conflicts > >> or > >> misunderstandings. > >> > >> Some notes on stable backports: > >> > >> A backport should contain a reference to the DPDK main branch commit > >> in it's commit message in the following fashion: > >> [ upstream commit <commit's dpdk main branch SHA-1 checksum> ] > >> > >> For example: > >> > >> https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb > >> > >> When sending the backported patch, please indicate the target branch in the > >> subject line, as we have multiple branches, for example: > >> [PATCH 19.11] foo/bar: fix baz > >> > >> With git format-patch, this can be achieved by appending the parameter: > >> --subject-prefix='PATCH 19.11' > >> > >> Send the backported patch to "[email protected]" but not "[email protected]". > >> > >> FYI, branch 19.11 is located at tree: > >> https://git.dpdk.org/dpdk-stable > >> > >> Thanks. > >> > >> Christian Ehrhardt <[email protected]> > >> > >> --- > >> > > ... > > >> b72099be7f David Marchand net/virtio-user: fix init when using existing > >> tap > This commit should not be backported.
Hi Maxime, thanks for the info. > We deliberately omitted adding the Fixes tag and Cc'ing [email protected] > so that it is not automatically backported. The tooling by default also picks up anything that has "fix" in the subject. But I start realizing that nowadays the community is much better at properly using "Fixes:" and "stable@". And OTOH explaining the same to David just a few minutes ago makes me feel that we should probably remove those kind of patches from the automatic candidate list. > Regards, > Maxime > -- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd
