pimd: When passing lookup information back pass the fully resolved (backport #9001) #9148

mergify · 2021-07-23T09:17:41Z

This is an automatic backport of pull request #9001 done by Mergify.
Cherry-pick of b59839a has failed:

On branch mergify/bp/stable/8.0/pr-9001
Your branch is up to date with 'origin/stable/8.0'.

You are currently cherry-picking commit b59839af7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   zebra/zapi_msg.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   zebra/zebra_rnh.c
	both modified:   zebra/zebra_rnh.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

@Mergifyio refresh will re-evaluate the rules
@Mergifyio rebase will rebase this PR on its base branch
@Mergifyio update will merge the base branch into this PR
@Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

look at your merge queues
generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

In the reachability code we auto pass back the fully resolved nexthops. Modify the ZEBRA_IPV4_NEXTHOP_LOOKUP_MRIB code to do the exact same thing so that the zclient_lookup_nexthop code does not need to recursively look for the data that zebra already has. Signed-off-by: Donald Sharp <sharpd@nvidia.com> (cherry picked from commit b59839a) # Conflicts: # zebra/zebra_rnh.c # zebra/zebra_rnh.h

NetDEF-CI · 2021-07-23T10:56:41Z

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Successful

Building Stage: Failed

Ubuntu 18.04 arm7 build: Failed (click for details)

Make failed for Ubuntu 18.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM7BUILD/config.log/config.log.gz
Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM7BUILD/config.status/config.status

Ubuntu 18.04 i386 build: Failed (click for details)

Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18I386BUILD/config.log/config.log.gz Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18I386BUILD/config.status/config.status

Make failed for Ubuntu 18.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Debian 9 amd64 build: Failed (click for details)

Make failed for Debian 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI021BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI021BUILD/config.status/config.status
Debian 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI021BUILD/config.log/config.log.gz

Ubuntu 20.04 amd64 build: Failed (click for details)

Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U2004AMD64BUILD/config.status/config.status

Make failed for Ubuntu 20.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
In file included from ./zebra/rt.h:32,
./zebra/zebra_dplane.h:51:35: error: struct zebra_dplane_info declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
./zebra/zebra_dplane.h: In function zebra_dplane_info_from_zns:
./zebra/zebra_dplane.h:54:10: error: dereferencing pointer to incomplete type struct zebra_dplane_info
cc1: all warnings being treated as errors

Ubuntu 20.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U2004AMD64BUILD/config.log/config.log.gz

Ubuntu 18.04 ppc64le build: Failed (click for details)

Make failed for Ubuntu 18.04 ppc64le build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804PPC64LEBUILD/config.status/config.status
Ubuntu 18.04 ppc64le build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804PPC64LEBUILD/config.log/config.log.gz

Ubuntu 16.04 i386 build: Failed (click for details)

Make failed for Ubuntu 16.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1604I386/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1604I386/config.status/config.status
Ubuntu 16.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1604I386/config.log/config.log.gz

Ubuntu 16.04 arm8 build: Failed (click for details)

Make failed for Ubuntu 16.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U16ARM8BUILD/config.log/config.log.gz
Ubuntu 16.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U16ARM8BUILD/config.status/config.status

Debian 11 amd64 build: Failed (click for details)

Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB11AMD64/config.status/config.status

Make failed for Debian 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB11AMD64/ErrorLog/log_make.txt)

/home/ci/cibuild.20464/frr-source/doc/user/zebra.rst:1183: WARNING: duplicate clicmd description of debug zebra pbr, other instance in pbr
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
In file included from ./zebra/rt.h:32,
./zebra/zebra_dplane.h:51:35: error: struct zebra_dplane_info declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
./zebra/zebra_dplane.h: In function zebra_dplane_info_from_zns:
./zebra/zebra_dplane.h:54:10: error: invalid use of undefined type struct zebra_dplane_info
./zebra/zebra_dplane.h:57:10: error: invalid use of undefined type struct zebra_dplane_info

Debian 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB11AMD64/config.log/config.log.gz

Fedora 29 amd64 build: Failed (click for details)

Make failed for Fedora 29 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32,

Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/F29BUILD/config.status/config.status
Fedora 29 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/F29BUILD/config.log/config.log.gz

Ubuntu 18.04 arm8 build: Failed (click for details)

Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM8BUILD/config.log/config.log.gz

Make failed for Ubuntu 18.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Ubuntu 16.04 arm7 build: Failed (click for details)

Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI101BUILD/config.log/config.log.gz

Make failed for Ubuntu 16.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI101BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

CentOS 8 amd64 build: Failed (click for details)

CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CENTOS8BUILD/config.status/config.status

Make failed for CentOS 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32,

CentOS 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CENTOS8BUILD/config.log/config.log.gz

CentOS 7 amd64 build: Failed (click for details)

Make failed for CentOS 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI005BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory `/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI005BUILD/config.status/config.status
CentOS 7 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI005BUILD/config.log/config.log.gz

Debian 10 amd64 build: Failed (click for details)

Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB10BUILD/config.log/config.log.gz

Make failed for Debian 10 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32,

Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB10BUILD/config.status/config.status

FreeBSD 12 amd64 build: Failed (click for details)

Make failed for FreeBSD 12 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/FBSD12AMD64/config.status/config.status
FreeBSD 12 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/FBSD12AMD64/config.log/config.log.gz

NetBSD 8 amd64 build: Failed (click for details)

NetBSD 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI012BUILD/config.log/config.log.gz

Make failed for NetBSD 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI012BUILD/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or '(' before '<<' token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or '(' before '>>' token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI012BUILD/config.status/config.status

OpenBSD 6 amd64 build: Failed (click for details)

Make failed for OpenBSD 6 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI011BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/zebra_mpls_vty.c:37:
vtysh/../zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
In file included from zebra/zebra_pw.c:34:
vtysh/../zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
<<<<<<< HEAD

OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI011BUILD/config.status/config.status
OpenBSD 6 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI011BUILD/config.log/config.log.gz

Ubuntu 16.04 amd64 build: Failed (click for details)

Make failed for Ubuntu 16.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI014BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI014BUILD/config.status/config.status
Ubuntu 16.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI014BUILD/config.log/config.log.gz

FreeBSD 11 amd64 build: Failed (click for details)

Make failed for FreeBSD 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI009BUILD/ErrorLog/log_make.txt)

/usr/home/ci/cibuild.20464/frr-source/doc/user/zebra.rst:1183: WARNING: duplicate clicmd description of debug zebra pbr, other instance in pbr
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
In file included from ./zebra/rt.h:32,
./zebra/zebra_dplane.h:51:35: error: 'struct zebra_dplane_info' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
./zebra/zebra_dplane.h: In function 'zebra_dplane_info_from_zns':
./zebra/zebra_dplane.h:54:10: error: dereferencing pointer to incomplete type 'struct zebra_dplane_info'
cc1: all warnings being treated as errors

FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI009BUILD/config.status/config.status
FreeBSD 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI009BUILD/config.log/config.log.gz

Ubuntu 18.04 amd64 build: Failed (click for details)

Make failed for Ubuntu 18.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804AMD64/config.status/config.status
Ubuntu 18.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804AMD64/config.log/config.log.gz

Warnings Generated during build:

Checkout code: Successful with additional warnings

Ubuntu 18.04 arm7 build: Failed (click for details)

Make failed for Ubuntu 18.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM7BUILD/config.log/config.log.gz
Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM7BUILD/config.status/config.status

Ubuntu 18.04 i386 build: Failed (click for details)

Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18I386BUILD/config.log/config.log.gz Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18I386BUILD/config.status/config.status

Make failed for Ubuntu 18.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Debian 9 amd64 build: Failed (click for details)

Make failed for Debian 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI021BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI021BUILD/config.status/config.status
Debian 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI021BUILD/config.log/config.log.gz

Ubuntu 20.04 amd64 build: Failed (click for details)

Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U2004AMD64BUILD/config.status/config.status

Make failed for Ubuntu 20.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
In file included from ./zebra/rt.h:32,
./zebra/zebra_dplane.h:51:35: error: struct zebra_dplane_info declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
./zebra/zebra_dplane.h: In function zebra_dplane_info_from_zns:
./zebra/zebra_dplane.h:54:10: error: dereferencing pointer to incomplete type struct zebra_dplane_info
cc1: all warnings being treated as errors

Ubuntu 20.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U2004AMD64BUILD/config.log/config.log.gz

Ubuntu 18.04 ppc64le build: Failed (click for details)

Make failed for Ubuntu 18.04 ppc64le build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804PPC64LEBUILD/config.status/config.status
Ubuntu 18.04 ppc64le build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804PPC64LEBUILD/config.log/config.log.gz

Ubuntu 16.04 i386 build: Failed (click for details)

Make failed for Ubuntu 16.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1604I386/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1604I386/config.status/config.status
Ubuntu 16.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1604I386/config.log/config.log.gz

Ubuntu 16.04 arm8 build: Failed (click for details)

Make failed for Ubuntu 16.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U16ARM8BUILD/config.log/config.log.gz
Ubuntu 16.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U16ARM8BUILD/config.status/config.status

Debian 11 amd64 build: Failed (click for details)

Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB11AMD64/config.status/config.status

Make failed for Debian 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB11AMD64/ErrorLog/log_make.txt)

/home/ci/cibuild.20464/frr-source/doc/user/zebra.rst:1183: WARNING: duplicate clicmd description of debug zebra pbr, other instance in pbr
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
In file included from ./zebra/rt.h:32,
./zebra/zebra_dplane.h:51:35: error: struct zebra_dplane_info declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
./zebra/zebra_dplane.h: In function zebra_dplane_info_from_zns:
./zebra/zebra_dplane.h:54:10: error: invalid use of undefined type struct zebra_dplane_info
./zebra/zebra_dplane.h:57:10: error: invalid use of undefined type struct zebra_dplane_info

Debian 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB11AMD64/config.log/config.log.gz

Fedora 29 amd64 build: Failed (click for details)

Make failed for Fedora 29 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32,

Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/F29BUILD/config.status/config.status
Fedora 29 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/F29BUILD/config.log/config.log.gz

Ubuntu 18.04 arm8 build: Failed (click for details)

Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM8BUILD/config.log/config.log.gz

Make failed for Ubuntu 18.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Ubuntu 16.04 arm7 build: Failed (click for details)

Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI101BUILD/config.log/config.log.gz

Make failed for Ubuntu 16.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI101BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

CentOS 8 amd64 build: Failed (click for details)

CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CENTOS8BUILD/config.status/config.status

Make failed for CentOS 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32,

CentOS 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CENTOS8BUILD/config.log/config.log.gz

CentOS 7 amd64 build: Failed (click for details)

Make failed for CentOS 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI005BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory `/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI005BUILD/config.status/config.status
CentOS 7 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI005BUILD/config.log/config.log.gz

Debian 10 amd64 build: Failed (click for details)

Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB10BUILD/config.log/config.log.gz

Make failed for Debian 10 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32,

Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/DEB10BUILD/config.status/config.status

FreeBSD 12 amd64 build: Failed (click for details)

Make failed for FreeBSD 12 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/FBSD12AMD64/config.status/config.status
FreeBSD 12 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/FBSD12AMD64/config.log/config.log.gz

NetBSD 8 amd64 build: Failed (click for details)

NetBSD 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI012BUILD/config.log/config.log.gz

Make failed for NetBSD 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI012BUILD/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or '(' before '<<' token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or '(' before '>>' token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI012BUILD/config.status/config.status

OpenBSD 6 amd64 build: Failed (click for details)

Make failed for OpenBSD 6 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI011BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/zebra_mpls_vty.c:37:
vtysh/../zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
In file included from zebra/zebra_pw.c:34:
vtysh/../zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
<<<<<<< HEAD

OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI011BUILD/config.status/config.status
OpenBSD 6 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI011BUILD/config.log/config.log.gz

Ubuntu 16.04 amd64 build: Failed (click for details)

Make failed for Ubuntu 16.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI014BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./zebra/zebra_rnh.h:76:1: error: expected identifier or ( before >> token
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^
In file included from ./zebra/rt.h:32:0,

Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI014BUILD/config.status/config.status
Ubuntu 16.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI014BUILD/config.log/config.log.gz

FreeBSD 11 amd64 build: Failed (click for details)

Make failed for FreeBSD 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI009BUILD/ErrorLog/log_make.txt)

/usr/home/ci/cibuild.20464/frr-source/doc/user/zebra.rst:1183: WARNING: duplicate clicmd description of debug zebra pbr, other instance in pbr
In file included from zebra/main.c:53:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
In file included from ./zebra/rt.h:32,
./zebra/zebra_dplane.h:51:35: error: 'struct zebra_dplane_info' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
./zebra/zebra_dplane.h: In function 'zebra_dplane_info_from_zns':
./zebra/zebra_dplane.h:54:10: error: dereferencing pointer to incomplete type 'struct zebra_dplane_info'
cc1: all warnings being treated as errors

FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI009BUILD/config.status/config.status
FreeBSD 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/CI009BUILD/config.log/config.log.gz

Ubuntu 18.04 amd64 build: Failed (click for details)

Make failed for Ubuntu 18.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20464/frr-source'
In file included from zebra/main.c:53:0:
./zebra/zebra_rnh.h:67:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./zebra/zebra_rnh.h:76:1: error: version control conflict marker in file
 >>>>>>> b59839af7 (zebra: When passing lookup information back pass the fully resolved)
 ^~~~~~~
In file included from ./zebra/rt.h:32:0,

Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804AMD64/config.status/config.status
Ubuntu 18.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20464/artifact/U1804AMD64/config.log/config.log.gz

Report for zebra_rnh.c | 18 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #591: FILE: /tmp/f1-3147/zebra_rnh.c:591:
< ERROR: spaces required around that '==' (ctx:ExO)
< #594: FILE: /tmp/f1-3147/zebra_rnh.c:594:
< ERROR: spaces required around that '==' (ctx:OxO)
< #594: FILE: /tmp/f1-3147/zebra_rnh.c:594:
< ERROR: spaces required around that '==' (ctx:OxO)
< #594: FILE: /tmp/f1-3147/zebra_rnh.c:594:
< ERROR: spaces required around that '=' (ctx:OxE)
< #594: FILE: /tmp/f1-3147/zebra_rnh.c:594:
< WARNING: line over 80 characters
< #601: FILE: /tmp/f1-3147/zebra_rnh.c:601:
< WARNING: space prohibited between function name and open parenthesis '('
< #601: FILE: /tmp/f1-3147/zebra_rnh.c:601:
< ERROR: spaces required around that '>' (ctx:OxW)
< #601: FILE: /tmp/f1-3147/zebra_rnh.c:601:
< ERROR: spaces required around that ':' (ctx:VxW)
< #601: FILE: /tmp/f1-3147/zebra_rnh.c:601:
Report for zebra_rnh.h | 18 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #67: FILE: /tmp/f1-3147/zebra_rnh.h:67:
< ERROR: spaces required around that '==' (ctx:ExO)
< #68: FILE: /tmp/f1-3147/zebra_rnh.h:68:
< ERROR: spaces required around that '==' (ctx:OxO)
< #68: FILE: /tmp/f1-3147/zebra_rnh.h:68:
< ERROR: spaces required around that '==' (ctx:OxO)
< #68: FILE: /tmp/f1-3147/zebra_rnh.h:68:
< ERROR: spaces required around that '=' (ctx:OxE)
< #68: FILE: /tmp/f1-3147/zebra_rnh.h:68:
< WARNING: line over 80 characters
< #76: FILE: /tmp/f1-3147/zebra_rnh.h:76:
< WARNING: space prohibited between function name and open parenthesis '('
< #76: FILE: /tmp/f1-3147/zebra_rnh.h:76:
< ERROR: spaces required around that '>' (ctx:OxW)
< #76: FILE: /tmp/f1-3147/zebra_rnh.h:76:
< ERROR: spaces required around that ':' (ctx:VxW)
< #76: FILE: /tmp/f1-3147/zebra_rnh.h:76:

mwinter-osr · 2021-07-25T13:29:31Z

Closing. See PR #9179. PR depends on another fix and is resubmitted as a combined PR there

mergify bot added the conflicts label Jul 23, 2021

polychaeta added the zebra label Jul 23, 2021

mergify bot mentioned this pull request Jul 23, 2021

pimd: When passing lookup information back pass the fully resolved #9001

Merged

mwinter-osr closed this Jul 25, 2021

mergify bot deleted the mergify/bp/stable/8.0/pr-9001 branch July 25, 2021 13:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pimd: When passing lookup information back pass the fully resolved (backport #9001) #9148

pimd: When passing lookup information back pass the fully resolved (backport #9001) #9148

mergify bot commented Jul 23, 2021

NetDEF-CI commented Jul 23, 2021

mwinter-osr commented Jul 25, 2021

pimd: When passing lookup information back pass the fully resolved (backport #9001) #9148

pimd: When passing lookup information back pass the fully resolved (backport #9001) #9148

Conversation

mergify bot commented Jul 23, 2021

NetDEF-CI commented Jul 23, 2021

Continuous Integration Result: FAILED

Get source / Pull Request: Successful

Building Stage: Failed

Warnings Generated during build:

mwinter-osr commented Jul 25, 2021