| Message ID | 20231031131954.3310725-4-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | CHANGELOG: More 4.18 content | expand |
Hi, On 31/10/2023 13:19, Andrew Cooper wrote: > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Henry already provided a similar patch [1]. The only reason it is not yet committed is because we haven't yet set a final date for 4.18 and I want to avoid any clash when that patch will appear. Cheers, [1] 20231023092123.1756426-5-Henry.Wang@arm.com > --- > CC: George Dunlap <George.Dunlap@eu.citrix.com> > CC: Jan Beulich <JBeulich@suse.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Wei Liu <wl@xen.org> > CC: Julien Grall <julien@xen.org> > CC: Roger Pau Monné <roger.pau@citrix.com> > CC: Henry Wang <Henry.Wang@arm.com> > --- > CHANGELOG.md | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/CHANGELOG.md b/CHANGELOG.md > index a827054cf27d..cf0c9c3f8cb9 100644 > --- a/CHANGELOG.md > +++ b/CHANGELOG.md > @@ -4,6 +4,8 @@ Notable changes to Xen will be documented in this file. > > The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) > > +## [unstable UNRELEASED](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD > + > ## [4.18.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.0) - 2023-XX-XX > > ### Changed
On 31/10/2023 1:31 pm, Julien Grall wrote: > Hi, > > On 31/10/2023 13:19, Andrew Cooper wrote: >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > > Henry already provided a similar patch [1]. The only reason it is not > yet committed is because we haven't yet set a final date for 4.18 and > I want to avoid any clash when that patch will appear. > > Cheers, > > [1] 20231023092123.1756426-5-Henry.Wang@arm.com This section should not have been deleted in d9f07b06cfc9. It's fine to have an unstable section before the 4.18 date is confirmed, and the section must exist before staging is re-opened for 4.19 content. I don't mind which of these two patches gets committed, but one of them is getting committed today ahead of staging re-opening. Part of branching ought to ensure that this section exists. Henry, your choice. ~Andrew
On 31/10/2023 13:38, Andrew Cooper wrote: > On 31/10/2023 1:31 pm, Julien Grall wrote: >> Hi, >> >> On 31/10/2023 13:19, Andrew Cooper wrote: >>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> >> >> Henry already provided a similar patch [1]. The only reason it is not >> yet committed is because we haven't yet set a final date for 4.18 and >> I want to avoid any clash when that patch will appear. >> >> Cheers, >> >> [1] 20231023092123.1756426-5-Henry.Wang@arm.com > > This section should not have been deleted in d9f07b06cfc9. Why? This has always been our process. We should not ship 4.18 with the UNSTABLE section. So it was correct to delete it in d9f07b06cfc9. > > It's fine to have an unstable section before the 4.18 date is confirmed, > and the section must exist before staging is re-opened for 4.19 content. I disagree. 4.19 will not be fully re-open until we finally release. So I wouldn't expect any new features to be merged. > > I don't mind which of these two patches gets committed, but one of them > is getting committed today ahead of staging re-opening. Part of > branching ought to ensure that this section exists. If you want to go down that route, then please update the docs/process/branching-checklist.txt. Otherwise, I will continue to do as I did previously. Cheers,
On 31/10/2023 1:45 pm, Julien Grall wrote: > If you want to go down that route, then please update the > docs/process/branching-checklist.txt. Otherwise, I will continue to do > as I did previously. It *is* in the checklist, and for all previous releases even 4.17, the staging section was opened at the time of branching. The thing that is different between 4.17 and previously is that 4.17 called it "unstable" where previously (and in the checklist) it says to make the new section match the updated Xen major/minor number. ~Andrew
Hi Julien, Andrew, > On Oct 31, 2023, at 21:45, Julien Grall <julien@xen.org> wrote: > On 31/10/2023 13:38, Andrew Cooper wrote: >> On 31/10/2023 1:31 pm, Julien Grall wrote: >>> Hi, >>> >>> On 31/10/2023 13:19, Andrew Cooper wrote: >>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> >>> >>> Henry already provided a similar patch [1]. The only reason it is not >>> yet committed is because we haven't yet set a final date for 4.18 and >>> I want to avoid any clash when that patch will appear. >>> >>> Cheers, >>> >>> [1] 20231023092123.1756426-5-Henry.Wang@arm.com >> This section should not have been deleted in d9f07b06cfc9. > > Why? This has always been our process. We should not ship 4.18 with the UNSTABLE section. So it was correct to delete it in d9f07b06cfc9. I agree with Julien on this. removing the “unstable” section is the tradition that we had previously, see below (I am using github link for a easier finding of history commits): - [1] for 4.15 - [2] for 4.16 - [3] for 4.17 I am not sure there is any specific reason for changing the existing process. The other two patches in this series looks good and I’ve acked both of them. Thanks for taking care of it. [1] https://github.com/xen-project/xen/commit/b8eaedbb51e8e51808728d7de392d3e9117fdece [2] https://github.com/xen-project/xen/commit/eef266eb770128db0d5258009b744f0e0c31c9bd [3] https://github.com/xen-project/xen/commit/0829a2f3fcaba9233dfdce9a8cee9d126a51bd4d Kind regards, Henry
On 31/10/2023 14:06, Andrew Cooper wrote: > On 31/10/2023 1:45 pm, Julien Grall wrote: >> If you want to go down that route, then please update the >> docs/process/branching-checklist.txt. Otherwise, I will continue to do >> as I did previously. > > It *is* in the checklist, and for all previous releases even 4.17, the > staging section was opened at the time of branching. It doesn't tell me when it has to be done. The difference with 4.17 is we don't yet have a date for the release. Hence why I delayed. > > The thing that is different between 4.17 and previously is that 4.17 > called it "unstable" where previously (and in the checklist) it says to > make the new section match the updated Xen major/minor number. I still don't see the problem of delaying the CHANGELOG as I decided to do. If you are not happy with it, how about you take over the release technician process? It is already complex enough that I don't need someone else to tell me exactly how I should do it. Cheers,
Hi both, > On Oct 31, 2023, at 22:19, Julien Grall <julien@xen.org> wrote: > On 31/10/2023 14:06, Andrew Cooper wrote: >> On 31/10/2023 1:45 pm, Julien Grall wrote: >>> If you want to go down that route, then please update the >>> docs/process/branching-checklist.txt. Otherwise, I will continue to do >>> as I did previously. >> It *is* in the checklist, and for all previous releases even 4.17, the >> staging section was opened at the time of branching. > > It doesn't tell me when it has to be done. The difference with 4.17 is we don't yet have a date for the release. Hence why I delayed. I’ve sent the updated [1] out, hopefully this will make both of you happy (Still I am thinking both of you are actually mentioning the same thing, i.e. starting a new unstable section after the branching). [1] https://lore.kernel.org/xen-devel/20231031144925.2416266-1-Henry.Wang@arm.com/ Kind regards, Henry
diff --git a/CHANGELOG.md b/CHANGELOG.md index a827054cf27d..cf0c9c3f8cb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [unstable UNRELEASED](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD + ## [4.18.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.0) - 2023-XX-XX ### Changed
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: George Dunlap <George.Dunlap@eu.citrix.com> CC: Jan Beulich <JBeulich@suse.com> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Wei Liu <wl@xen.org> CC: Julien Grall <julien@xen.org> CC: Roger Pau Monné <roger.pau@citrix.com> CC: Henry Wang <Henry.Wang@arm.com> --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+)