[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20230814195420.GHZNqGbA54XsfLkvDG@fat_crate.local>
Date: Mon, 14 Aug 2023 21:54:20 +0200
From: Borislav Petkov <bp@...en8.de>
To: kernel test robot <lkp@...el.com>
Cc: oe-kbuild-all@...ts.linux.dev, linux-kernel@...r.kernel.org,
x86@...nel.org
Subject: Re: [tip:master 20/20] arch/x86/include/asm/microcode.h:29:20:
error: redefinition of 'amd_check_microcode'
On Tue, Aug 15, 2023 at 02:51:42AM +0800, kernel test robot wrote:
> tree: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git master
> head: d2915b8e76b3a598febd7348799d745cb741a2f5
> commit: d2915b8e76b3a598febd7348799d745cb741a2f5 [20/20] Merge x86/microcode into tip/master
> config: i386-debian-10.3 (https://download.01.org/0day-ci/archive/20230815/202308150231.ThoHOoid-lkp@intel.com/config)
> compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
> reproduce: (https://download.01.org/0day-ci/archive/20230815/202308150231.ThoHOoid-lkp@intel.com/reproduce)
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <lkp@...el.com>
> | Closes: https://lore.kernel.org/oe-kbuild-all/202308150231.ThoHOoid-lkp@intel.com/
>
> All errors (new ones prefixed by >>):
>
> In file included from arch/x86/kernel/smpboot.c:80:
> >> arch/x86/include/asm/microcode.h:29:20: error: redefinition of 'amd_check_microcode'
> 29 | static inline void amd_check_microcode(void) {}
Thanks for reporting. That was a mismerge on my part, sorry about that.
Fixed now.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
Powered by blists - more mailing lists