From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, URIBL_RED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83046C433ED for ; Thu, 6 May 2021 07:59:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45FA0613BD for ; Thu, 6 May 2021 07:59:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233658AbhEFIAE (ORCPT ); Thu, 6 May 2021 04:00:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:37828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233602AbhEFIAD (ORCPT ); Thu, 6 May 2021 04:00:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EC428613B5; Thu, 6 May 2021 07:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620287945; bh=uCfde1LX4DjDU+mPSYhIcs+Z/3xSasgqoWoypH4z0Ow=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ugMB5xplqYdquPFXAuYdacC0fmGUX/EwjPEzgpnLEBtBh4kr80mNAR4zDV1oqbWKI Cm+ijZILhNUFT4QNoy6DQpDOQFNMsgeKcJZbn9i0HUsVopvPxedHpQVZqEKlemhAh1 BLmqGtTYmUMsG/pXdv/TDeoiGIAj5phmPjGbP8z0= Date: Thu, 6 May 2021 09:59:03 +0200 From: Greg Kroah-Hartman To: Guenter Roeck Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, stable@vger.kernel.org Subject: Re: [PATCH 5.4 00/21] 5.4.117-rc1 review Message-ID: References: <20210505112324.729798712@linuxfoundation.org> <20210505214938.GA817073@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210505214938.GA817073@roeck-us.net> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 05, 2021 at 02:49:38PM -0700, Guenter Roeck 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 > > Linux 5.4.117-rc1 > > > > Ondrej Mosnacek > > perf/core: Fix unconditional security_locked_down() call > > > > Miklos Szeredi > > ovl: allow upperdir inside lowerdir > > > > Dan Carpenter > > scsi: ufs: Unlock on a couple error paths > > > > Mark Pearson > > platform/x86: thinkpad_acpi: Correct thermal sensor allocation > > > > Shengjiu Wang > > ASoC: ak5558: Add MODULE_DEVICE_TABLE > > > > Shengjiu Wang > > ASoC: ak4458: Add MODULE_DEVICE_TABLE > > Twice ? Why ? > > 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: :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". Ah, these came into Linus's tree with two different commits, which is why I didn't notice it was already present. I'll go drop these two from all stable trees now, thanks for letting me know. greg k-h