Re: [OS-BUILD PATCHv2 0/3] redhat: update merge.py to handle merge.pl corner cases

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Justin M. Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2262#note_1258211133

This actually seems like the more desirable behavior, but in either case,
having the same config item listed multiple times in the file is a bug.  It
does appear that this patch changes the config output, however it seems like
logical changes:

```
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -868,7 +868,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPUMASK_KUNIT_TEST=m
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
-# CONFIG_CPU_SUP_CENTAUR ignored for predicate CONFIG_EXPERT
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CPU_UNRET_ENTRY=y
 # CONFIG_CRAMFS is not set
@@ -5864,44 +5863,31 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SMDK_WM8994_PCM is not set
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
-# CONFIG_SND_SOC_SOF_ALDERLAKE:
 CONFIG_SND_SOC_SOF_ALDERLAKE=m
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
-# CONFIG_SND_SOC_SOF_APOLLOLAKE:
 CONFIG_SND_SOC_SOF_APOLLOLAKE=m
-# CONFIG_SND_SOC_SOF_BAYTRAIL:
 CONFIG_SND_SOC_SOF_BAYTRAIL=m
-# CONFIG_SND_SOC_SOF_BROADWELL:
 CONFIG_SND_SOC_SOF_BROADWELL=m
-# CONFIG_SND_SOC_SOF_CANNONLAKE:
 CONFIG_SND_SOC_SOF_CANNONLAKE=m
-# CONFIG_SND_SOC_SOF_COFFEELAKE:
 CONFIG_SND_SOC_SOF_COFFEELAKE=m
-# CONFIG_SND_SOC_SOF_COMETLAKE:
 CONFIG_SND_SOC_SOF_COMETLAKE=m
-# CONFIG_SND_SOC_SOF_ELKHARTLAKE:
 CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
 CONFIG_SND_SOC_SOF_GEMINILAKE=m
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_SOC_SOF_HDA_LINK=y
-# CONFIG_SND_SOC_SOF_ICELAKE:
 CONFIG_SND_SOC_SOF_ICELAKE=m
 # CONFIG_SND_SOC_SOF_IMX8M_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX8_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX_TOPLEVEL is not set
-# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE:
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
-# CONFIG_SND_SOC_SOF_JASPERLAKE:
 CONFIG_SND_SOC_SOF_JASPERLAKE=m
 CONFIG_SND_SOC_SOF_KABYLAKE=m
-# CONFIG_SND_SOC_SOF_MERRIFIELD:
 CONFIG_SND_SOC_SOF_MERRIFIELD=m
 CONFIG_SND_SOC_SOF_METEORLAKE=m
 # CONFIG_SND_SOC_SOF_OF is not set
 CONFIG_SND_SOC_SOF_PCI=m
 CONFIG_SND_SOC_SOF_SKYLAKE=m
-# CONFIG_SND_SOC_SOF_TIGERLAKE:
 CONFIG_SND_SOC_SOF_TIGERLAKE=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_SPDIF is not set
@@ -7280,12 +7266,8 @@ CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
 CONFIG_XMON_DEFAULT_RO_MODE=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
```

Other arches included the same or just a subset as the SND_SOC bits were
lacking deps.   If you look closely, we are losing comments that shouldn't be
in the file, and do not have an impact on the built kernel.  Behavior of the
built kernels should be identical.  For future changes, after merge, things
would work just as before the merge in that anyone making a config change
should verify that the config change they are making has the desired effect.
_______________________________________________
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
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux