[soc:for-next 15/19] drivers/pcmcia/soc_common.c:884:1: error: version control conflict marker in file

[kernel test robot]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git for-next
head:   6a9b106700225a02b940f7c74a52b51cb1a7dc71
commit: 898ed26f4c5c7827a54b1d9a91a471c75888f25a [15/19] Merge branch 'arm/multiplatform-late' into for-next
config: arm-trizeps4_defconfig (https://download.01.org/0day-ci/archive/20220506/202205060922.yRXzZa2J-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git/commit/?id=898ed26f4c5c7827a54b1d9a91a471c75888f25a
        git remote add soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
        git fetch --no-tags soc for-next
        git checkout 898ed26f4c5c7827a54b1d9a91a471c75888f25a
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp at intel.com>

All errors (new ones prefixed by >>):

   drivers/pcmcia/soc_common.c: In function 'soc_pcmcia_add_one':
>> drivers/pcmcia/soc_common.c:884:1: error: version control conflict marker in file
     884 | <<<<<<< HEAD
         | ^~~~~~~
   drivers/pcmcia/soc_common.c:886:1: error: version control conflict marker in file
     886 | =======
         | ^~~~~~~
   drivers/pcmcia/soc_common.c:888:1: error: version control conflict marker in file
     888 | >>>>>>> arm/multiplatform-late
         | ^~~~~~~
>> drivers/pcmcia/soc_common.c:832:17: error: label 'out_err_5' used but not defined
     832 |                 goto out_err_5;
         |                 ^~~~
   At top level:
   drivers/pcmcia/soc_common.c:769:13: warning: 'soc_pcmcia_unmap_iospace' defined but not used [-Wunused-function]
     769 | static void soc_pcmcia_unmap_iospace(const struct resource *res)
         |             ^~~~~~~~~~~~~~~~~~~~~~~~


vim +884 drivers/pcmcia/soc_common.c

   801	
   802	int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt)
   803	{
   804		int ret;
   805	
   806		skt->cs_state = dead_socket;
   807	
   808		timer_setup(&skt->poll_timer, soc_common_pcmcia_poll_event, 0);
   809		skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD;
   810	
   811		ret = request_resource(&iomem_resource, &skt->res_skt);
   812		if (ret)
   813			goto out_err_1;
   814	
   815		ret = request_resource(&skt->res_skt, &skt->res_io);
   816		if (ret)
   817			goto out_err_2;
   818	
   819		ret = request_resource(&skt->res_skt, &skt->res_mem);
   820		if (ret)
   821			goto out_err_3;
   822	
   823		ret = request_resource(&skt->res_skt, &skt->res_attr);
   824		if (ret)
   825			goto out_err_4;
   826	
   827		skt->res_io_io = (struct resource)
   828			 DEFINE_RES_IO_NAMED(skt->nr * 0x1000 + 0x10000, 0x1000,
   829					     "PCMCIA I/O");
   830		ret = pci_remap_iospace(&skt->res_io_io, skt->res_io.start);
   831		if (ret)
 > 832			goto out_err_5;
   833	
   834		/*
   835		 * We initialize default socket timing here, because
   836		 * we are not guaranteed to see a SetIOMap operation at
   837		 * runtime.
   838		 */
   839		skt->ops->set_timing(skt);
   840	
   841		ret = soc_pcmcia_hw_init(skt);
   842		if (ret)
   843			goto out_err_6;
   844	
   845		skt->socket.ops = &soc_common_pcmcia_operations;
   846		skt->socket.features = SS_CAP_STATIC_MAP|SS_CAP_PCCARD;
   847		skt->socket.resource_ops = &pccard_static_ops;
   848		skt->socket.irq_mask = 0;
   849		skt->socket.map_size = PAGE_SIZE;
   850		skt->socket.io_offset = (unsigned long)skt->res_io_io.start;
   851	
   852		skt->status = soc_common_pcmcia_skt_state(skt);
   853	
   854	#ifdef CONFIG_CPU_FREQ
   855		if (skt->ops->frequency_change) {
   856			skt->cpufreq_nb.notifier_call = soc_common_pcmcia_cpufreq_nb;
   857	
   858			ret = cpufreq_register_notifier(&skt->cpufreq_nb,
   859							CPUFREQ_TRANSITION_NOTIFIER);
   860			if (ret < 0)
   861				dev_err(skt->socket.dev.parent,
   862					"unable to register CPU frequency change notifier for PCMCIA (%d)\n",
   863					ret);
   864		}
   865	#endif
   866	
   867		ret = pcmcia_register_socket(&skt->socket);
   868		if (ret)
   869			goto out_err_7;
   870	
   871		ret = device_create_file(&skt->socket.dev, &dev_attr_status);
   872		if (ret)
   873			goto out_err_8;
   874	
   875		return ret;
   876	
   877	 out_err_8:
   878		del_timer_sync(&skt->poll_timer);
   879		pcmcia_unregister_socket(&skt->socket);
   880	
   881	 out_err_7:
   882		soc_pcmcia_hw_shutdown(skt);
   883	 out_err_6:
 > 884	<<<<<<< HEAD
   885		soc_pcmcia_unmap_iospace(&skt->res_io_io);
   886	=======
   887		iounmap(PCI_IOBASE + skt->res_io_io.start);
   888	>>>>>>> arm/multiplatform-late
   889	 out_err_5:
   890		release_resource(&skt->res_attr);
   891	 out_err_4:
   892		release_resource(&skt->res_mem);
   893	 out_err_3:
   894		release_resource(&skt->res_io);
   895	 out_err_2:
   896		release_resource(&skt->res_skt);
   897	 out_err_1:
   898	
   899		return ret;
   900	}
   901	EXPORT_SYMBOL(soc_pcmcia_add_one);
   902	

-- 
0-DAY CI Kernel Test Service
https://01.org/lkp