On 5/5/21 7:15 PM, Daniel Díaz wrote: > Hello! > > On Wed, 5 May 2021 at 16:49, Guenter Roeck <linux@xxxxxxxxxxxx> wrote: >> >> On Wed, May 05, 2021 at 02:04:14PM +0200, Greg Kroah-Hartman wrote: >>> This is the start of the stable review cycle for the 5.4.117 release. >>> There are 21 patches in this series, all will be posted as a response >>> to this one. If anyone has any issues with these being applied, please >>> let me know. >>> >>> Responses should be made by Fri, 07 May 2021 11:23:16 +0000. >>> Anything received after that time might be too late. >>> >>> The whole patch series can be found in one patch at: >>> https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.117-rc1.gz >>> or in the git tree and branch at: >>> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y >>> and the diffstat can be found below. >>> >>> thanks, >>> >>> greg k-h >>> >>> ------------- >>> Pseudo-Shortlog of commits: >>> >>> Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> >>> Linux 5.4.117-rc1 >>> >>> Ondrej Mosnacek <omosnace@xxxxxxxxxx> >>> perf/core: Fix unconditional security_locked_down() call >>> >>> Miklos Szeredi <mszeredi@xxxxxxxxxx> >>> ovl: allow upperdir inside lowerdir >>> >>> Dan Carpenter <dan.carpenter@xxxxxxxxxx> >>> scsi: ufs: Unlock on a couple error paths >>> >>> Mark Pearson <markpearson@xxxxxxxxxx> >>> platform/x86: thinkpad_acpi: Correct thermal sensor allocation >>> >>> Shengjiu Wang <shengjiu.wang@xxxxxxx> >>> ASoC: ak5558: Add MODULE_DEVICE_TABLE >>> >>> Shengjiu Wang <shengjiu.wang@xxxxxxx> >>> ASoC: ak4458: Add MODULE_DEVICE_TABLE >> >> Twice ? Why ? > > But different, right? One for 4458 and the other for 5558: > > sound/soc/codecs/ak4458.c: > +MODULE_DEVICE_TABLE(of, ak4458_of_match); > > sound/soc/codecs/ak5558.c: > +MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids); > Yes, I realized that later. The real problem is that the commits are already in the tree, so both files end up with two sets of MODULE_DEVICE_TABLE(). $ git grep MODULE_DEVICE_TABLE sound/soc/codecs/ak4458.c sound/soc/codecs/ak4458.c:MODULE_DEVICE_TABLE(of, ak4458_of_match); sound/soc/codecs/ak4458.c:MODULE_DEVICE_TABLE(of, ak4458_of_match); $ git grep MODULE_DEVICE_TABLE sound/soc/codecs/ak5558.c sound/soc/codecs/ak5558.c:MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids); sound/soc/codecs/ak5558.c:MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids); That applies to all branches. > FWIW, our builds passed with that pair of commits. My test builds pass as well. I think this is because Chrome OS images build with -Werror. Guenter > > Greetings! > > Daniel Díaz > daniel.diaz@xxxxxxxxxx > > > >> This gives me a compile error (the second time it is added at the wrong >> place). >> >> chromeos-kernel-5_4-5.4.117_rc1-r2159: /build/arm-generic/tmp/portage/sys-kernel/chromeos-kernel-5_4-5.4.117_rc1-r2159/work/chromeos-kernel-5_4-5.4.117_rc1/sound/soc/codecs/ak4458.c:722:1: error: redefinition of '__mod_of__ak4458_of_match_device_table' >> chromeos-kernel-5_4-5.4.117_rc1-r2159: MODULE_DEVICE_TABLE(of, ak4458_of_match); >> chromeos-kernel-5_4-5.4.117_rc1-r2159: ^ >> chromeos-kernel-5_4-5.4.117_rc1-r2159: /build/arm-generic/tmp/portage/sys-kernel/chromeos-kernel-5_4-5.4.117_rc1-r2159/work/chromeos-kernel-5_4-5.4.117_rc1/include/linux/module.h:227:21: note: expanded from macro 'MODULE_DEVICE_TABLE' >> chromeos-kernel-5_4-5.4.117_rc1-r2159: extern typeof(name) __mod_##type##__##name##_device_table \ >> chromeos-kernel-5_4-5.4.117_rc1-r2159: ^ >> chromeos-kernel-5_4-5.4.117_rc1-r2159: <scratch space>:119:1: note: expanded from here >> chromeos-kernel-5_4-5.4.117_rc1-r2159: __mod_of__ak4458_of_match_device_table >> chromeos-kernel-5_4-5.4.117_rc1-r2159: ^ >> chromeos-kernel-5_4-5.4.117_rc1-r2159: /build/arm-generic/tmp/portage/sys-kernel/chromeos-kernel-5_4-5.4.117_rc1-r2159/work/chromeos-kernel-5_4-5.4.117_rc1/sound/soc/codecs/ak4458.c:711:1: note: previous definition is here >> chromeos-kernel-5_4-5.4.117_rc1- r2159: MODULE_DEVICE_TABLE(of, ak4458_of_match); >> chromeos-kernel-5_4-5.4.117_rc1-r2159: ^ >> chromeos-kernel-5_4-5.4.117_rc1-r2159: /build/arm-generic/tmp/portage/sys-kernel/chromeos-kernel-5_4-5.4.117_rc1-r2159/work/chromeos-kernel-5_4-5.4.117_rc1/include/linux/module.h:227:21: note: expanded from macro 'MODULE_DEVICE_TABLE' >> chromeos-kernel-5_4-5.4.117_rc1-r2159: extern typeof(name) __mod_##type##__##name##_device_table \ >> >> Oddly enough, I only see the error when I try to merge the >> code into ChromeOS, not in my test builds. I guess that has >> to do with "-Werror". >> >> Guenter
