Skip to contentSkip to conversation

Populate entries for 4.17

PATCH Superseded Henry Wang 3 participants 13 messages Nov 22, 2022 – Nov 23, 2022

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Henry Wang

author
#0 lore raw

v3 cover Populate entries for 4.17

Hello,

The following changes are preparation work for the 4.17 release. Also collecting the changelog changes happened during the 4.17 dev phase. This is my first pass at the log for the release, it's likely missing more entries.

I'm Ccing all maintainers in this cover letter and also in patch #1 for further feedback on missing items.

Thanks,
Henry

v2 -> v3:
- Move the uncertain release date to patch #3.
- Remove the "on x86" for __ro_after_init, as Arm also supports the __ro_after_init.
- Take the opportunity in patch #3 to also adjust the 4.17 entry since this patch will be applied only after branching.
v1 -> v2:
- Pick other changelog patches happened during the 4.17 dev phase.
- Correct wording for two x86 entries (clock frequency calibration and SPR & ADL support) following Jan's suggestion.
- Add missing Arm entries from Oleksandr.
- Add missing i.MX entry following Stefano's suggestion.

Andrew Cooper (1):
Changelog: Add __ro_after_init and CET

Henry Wang (2):
CHANGELOG: Add missing entries for work during the 4.17 release
CHANGELOG: Start new "unstable" section

 CHANGELOG.md | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v3 1/3 CHANGELOG: Add missing entries for work during the 4.17 release

---
v2 -> v3:
- Move the uncertain release date to patch #3.
v1 -> v2:
- Correct wording for two x86 entries (clock frequency calibration and SPR & ADL support) following Jan's suggestion.
- Add missing Arm entries from Oleksandr.
- Add missing i.MX entry following Stefano's suggestion.

---
 CHANGELOG.md | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
CHANGELOG.md +30 -2
index adbbb216fa..c593081aaf 100644
@@ -4,16 +4,44 @@ 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.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
+## [4.17.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging)
 
 ### Changed
  - On x86 "vga=current" can now be used together with GrUB2's gfxpayload setting. Note that
    this requires use of "multiboot2" (and "module2") as the GrUB commands loading Xen.
+ - The "gnttab" option now has a new command line sub-option for disabling the
+   GNTTABOP_transfer functionality.
+ - The x86 MCE command line option info is now updated.
 
 ### Added / support upgraded
+ - Out-of-tree builds for the hypervisor now supported.
+ - The project has officially adopted 4 directives and 24 rules of MISRA-C,
+   added MISRA-C checker build integration, and defined how to document
+   deviations.
  - IOMMU superpage support on x86, affecting PV guests as well as HVM/PVH ones
    when they don't share page tables with the CPU (HAP / EPT / NPT).
- - Support VIRT_SSBD feature for HVM guests on AMD.
+ - Support VIRT_SSBD feature for HVM guests on AMD and MSR_SPEC_CTRL feature for
+   SVM guests.
+ - Improved TSC, CPU, and APIC clock frequency calibration on x86.
+ - Add mwait-idle support for SPR and ADL on x86.
+ - Extend security support for hosts to 12 TiB of memory on x86.
+ - Add command line option to set cpuid parameters for dom0 at boot time on x86.
+ - Improved static configuration options on Arm.
+ - cpupools can be specified at boot using device tree on Arm.
+ - It is possible to use PV drivers with dom0less guests, allowing statically
+   booted dom0less guests with PV devices.
+ - On Arm, p2m structures are now allocated out of a pool of memory set aside at
+   domain creation.
+ - Improved mitigations against Spectre-BHB on Arm.
+ - Support VirtIO-MMIO devices in toolstack on Arm.
+ - Allow setting the number of CPUs to activate at runtime from command line
+   option on Arm.
+ - Grant-table support on Arm was improved and hardened by implementing
+   "simplified M2P-like approach for the xenheap pages"
+ - Add Renesas R-Car Gen4 IPMMU-VMSA support on Arm.
+ - Add i.MX lpuart and i.MX8QM initial support on Arm.
+ - Improved toolstack build system.
+ - Add Xue - console over USB 3 Debug Capability.
 
 ### Removed / support downgraded
  - dropped support for the (x86-only) "vesa-mtrr" and "vesa-remap" command line options
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH v3 1/3] CHANGELOG: Add missing entries for work during the 4.17 release

(Reducing the CC-list)

Hi,

Quoted 31 lines · Henry Wang

---
v2 -> v3:
- Move the uncertain release date to patch #3.
v1 -> v2:
- Correct wording for two x86 entries (clock frequency calibration and SPR & ADL support) following Jan's suggestion.
- Add missing Arm entries from Oleksandr.
- Add missing i.MX entry following Stefano's suggestion.

---
  CHANGELOG.md | 32 ++++++++++++++++++++++++++++++--
  1 file changed, 30 insertions(+), 2 deletions(-)
CHANGELOG.md +4 -1
index adbbb216fa..c593081aaf 100644
@@ -4,16 +4,44 @@ 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.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
+## [4.17.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging)
 
  ### Changed
   - On x86 "vga=current" can now be used together with GrUB2's gfxpayload setting. Note that
     this requires use of "multiboot2" (and "module2") as the GrUB commands loading Xen.
+ - The "gnttab" option now has a new command line sub-option for disabling the
+   GNTTABOP_transfer functionality.
+ - The x86 MCE command line option info is now updated.
 

CHANGELOG.md Notable changes to Xen will be documented in this file. · line 24

Quoted 10 lines
CHANGELOG.md +6 -1
  ### Added / support upgraded
+ - Out-of-tree builds for the hypervisor now supported.
+ - The project has officially adopted 4 directives and 24 rules of MISRA-C,
+   added MISRA-C checker build integration, and defined how to document
+   deviations.
   - IOMMU superpage support on x86, affecting PV guests as well as HVM/PVH ones
     when they don't share page tables with the CPU (HAP / EPT / NPT).
- - Support VIRT_SSBD feature for HVM guests on AMD.
+ - Support VIRT_SSBD feature for HVM guests on AMD and MSR_SPEC_CTRL feature for
+   SVM guests.

Did you really intend to write "SVM" rather than HVM? If yes, then to me "HVM guests on AMD" means the same as "SVM guests".

So I would suggest the following wording:

Support for VIRT_SSBD and MSR_SPEC_CTRL for HVM guests on AMD.

CHANGELOG.md Notable changes to Xen will be documented in this file. · line 36

Quoted 12 lines
CHANGELOG.md +12 -0
+ - Improved TSC, CPU, and APIC clock frequency calibration on x86.
+ - Add mwait-idle support for SPR and ADL on x86.
+ - Extend security support for hosts to 12 TiB of memory on x86.
+ - Add command line option to set cpuid parameters for dom0 at boot time on x86.
+ - Improved static configuration options on Arm.
+ - cpupools can be specified at boot using device tree on Arm.
+ - It is possible to use PV drivers with dom0less guests, allowing statically
+   booted dom0less guests with PV devices.
+ - On Arm, p2m structures are now allocated out of a pool of memory set aside at
+   domain creation.
+ - Improved mitigations against Spectre-BHB on Arm.
+ - Support VirtIO-MMIO devices in toolstack on Arm.

I would clarify that this is *only* creating the device-tree binding. IOW, there are no support for ACPI nor device-emulator (still in progress from Xen Project PoV).

CHANGELOG.md Notable changes to Xen will be documented in this file. · line 42

Quoted 6 lines
CHANGELOG.md +6 -0
+ - Allow setting the number of CPUs to activate at runtime from command line
+   option on Arm.
+ - Grant-table support on Arm was improved and hardened by implementing
+   "simplified M2P-like approach for the xenheap pages"
+ - Add Renesas R-Car Gen4 IPMMU-VMSA support on Arm.
+ - Add i.MX lpuart and i.MX8QM initial support on Arm.

I was under the impression that the code that was merged is enough to support the platform. Do you have any pointer where it says it is not sufficient?

CHANGELOG.md Notable changes to Xen will be documented in this file. · line 47

Quoted 5 lines
CHANGELOG.md +2 -0
+ - Improved toolstack build system.
+ - Add Xue - console over USB 3 Debug Capability.
 
  ### Removed / support downgraded
   - dropped support for the (x86-only) "vesa-mtrr" and "vesa-remap" command line options

Cheers,

Signature · 1 line
Julien Grall
author
#3 lore raw

RE: [PATCH v3 1/3] CHANGELOG: Add missing entries for work during the 4.17 release

Hi Julien,

Thanks for your review as always!

Quoted 6 lines

-----Original Message-----
From: Julien Grall <[email protected]>
Subject: Re: [PATCH v3 1/3] CHANGELOG: Add missing entries for work during the 4.17 release

(Reducing the CC-list)

Thanks, I will use this CC-list in v4.

Quoted 4 lines

Hi,

On 22/11/2022 11:26, Henry Wang wrote:

Quoted 8 lines
Quoted 3 lines

- - Support VIRT_SSBD feature for HVM guests on AMD.
+ - Support VIRT_SSBD feature for HVM guests on AMD and

MSR_SPEC_CTRL feature for

Quoted 1 line

+ SVM guests.

Did you really intend to write "SVM" rather than HVM? If yes, then to me "HVM guests on AMD" means the same as "SVM guests".

I am sorry about the confusion. I think the latter part of this sentence is just a direct copy of title in [1]. But by reading the content of that cover letter I think...

Quoted 4 lines

So I would suggest the following wording:

Support for VIRT_SSBD and MSR_SPEC_CTRL for HVM guests on AMD.

...this is correct. So I will use your suggested sentence in v4. Thanks.

Quoted 6 lines
Quoted 2 lines

+ - Support VirtIO-MMIO devices in toolstack on Arm.

I would clarify that this is *only* creating the device-tree binding. IOW, there are no support for ACPI nor device-emulator (still in progress from Xen Project PoV).

You are correct. I will change to:
"Support VirtIO-MMIO devices device-tree binding creation in toolstack on Arm"

Quoted 5 lines
Quoted 2 lines

+ - Allow setting the number of CPUs to activate at runtime from command

line

Quoted 2 lines

+ option on Arm.
+ - Grant-table support on Arm was improved and hardened by

Quoted 8 lines

implementing

Quoted 3 lines

+ "simplified M2P-like approach for the xenheap pages"
+ - Add Renesas R-Car Gen4 IPMMU-VMSA support on Arm.
+ - Add i.MX lpuart and i.MX8QM initial support on Arm.

I was under the impression that the code that was merged is enough to support the platform. Do you have any pointer where it says it is not sufficient?

Ah this is also directly from the title of [2], where it is only a "xen/arm: add i.MX lpuart and i.MX8QM initial support"

I would be more than happy to remove the "initial" if you think it is appropriate.

Quoted 7 lines
Quoted 6 lines

+ - Improved toolstack build system.
+ - Add Xue - console over USB 3 Debug Capability.

### Removed / support downgraded
- dropped support for the (x86-only) "vesa-mtrr" and "vesa-remap"

command line options

[1] https://lore.kernel.org/xen-devel/[email protected]/
[2] https://lore.kernel.org/xen-devel/[email protected]/

Kind regards,
Henry

Quoted 5 lines

Cheers,

--
Julien Grall

#4 lore raw

Re: [PATCH v3 1/3] CHANGELOG: Add missing entries for work during the 4.17 release

Quoted 1 line · Henry Wang

Hi Julien,

Hi Henry,

Quoted 61 lines

Thanks for your review as always!

Quoted 6 lines

-----Original Message-----
From: Julien Grall <[email protected]>
Subject: Re: [PATCH v3 1/3] CHANGELOG: Add missing entries for work during the 4.17 release

(Reducing the CC-list)

Thanks, I will use this CC-list in v4.

Quoted 4 lines

Hi,

On 22/11/2022 11:26, Henry Wang wrote:

Quoted 8 lines
Quoted 3 lines

- - Support VIRT_SSBD feature for HVM guests on AMD.
+ - Support VIRT_SSBD feature for HVM guests on AMD and

MSR_SPEC_CTRL feature for

Quoted 1 line

+ SVM guests.

Did you really intend to write "SVM" rather than HVM? If yes, then to me "HVM guests on AMD" means the same as "SVM guests".

I am sorry about the confusion. I think the latter part of this sentence is just a direct copy of title in [1]. But by reading the content of that cover letter I think...

Quoted 4 lines

So I would suggest the following wording:

Support for VIRT_SSBD and MSR_SPEC_CTRL for HVM guests on AMD.

...this is correct. So I will use your suggested sentence in v4. Thanks.

Quoted 6 lines
Quoted 2 lines

+ - Support VirtIO-MMIO devices in toolstack on Arm.

I would clarify that this is *only* creating the device-tree binding. IOW, there are no support for ACPI nor device-emulator (still in progress from Xen Project PoV).

You are correct. I will change to:
"Support VirtIO-MMIO devices device-tree binding creation in toolstack on Arm"

Quoted 5 lines
Quoted 2 lines

+ - Allow setting the number of CPUs to activate at runtime from command

line

Quoted 2 lines

+ option on Arm.
+ - Grant-table support on Arm was improved and hardened by

Quoted 8 lines

implementing

Quoted 3 lines

+ "simplified M2P-like approach for the xenheap pages"
+ - Add Renesas R-Car Gen4 IPMMU-VMSA support on Arm.
+ - Add i.MX lpuart and i.MX8QM initial support on Arm.

I was under the impression that the code that was merged is enough to support the platform. Do you have any pointer where it says it is not sufficient?

Quoted 5 lines

Ah this is also directly from the title of [2], where it is only a "xen/arm: add i.MX lpuart and i.MX8QM initial support"

I would be more than happy to remove the "initial" if you think it is appropriate.

I saw you already remove "initial" in v4 but I will still reply. On an earlier revision of the series I asked Peng if this was enough to boot Xen upstream on the platform and the answer was yes [3].

So I would assume that the basics work. Not sure about platform device passthrough.

Quoted 11 lines
Quoted 8 lines
Quoted 7 lines

+ - Improved toolstack build system.
+ - Add Xue - console over USB 3 Debug Capability.

### Removed / support downgraded
- dropped support for the (x86-only) "vesa-mtrr" and "vesa-remap"

command line options

[1] https://lore.kernel.org/xen-devel/[email protected]/
[2] https://lore.kernel.org/xen-devel/[email protected]/

[3] https://lore.kernel.org/xen-devel/DU0PR04MB9417B86346491B63442D234D88139@DU0PR04MB9417.eurprd04.prod.outlook.com/

Cheers,

Signature · 1 line
Julien Grall
author
#5 lore raw

RE: [PATCH v3 1/3] CHANGELOG: Add missing entries for work during the 4.17 release

Hi Julien,

Quoted 11 lines

-----Original Message-----
From: Julien Grall <[email protected]>
Subject: Re: [PATCH v3 1/3] CHANGELOG: Add missing entries for work during the 4.17 release

Quoted 7 lines
Quoted 3 lines

I was under the impression that the code that was merged is enough to support the platform. Do you have any pointer where it says it is not sufficient?

Ah this is also directly from the title of [2], where it is only a "xen/arm: add i.MX lpuart and i.MX8QM initial support"

Quoted 6 lines
Quoted 2 lines

I would be more than happy to remove the "initial" if you think it is appropriate.

I saw you already remove "initial" in v4 but I will still reply. On an earlier revision of the series I asked Peng if this was enough to boot Xen upstream on the platform and the answer was yes [3].

Great, then removing the "initial" definitely makes good sense. Thanks for confirming this.

Kind regards,
Henry

author
#6 lore raw

PATCH v3 2/3 Changelog: Add __ro_after_init and CET

In reply to Henry Wang

From: Andrew Cooper <[email protected]>

---
v2 -> v3:
- Remove the "on x86" for __ro_after_init, as Arm also supports the __ro_after_init.
v1 -> v2:
- Include this patch in the series

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)
CHANGELOG.md +4 -0
index c593081aaf..5ef507a49c 100644
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### Added / support upgraded
  - Out-of-tree builds for the hypervisor now supported.
+ - __ro_after_init support, for marking data as immutable after boot.
  - The project has officially adopted 4 directives and 24 rules of MISRA-C,
    added MISRA-C checker build integration, and defined how to document
    deviations.
@@ -23,6 +24,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
  - Support VIRT_SSBD feature for HVM guests on AMD and MSR_SPEC_CTRL feature for
    SVM guests.
  - Improved TSC, CPU, and APIC clock frequency calibration on x86.
+ - Support for Xen using x86 Control Flow Enforcement technology for its own
+   protection. Both Shadow Stacks (ROP protection) and Indirect Branch
+   Tracking (COP/JOP protection).
  - Add mwait-idle support for SPR and ADL on x86.
  - Extend security support for hosts to 12 TiB of memory on x86.
  - Add command line option to set cpuid parameters for dom0 at boot time on x86.
Signature · 1 line
2.25.1
#7 lore raw

Re: [PATCH v3 2/3] Changelog: Add __ro_after_init and CET

Hi Henry,

Quoted 3 lines · Henry Wang

From: Andrew Cooper <[email protected]>

Your signed-off-by is missing.

Quoted 32 lines

---
v2 -> v3:
- Remove the "on x86" for __ro_after_init, as Arm also supports the __ro_after_init. > v1 -> v2:
- Include this patch in the series

---
  CHANGELOG.md | 4 ++++
  1 file changed, 4 insertions(+)
CHANGELOG.md +4 -0
index c593081aaf..5ef507a49c 100644
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
  ### Added / support upgraded
   - Out-of-tree builds for the hypervisor now supported.
+ - __ro_after_init support, for marking data as immutable after boot.
   - The project has officially adopted 4 directives and 24 rules of MISRA-C,
     added MISRA-C checker build integration, and defined how to document
     deviations.
@@ -23,6 +24,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
   - Support VIRT_SSBD feature for HVM guests on AMD and MSR_SPEC_CTRL feature for
     SVM guests.
   - Improved TSC, CPU, and APIC clock frequency calibration on x86.
+ - Support for Xen using x86 Control Flow Enforcement technology for its own
+   protection. Both Shadow Stacks (ROP protection) and Indirect Branch
+   Tracking (COP/JOP protection).
   - Add mwait-idle support for SPR and ADL on x86.
   - Extend security support for hosts to 12 TiB of memory on x86.
   - Add command line option to set cpuid parameters for dom0 at boot time on x86.
Signature · 1 line
Julien Grall
author
#8 lore raw

RE: [PATCH v3 2/3] Changelog: Add __ro_after_init and CET

Hi Julien,

Quoted 4 lines

-----Original Message-----
From: Julien Grall <[email protected]>
Subject: Re: [PATCH v3 2/3] Changelog: Add __ro_after_init and CET

Quoted 8 lines

Hi Henry,

Quoted 3 lines · Henry Wang

From: Andrew Cooper <[email protected]>

Your signed-off-by is missing.

Sorry I completely forgot I need to add my own sign-off if I changed other people's patch. Will add in v4.

Kind regards,
Henry

author
#9 lore raw

PATCH v3 3/3 CHANGELOG: Start new "unstable" section

In reply to Henry Wang

---
v2 -> v3:
- Take the opportunity to also adjust the 4.17 entry since this patch will be applied only after branching.
- Add 4.17 release date.
- Drop Julien's Acked-by because of the change of the patch. v1 -> v2:
- Add Julien's Acked-by.

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
CHANGELOG.md +3 -1
index 5ef507a49c..e2fb1974d6 100644
@@ -4,7 +4,9 @@ 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/)
 
-## [4.17.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging)
+## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
+
+## [4.17.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.17.0) - 2022-12-??
 
 ### Changed
  - On x86 "vga=current" can now be used together with GrUB2's gfxpayload setting. Note that
Signature · 1 line
2.25.1
#10 lore raw

Re: [PATCH v3 3/3] CHANGELOG: Start new "unstable" section

Quoted 5 lines · Henry Wang

---
v2 -> v3:
- Take the opportunity to also adjust the 4.17 entry since this patch will be applied only after branching.

Does this means the date will not be updated in the CHANGELOG.md for 4.17?

Cheers,

Signature · 1 line
Julien Grall
author
#11 lore raw

RE: [PATCH v3 3/3] CHANGELOG: Start new "unstable" section

Hi Julien,

(+George since this is about the release date)

Quoted 11 lines

-----Original Message-----
From: Julien Grall <[email protected]>
Subject: Re: [PATCH v3 3/3] CHANGELOG: Start new "unstable" section

Quoted 5 lines · Henry Wang

---
v2 -> v3:
- Take the opportunity to also adjust the 4.17 entry since this patch will be applied only after branching.

Does this means the date will not be updated in the CHANGELOG.md for 4.17?

Again sorry for causing your confusion. But actually I am also confused after checking CHANGELOG in our previous releases, because none of them is precise...

So in 4.16 [1], the link of the release was not correct (I believe we fixed this), in 4.15 [2], the release date was TBD, and in 4.14 [3], the 4.14 entry was not created.

This makes me a little bit curious about what we are going to do this time, as you are the release technician, so I will follow your working style.

Either (1) We make a fixed date of release and commit the updated version of this patch with this fixed date and release tag before branching, then don't touch the CHANGELOG at all after, Or (2) We branch off later this month and update the CHANGELOG one or two days before the official release, works for me.

[1] https://xenbits.xen.org/gitweb/?p=xen.git;a=tag;h=refs/tags/RELEASE-4.16.0
[2] https://xenbits.xen.org/gitweb/?p=xen.git;a=tag;h=refs/tags/RELEASE-4.15.0
[3] https://xenbits.xen.org/gitweb/?p=xen.git;a=tag;h=refs/tags/RELEASE-4.14.0

Kind regards,
Henry

Quoted 5 lines

Cheers,

--
Julien Grall

#12 lore raw

Re: [PATCH v3 3/3] CHANGELOG: Start new "unstable" section

Quoted 20 lines · Henry Wang
Quoted 11 lines

-----Original Message-----
From: Julien Grall <[email protected]>
Subject: Re: [PATCH v3 3/3] CHANGELOG: Start new "unstable" section

Quoted 5 lines · Henry Wang

---
v2 -> v3:
- Take the opportunity to also adjust the 4.17 entry since this patch will be applied only after branching.

Does this means the date will not be updated in the CHANGELOG.md for 4.17?

Again sorry for causing your confusion. But actually I am also confused after checking CHANGELOG in our previous releases, because none of them is precise...

So in 4.16 [1], the link of the release was not correct (I believe we fixed this), in 4.15 [2], the release date was TBD, and in 4.14 [3], the 4.14 entry was not created.

Quoted 7 lines

This makes me a little bit curious about what we are going to do this time, as you are the release technician, so I will follow your working style.

Either (1) We make a fixed date of release and commit the updated version of this patch with this fixed date and release tag before branching, then don't touch the CHANGELOG at all after, Or (2) We branch off later this month and update the CHANGELOG one or two days before the official release, works for me.

Personally I think it should be the latter approach. Who know by how much more we're going to slip ...

Jan