Re: [PATCH v11 20/23] CXL/PCI: Export and rename merge_result() to pci_ers_merge_result()

[kernel test robot <lkp@intel.com>]

Hi Terry,

kernel test robot noticed the following build errors:

[auto build test ERROR on f11a5f89910a7ae970fbce4fdc02d86a8ba8570f]

url:    https://github.com/intel-lab-lkp/linux/commits/Terry-Bowman/cxl-Remove-ifdef-blocks-of-CONFIG_PCIEAER_CXL-from-core-pci-c/20250827-094257
base:   f11a5f89910a7ae970fbce4fdc02d86a8ba8570f
patch link:    https://lore.kernel.org/r/20250827013539.903682-21-terry.bowman%40amd.com
patch subject: [PATCH v11 20/23] CXL/PCI: Export and rename merge_result() to pci_ers_merge_result()
config: powerpc64-randconfig-002-20250827 (https://download.01.org/0day-ci/archive/20250827/202508271903.HTGgt8kV-lkp@intel.com/config)
compiler: powerpc64-linux-gcc (GCC) 11.5.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250827/202508271903.HTGgt8kV-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@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202508271903.HTGgt8kV-lkp@intel.com/

All errors (new ones prefixed by >>):

>> arch/powerpc/kernel/eeh_driver.c:68:28: error: redefinition of 'pci_ers_merge_result'
      68 | static enum pci_ers_result pci_ers_merge_result(enum pci_ers_result old,
         |                            ^~~~~~~~~~~~~~~~~~~~
   In file included from arch/powerpc/kernel/eeh_driver.c:13:
   include/linux/pci.h:2767:32: note: previous definition of 'pci_ers_merge_result' with type 'pci_ers_result_t(enum pci_ers_result,  enum pci_ers_result)' {aka 'unsigned int(enum pci_ers_result,  enum pci_ers_result)'}
    2767 | static inline pci_ers_result_t pci_ers_merge_result(enum pci_ers_result orig,
         |                                ^~~~~~~~~~~~~~~~~~~~


vim +/pci_ers_merge_result +68 arch/powerpc/kernel/eeh_driver.c

20b344971433da Sam Bobroff 2018-05-25  67  
30424e386a30d1 Sam Bobroff 2018-05-25 @68  static enum pci_ers_result pci_ers_merge_result(enum pci_ers_result old,
30424e386a30d1 Sam Bobroff 2018-05-25  69  						enum pci_ers_result new)
30424e386a30d1 Sam Bobroff 2018-05-25  70  {
30424e386a30d1 Sam Bobroff 2018-05-25  71  	if (eeh_result_priority(new) > eeh_result_priority(old))
30424e386a30d1 Sam Bobroff 2018-05-25  72  		return new;
30424e386a30d1 Sam Bobroff 2018-05-25  73  	return old;
30424e386a30d1 Sam Bobroff 2018-05-25  74  }
30424e386a30d1 Sam Bobroff 2018-05-25  75  

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki