On Tue, May 19, 2020 at 01:47:09PM -0000, GitLab Bridge on behalf of prarit wrote:
> From: Prarit Bhargava <prarit@xxxxxxxxxx>
>
> The internal make command 'make rh-brew'/'make dist-brew' is failing with
>
> Processing /home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-aarch64-debug-fedora.config ... Error: Mismatches found in configuration files
> Found CONFIG_FORCE_MAX_ZONEORDER=11 after generation, had CONFIG_FORCE_MAX_ZONEORDER=13 in Source tree
>
> ARK commit f5ca593e1c2e ("configs: Adjust CONFIG_FORCE_MAX_ZONEORDER for
> Fedora") set this to 11, and follow-on ARK commit dd028d261347 ("[redhat]
> Sync up ARK's Fedora config tree with Fedora's dist-git") erroneously
> overwrote the value back to 13.
>
> Set CONFIG_FORCE_MAX_ZONEORDER back to 11 for aarch64.
This works for os-build but fails for ark-latest because there is a patch in
ark-patches that changes the default to 13.
The problem is we tried to keep the redhat/ changes separate from the
redhat/fedora only patches in ark-patches. The goal was os-build could
build standalone and the combination of ark-patches into ark-latest could
build standalone.
Because of that arm64 change of the default to 13, we broke the os-build
standalone build. And because the ark-patches does not have the redhat/
area, we can't make config changes on that branch.
Hence the problem and why it hasn't been solved yet. It is annoying and I
would love to fix it, but this solution just moves the breakage from
os-build to ark-latest. :-(
Therefore,
Nacked-by: Don Zickus <dzickus@xxxxxxxxxx>
>
> Fixes: dd028d261347 ("[redhat] Sync up ARK's Fedora config tree with Fedora's dist-git")
> Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
> Cc: honli@xxxxxxxxxx
> Cc: jcline@xxxxxxxxxx
> ---
> .../fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
> index b730690db048..8220d67904ea 100644
> --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
> +++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
> @@ -1,4 +1,4 @@
> # We technically want this to be 13 for Fedora with 4K pages but that's only
> # an option with an out of tree patch. Keep this 11 for compatibility until
> # we figure out what we want here
> -CONFIG_FORCE_MAX_ZONEORDER=13
> +CONFIG_FORCE_MAX_ZONEORDER=11
> --
> 2.26.2
> _______________________________________________
> kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
> To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
> Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
