Use bitmask for conflict checking
Use bitmask for conflict checking

Rather than using 2 different functions for different
types of conflicts use a bitmask to specify what
conflicts need to be checked. This allows a better way
to make exceptions.

Signed-off-by: Tonis Tiigi <c2470c48b2d3312d61f94f18d3a1cd113d1915ad@gmail.com>
yosifkit/docker,jzwlqx/denverdino.github.io,danyalKhaliq10p/moby,ivansaracino/docker,aaronlehmann/docker,BenHall/docker,achanda/docker,thtanaka/docker,alexisbellido/docker.github.io,bearstech/moby,jc-m/docker,dmcgowan/docker,nawawi/docker,kolyshkin/moby,gjaskiewicz/moby,tmp6154/docker,nghiant2710/docker,mixja/docker,menglingwei/denverdino.github.io,splunk/docker,laijs/moby,13W/docker,nalind/docker,cmehay/docker-1,davinashreddy/docker,Morsicus/docker,mathewkoshy493/docker,tianon/docker,alexisbellido/docker.github.io,fangyuan930917/docker,denverdino/docker.github.io,jwhonce/docker,brahmaroutu/docker,menglingwei/denverdino.github.io,londoncalling/docker.github.io,LaynePeng/docker,londoncalling/docker.github.io,gigidwan/docker,johnstep/docker.github.io,pyotr777/docker,konstruktoid/docker-1,michael-holzheu/docker,bonczj/moby-json-file-logger,toli/docker,PatrickLang/moby,tklauser/docker,maxamillion/docker,tonistiigi/docker,tophj-ibm/docker,Collinux/docker,joaofnfernandes/docker.github.io,menglingwei/denverdino.github.io,TrumanLing/docker,sanscontext/docker.github.io,geekylucas/docker,ripcurld0/moby,Jimmy-Xu/hypercli,naveed-jamil-tenpearls/moby,sanscontext/docker.github.io,14rcole/docker,gdevillele/docker.github.io,haveatry/docker,OnePaaS/docker,qudongfang/docker,moypray/docker,errordeveloper/docker,aidanhs/docker,gjaskiewicz/moby,ibuildthecloud/docker,cmehay/docker-1,cyphar/docker,TrumanLing/docker,madhanrm/docker,mixja/docker,jthelin/docker,kunalkushwaha/docker,cmehay/docker-1,mohmost12/docker,ncdc/docker,eskaaren/docker,ffoysal/docker,SaiedKazemi/docker,sanscontext/docker.github.io,sunyuan3/docker,docker/docker.github.io,nawawi/docker,joeuo/docker.github.io,shin-/docker.github.io,laijs/moby,unclejack/docker,rancher/docker,phiroict/docker,rhatdan/storage,LuisBosquez/docker.github.io,BrianBland/docker,hypriot/docker,pecameron/docker,xuxinkun/docker,imkin/moby,YuPengZTE/docker,Mokolea/docker,ibuildthecloud/docker,kencochrane/docker,alexisbellido/docker.github.io,troy0820/docker.github.io,laijs/moby,afein/docker,pramodhkp/moby,yosifkit/docker,aaronlehmann/docker,errordeveloper/docker,ffoysal/docker,mikebrow/docker,konstruktoid/docker-upstream,moul/docker,sterchelen/docker,justincormack/docker,lixiaobing10051267/docker,mike1729/docker,Altiscale/docker,tophj-ibm/docker,troy0820/docker.github.io,liaoqingwei/docker,cpuguy83/docker,POLJM242/docker,BenHall/docker,michelvocks/docker,vincentwoo/docker,jameszhan/docker,tklauser/docker,stainboy/docker,mssola/docker,endophage/docker,14rcole/docker,miminar/docker,KarthikNayak/docker,rremer/moby,Ramzec/docker,inatatsu/docker,asbjornenge/docker,aduermael/docker.github.io,gdevillele/docker.github.io,icaoweiwei/docker,djs55/docker,OnePaaS/docker,prertik/docker,tkopczynski/docker,containers/storage,projectatomic/docker,dperny/docker,whuwxl/docker,dnephin/docker,dmcgowan/docker,OnePaaS/docker,pramodhkp/moby,tpounds/docker,ncdc/docker,moypray/docker,docker-zh/docker.github.io,harche/docker,arun-gupta/docker,POLJM242/docker,swasd/baleno,isubuz/docker,rancher/docker,joeuo/docker.github.io,swasd/baleno,vijaykilari/docker,mtanlee/docker,tpounds/docker,rhatdan/docker,nigelpoulton/docker,Mokolea/docker,jlebon/docker,achanda/docker,shin-/docker.github.io,sfsmithcha/docker,miminar/docker,dongjoon-hyun/docker,HideoYamauchi/docker,Jimmy-Xu/hypercli,rillig/docker.github.io,x1022as/docker,tophj-ibm/moby,darrenstahlmsft/moby,jimjag/docker,mikebrow/docker,Syntaxide/docker,ibuildthecloud/docker,sean-jc/docker,stevvooe/docker,dsheets/moby,BSWANG/denverdino.github.io,Microsoft/docker,xiaods/docker,konstruktoid/docker-1,docker-zh/docker.github.io,shhsu/docker,jhorwit2/docker,erikh/docker,estesp/docker,TheBigBear/docker,msabansal/docker,hyperhq/hypercli,luxas/docker,TheBigBear/docker,mbanikazemi/docker,erikstmartin/docker,izarov/docker,ZJU-SEL/docker,BSWANG/denverdino.github.io,yongtang/docker,ckeyer/docker,scotttlin/docker,vijaykilari/docker,hallyn/docker,yasiramin10p/moby,trebonian/docker,portworx/docker,crosbymichael/docker,thaJeztah/docker,haveatry/docker,BSWANG/denverdino.github.io,SvenDowideit/docker,michael-holzheu/docker,michelvocks/docker,pyotr777/docker,tmp6154/docker,mkumatag/docker,tophj-ibm/moby,rhatdan/storage,Altiscale/docker,denverdino/denverdino.github.io,mgoelzer/docker,thaJeztah/docker,bdwill/docker.github.io,noxiouz/docker,jlebon/docker,gdevillele/docker.github.io,erikstmartin/docker,sfsmithcha/docker,danix800/docker.github.io,cyphar/docker,akira-baruah/docker,miminar/docker,jzwlqx/denverdino.github.io,erikh/docker,rhatdan/storage,SaiedKazemi/docker,KingEmet/docker,srust/docker,vdemeester/docker,danyalKhaliq10p/moby,kolyshkin/docker,coolljt0725/docker,flavio/docker,nigelpoulton/docker,docker-zh/docker.github.io,justyntemme/docker,tpounds/docker,BrianBland/docker,13W/docker,aduermael/docker.github.io,msabansal/docker,laijs/docker,docker-zh/docker.github.io,moul/docker,rhatdan/docker,jhorwit2/docker,phiroict/docker,13W/docker,cpuguy83/docker,sallyom/docker,zhangjianfnst/docker,mahak/docker,dccurtis/docker,sanjeo/docker,thaJeztah/docker,nalind/docker,wenchma/docker,xiaods/docker,kojiromike/docker,dnephin/docker,kerneltime/docker,charleszheng44/moby,ibuildthecloud/docker,ColinHebert/docker,cnaize/docker,jongiddy/docker,isubuz/docker,gigidwan/docker,PatrickLang/moby,akira-baruah/docker,moul/docker,scollier/docker,konstruktoid/docker-upstream,noironetworks/docker,asbjornenge/docker,denverdino/denverdino.github.io,dperny/docker,solganik/docker,phiroict/docker,DoraALin/docker,gao-feng/docker,solganik/docker,sean-jc/docker,jzwlqx/denverdino.github.io,londoncalling/docker.github.io,mstanleyjones/docker,brahmaroutu/docker,dongjoon-hyun/docker,SvenDowideit/docker,coreos/docker,bfirsh/docker,fangyuan930917/docker,mikebrow/docker,alexisbellido/docker.github.io,JimGalasyn/docker.github.io,sanjeo/docker,moby/moby,flavio/docker,sdurrheimer/docker,coolljt0725/docker,mbanikazemi/docker,mtrmac/docker,crosbymichael/docker,imeoer/hypercli,jthelin/docker,sarnautov/moby,charleswhchan/docker,aaronlehmann/docker,endocode/docker,JeffBellegarde/docker,konstruktoid/docker-1,Collinux/docker,resin-io/docker,ivansaracino/docker,runcom/docker,YujiOshima/docker,Mashimiao/docker,bdwill/docker.github.io,carolfh/docker,estesp/docker,imeoer/hypercli,gjaskiewicz/moby,anortef/docker,trebonian/docker,nawawi/docker,jwhonce/docker,tagomoris/docker,duglin/docker,ckeyer/docker,Microsoft/docker,Mashimiao/docker,kyle-wang/docker,ajaymdesai/docker,ndeloof/docker,aduermael/docker.github.io,jvanz/docker,wenchma/docker,madhanrm/docker,naveed-jamil-tenpearls/moby,inatatsu/docker,lixiaobing10051267/docker,rillig/docker.github.io,mike1729/docker,HideoYamauchi/docker,anweiss/docker.github.io,justyntemme/docker,brahmaroutu/docker,hustcat/docker,sterchelen/docker,pradipd/moby,csfrancis/docker,joeuo/docker.github.io,nawawi/docker,HackToday/docker,yongtang/docker,docker/docker.github.io,icaoweiwei/docker,johnstep/moby-moby,kojiromike/docker,Shopify/docker,amatsus/docker,fangyuan930917/docker,containers/storage,hyperhq/hypercli,sdurrheimer/docker,medallia/docker,endocode/docker,hqhq/moby,denverdino/docker.github.io,qudongfang/docker,umerazad/docker,bluebreezecf/docker,gnailuy/docker,anujbahuguna/docker,alfred-landrum/docker,stainboy/docker,hallyn/docker,bearstech/moby,ZJU-SEL/docker,anweiss/docker.github.io,LuisBosquez/docker.github.io,docker/docker,cyphar/docker,erikstmartin/docker,rremer/moby,paralin/docker,HackToday/docker,lixiaobing1/docker,JeffBellegarde/docker,dgageot/docker,jlhawn/docker,AkihiroSuda/docker,shin-/docker.github.io,anujbahuguna/docker,csfrancis/docker,mkumatag/docker,xiekeyang/docker,jvanz/docker,aidanhs/docker,shubheksha/docker.github.io,coolljt0725/docker,SaiedKazemi/docker,anweiss/docker.github.io,danix800/docker.github.io,ckeyer/docker,sanscontext/docker.github.io,kojiromike/docker,aidanhs/docker,tagomoris/docker,HuKeping/docker,Test-Betta-Inc/psychic-barnacle,jimjag/docker,projectatomic/docker,fsoppelsa/docker,jwhonce/docker,sallyom/docker,coreos/docker,docker/docker,zhuguihua/docker,mikedougherty/docker,duglin/docker,eskaaren/docker,danix800/docker.github.io,rillig/docker.github.io,laijs/docker,jimjag/docker,phiroict/docker,estesp/docker,tophj-ibm/moby,YujiOshima/docker,thaJeztah/docker.github.io,portworx/docker,BenHall/docker,ZJUshuaizhou/docker,dccurtis/docker,michael-holzheu/docker,gschaetz/moby,hypriot/docker,jecarey/docker,yasiramin10p/moby,yosifkit/docker,johnstep/docker.github.io,trebonian/docker,troy0820/docker.github.io,shhsu/docker,vdemeester/docker,mtesselH/docker,justyntemme/docker,johnstep/docker.github.io,jloehel/docker,endophage/docker,jongiddy/docker,kunalkushwaha/docker,JimGalasyn/docker.github.io,mikedougherty/docker,achanda/docker,cloudflare/docker,konstruktoid/docker-upstream,kimh/docker,BSWANG/denverdino.github.io,nghiant2710/docker,danix800/docker.github.io,maxamillion/docker,tianon/docker,prertik/docker,johnstep/moby-moby,icecrime/docker,tonistiigi/docker,sarnautov/moby,yummypeng/docker,cloudflare/docker,tophj-ibm/docker,mahak/docker,hqhq/moby,mathewkoshy493/docker,kerneltime/docker,unclejack/docker,containers/storage,supasate/docker,izarov/docker,cyli/docker,yosifkit/docker,shubheksha/docker.github.io,allencloud/docker,AkihiroSuda/docker,izarov/docker,diogomonica/docker,portworx/docker,mtanlee/docker,Shopify/docker,sunyuan3/docker,imeoer/hypercli,abhinavdahiya/docker,ailispaw/docker,cr7pt0gr4ph7/docker,Mokolea/docker,KingEmet/docker,Morsicus/docker,jloehel/docker,amatsus/docker,bdwill/docker.github.io,afein/docker,ajaymdesai/docker,xiekeyang/docker,x1022as/docker,dsau/docker,kerneltime/docker,pradipd/moby,resin-io/docker,yongtang/docker,gnailuy/docker,alfred-landrum/docker,13W/docker,mkumatag/docker,johnstep/docker.github.io,kimh/docker,konstruktoid/docker-upstream,hustcat/docker,sterchelen/docker,dims/docker,menglingwei/denverdino.github.io,ailispaw/docker,noironetworks/docker,mixja/docker,shin-/docker.github.io,nguyentm83/docker,srust/docker,jlebon/docker,ndeloof/docker,YuPengZTE/docker,moby/moby,toli/docker,fcrisciani/docker,HuKeping/docker,charleszheng44/moby,dgageot/docker,13W/docker,Microsoft/docker,tagomoris/docker,imkin/moby,allencloud/docker,denverdino/denverdino.github.io,vijaykilari/docker,dgageot/docker,abhinavdahiya/docker,icecrime/docker,paralin/docker,cr7pt0gr4ph7/docker,sheimi/docker,jzwlqx/denverdino.github.io,shubheksha/docker.github.io,BrianBland/docker,moxiegirl/docker,Morsicus/docker,dmcgowan/docker,dsau/docker,kolyshkin/docker,skatsuta/docker,ZJUshuaizhou/docker,JMesser81/docker,denverdino/docker.github.io,YuPengZTE/docker,stevvooe/docker,hyperhq/hypercli,djs55/docker,jimjag/docker,paralin/docker,anweiss/docker.github.io,q384566678/docker,mtrmac/docker,docker-zh/docker.github.io,zhangjianfnst/docker,HackToday/docker,wenchma/docker,sanjeo/docker,cpuguy83/docker,raja-sami-10p/moby,diogomonica/docker,luxas/docker,bdwill/docker.github.io,KarthikNayak/docker,anujbahuguna/docker,mahak/docker,rillig/docker.github.io,aduermael/docker.github.io,dongjoon-hyun/docker,bearstech/moby,shishir-a412ed/docker,amatsus/docker,dnephin/docker,gnailuy/docker,mikedougherty/docker,diogomonica/docker,mstanleyjones/docker,hustcat/docker,raja-sami-10p/moby,nalind/docker,docker/docker.github.io,jlhawn/docker,docker/docker.github.io,errordeveloper/docker,djs55/docker,londoncalling/docker.github.io,Tenk42/docker,mssola/docker,hqhq/moby,darrenstahlmsft/docker,resin-io/docker,cloudflare/docker,shin-/docker.github.io,rhatdan/docker,twaugh/docker,rkazak/docker,justincormack/docker,shishir-a412ed/docker,contiv/docker,gdevillele/docker.github.io,bonczj/moby-json-file-logger,moxiegirl/docker,AkihiroSuda/docker,anortef/docker,zhuguihua/docker,carolfh/docker,mahak/docker,Mokolea/docker,TrumanLing/docker,menglingwei/denverdino.github.io,projectatomic/docker,scotttlin/docker,JMesser81/docker,sheimi/docker,Test-Betta-Inc/psychic-barnacle,runcom/docker,tmp6154/docker,bluebreezecf/docker,joaofnfernandes/docker.github.io,sean-jc/docker,JMesser81/docker,gnailuy/docker,thaJeztah/docker.github.io,ffoysal/docker,mohmost12/docker,docker/docker.github.io,DoraALin/docker,swasd/baleno,harche/docker,gdevillele/docker.github.io,PatrickLang/moby,danyalKhaliq10p/moby,prertik/docker,thaJeztah/docker.github.io,charleswhchan/docker,contiv/docker,fsoppelsa/docker,pradipd/moby,johnstep/docker.github.io,sheimi/docker,moypray/docker,liaoqingwei/docker,Collinux/docker,KingEmet/docker,xuxinkun/docker,SvenDowideit/docker,contiv/docker,cnaize/docker,yummypeng/docker,Ramzec/docker,zhuguihua/docker,catinthesky/docker,ripcurld0/moby,darrenstahlmsft/docker,Tenk42/docker,mtesselH/docker,johnstep/moby-moby,splunk/docker,Syntaxide/docker,medallia/docker,dsheets/moby,cnaize/docker,ajaymdesai/docker,carolfh/docker,zhangjianfnst/docker,denverdino/denverdino.github.io,bfirsh/docker,troy0820/docker.github.io,naveed-jamil-tenpearls/moby,rkazak/docker,jameszhan/docker,aditirajagopal/docker,medallia/docker,rkazak/docker,rhardih/docker,Altiscale/docker,LuisBosquez/docker.github.io,skatsuta/docker,splunk/docker,LuisBosquez/docker.github.io,mbanikazemi/docker,srust/docker,upmio/docker,kencochrane/docker,aditirajagopal/docker,noxiouz/docker,cr7pt0gr4ph7/docker,pecameron/docker,ncdc/docker,arun-gupta/docker,vincentwoo/docker,kimh/docker,joeuo/docker.github.io,q384566678/docker,lixiaobing1/docker,ndeloof/docker,crosbymichael/docker,thaJeztah/docker.github.io,jzwlqx/denverdino.github.io,HideoYamauchi/docker,denverdino/denverdino.github.io,aditirajagopal/docker,jlhawn/docker,moxiegirl/docker,eskaaren/docker,joaofnfernandes/docker.github.io,shhsu/docker,kyle-wang/docker,medallia/docker,pecameron/docker,paralin/docker,Mashimiao/docker,inatatsu/docker,JimGalasyn/docker.github.io,denverdino/docker.github.io,harche/docker,phiroict/docker,KarthikNayak/docker,supasate/docker,lixiaobing10051267/docker,vdemeester/docker,bearstech/moby,ailispaw/docker,nguyentm83/docker,tkopczynski/docker,stainboy/docker,sallyom/docker,rremer/moby,bfirsh/docker,hallyn/docker,thtanaka/docker,duglin/docker,gschaetz/moby,DoraALin/docker,mstanleyjones/docker,runcom/docker,solganik/docker,HuKeping/docker,jloehel/docker,gao-feng/docker,Shopify/docker,fsoppelsa/docker,flavio/docker,ivansaracino/docker,Jimmy-Xu/hypercli,willmtemple/docker,thtanaka/docker,darrenstahlmsft/moby,BSWANG/denverdino.github.io,LuisBosquez/docker.github.io,geekylucas/docker,whuwxl/docker,toli/docker,mtanlee/docker,JimGalasyn/docker.github.io,msabansal/docker,denverdino/docker.github.io,shishir-a412ed/docker,Tenk42/docker,abhinavdahiya/docker,Ramzec/docker,davinashreddy/docker,JeffBellegarde/docker,geekylucas/docker,moul/docker,cyli/docker,kunalkushwaha/docker,LaynePeng/docker,mtesselH/docker,fcrisciani/docker,yp-engineering/docker,sdurrheimer/docker,tkopczynski/docker,mssola/docker,justincormack/docker,x1022as/docker,kencochrane/docker,cyli/docker,cpuguy83/docker,twaugh/docker,q384566678/docker,shubheksha/docker.github.io,imkin/moby,jameszhan/docker,vincentwoo/docker,tklauser/docker,pramodhkp/moby,jc-m/docker,catinthesky/docker,thaJeztah/docker.github.io,arun-gupta/docker,coreos/docker,jvanz/docker,umerazad/docker,dsau/docker,xiaods/docker,sunyuan3/docker,ZJUshuaizhou/docker,kolyshkin/moby,mathewkoshy493/docker,kyle-wang/docker,AkihiroSuda/docker,sarnautov/moby,moby/moby,alfred-landrum/docker,haveatry/docker,darrenstahlmsft/moby,bluebreezecf/docker,nigelpoulton/docker,michelvocks/docker,noxiouz/docker,trebonian/docker,allencloud/docker,luxas/docker,fcrisciani/docker,afein/docker,madhanrm/docker,isubuz/docker,Ramzec/docker,ColinHebert/docker,joaofnfernandes/docker.github.io,catinthesky/docker,icecrime/docker,liaoqingwei/docker,endocode/docker,mgoelzer/docker,unclejack/docker,TheBigBear/docker,pyotr777/docker,charleszheng44/moby,nghiant2710/docker,sfsmithcha/docker,raja-sami-10p/moby,gigidwan/docker,YujiOshima/docker,endophage/docker,upmio/docker,ripcurld0/moby,icaoweiwei/docker,jhorwit2/docker,noironetworks/docker,dims/docker,jongiddy/docker,flavio/docker,moby/moby,umerazad/docker,joaofnfernandes/docker.github.io,Syntaxide/docker,supasate/docker,lixiaobing1/docker,charleswhchan/docker,xiekeyang/docker,tonistiigi/docker,rancher/docker,xuxinkun/docker,maxamillion/docker,rhardih/docker,asbjornenge/docker,yasiramin10p/moby,mtrmac/docker,scollier/docker,hypriot/docker,davinashreddy/docker,joeuo/docker.github.io,dccurtis/docker,dperny/docker,alexisbellido/docker.github.io,jc-m/docker,londoncalling/docker.github.io,JimGalasyn/docker.github.io,LaynePeng/docker,ibuildthecloud/docker,dims/docker,jecarey/docker,twaugh/docker,kolyshkin/moby,whuwxl/docker,erikh/docker,yp-engineering/docker,willmtemple/docker,willmtemple/docker,qudongfang/docker,anweiss/docker.github.io,upmio/docker,sanscontext/docker.github.io,stevvooe/docker,yp-engineering/docker,gschaetz/moby,darrenstahlmsft/docker,mike1729/docker,laijs/docker,Test-Betta-Inc/psychic-barnacle,mgoelzer/docker,bonczj/moby-json-file-logger,ColinHebert/docker,docker/docker,yummypeng/docker,skatsuta/docker,nalind/docker,anortef/docker,scotttlin/docker,gao-feng/docker,shubheksha/docker.github.io,dsheets/moby,csfrancis/docker,mohmost12/docker,thaJeztah/docker,bdwill/docker.github.io