Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

isisd: fix crash when configuring srv6 locator without isis instance (backport #14453) #14461

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 21, 2023

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

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

You are currently cherry-picking commit f4ac971fc.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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.com

After the ISIS daemon is launched, the configuration of an srv6
locator in zebra triggers a crash:

> #4  0x00007f1f0ea980f3 in core_handler (signo=11, siginfo=0x7ffdb750de70, context=0x7ffdb750dd40)
>     at /build/make-pkg/output/_packages/cp-routing/src/lib/sigevent.c:262
> #5  <signal handler called>
> #6  0x00005651a05783ef in isis_zebra_process_srv6_locator_add (cmd=117, zclient=0x5651a21d9bd0, length=25, vrf_id=0)
>     at /build/make-pkg/output/_packages/cp-routing/src/isisd/isis_zebra.c:1258
> #7  0x00007f1f0ead5ac9 in zclient_read (thread=0x7ffdb750e750) at /build/make-pkg/output/_packages/cp-routing/src/lib/zclient.c:4246
> #8  0x00007f1f0eab19d4 in thread_call (thread=0x7ffdb750e750) at /build/make-pkg/output/_packages/cp-routing/src/lib/thread.c:1825
> #9  0x00007f1f0ea4862e in frr_run (master=0x5651a1f65a40) at /build/make-pkg/output/_packages/cp-routing/src/lib/libfrr.c:1155
> #10 0x00005651a051131a in main (argc=5, argv=0x7ffdb750e998, envp=0x7ffdb750e9c8)
>     at /build/make-pkg/output/_packages/cp-routing/src/isisd/isis_main.c:282
> (gdb) f 6
> #6  0x00005651a05783ef in isis_zebra_process_srv6_locator_add (cmd=117, zclient=0x5651a21d9bd0, length=25, vrf_id=0)
>     at /build/make-pkg/output/_packages/cp-routing/src/isisd/isis_zebra.c:1258
> (gdb) print isis
> $1 = (struct isis *) 0x0
> (gdb) print isis->area_list
> Cannot access memory at address 0x28

The isis pointer is NULL, because no instances have already been
configured on the ISIS instance.
Fix this by checking that there is any isis instance available when
zebra hooks related to srv6 are received.

Signed-off-by: Philippe Guibert <[email protected]>
(cherry picked from commit f4ac971)

# Conflicts:
#	isisd/isis_zebra.c
@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

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

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

Redhat 8 amd64 build: Failed (click for details) Redhat 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/REDHAT8/config.status/config.status

Make failed for Redhat 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/REDHAT8/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32,

Redhat 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/REDHAT8/config.log/config.log.gz

OpenBSD 7 amd64 build: Failed (click for details) OpenBSD 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI011BUILD/config.log/config.log.gz OpenBSD 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI011BUILD/config.status/config.status

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

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:10251: isisd/isis_zebra.o] Error 1
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
<<<<<<< HEAD
Debian 10 amd64 build: Failed (click for details) Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/DEB10BUILD/config.status/config.status

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32,

Debian 10 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/DEB10BUILD/config.log/config.log.gz

CentOS 7 amd64 build: Failed (click for details) CentOS 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI005BUILD/config.log/config.log.gz CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI005BUILD/config.status/config.status

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

pimd/pim_cmd_common.c:4893:2: warning: missing braces around initializer [-Wmissing-braces]
pimd/pim_cmd_common.c:4893:2: warning: (near initialization for sg.grp) [-Wmissing-braces]
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.  CC       bgpd/bgp_addpath.o
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed./home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
Ubuntu 18.04 i386 build: Failed (click for details)

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

make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
/home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,

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

Ubuntu 18.04 amd64 build: Failed (click for details) Ubuntu 18.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U1804AMD64/config.log/config.log.gz Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U1804AMD64/config.status/config.status

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

make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
/home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
Ubuntu 22.04 amd64 build: Failed (click for details) Ubuntu 22.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U22AMD64BUILD/config.log/config.log.gz

Make failed for Ubuntu 22.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U22AMD64BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:41: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function isis_zebra_srv6_sid_install:
isisd/isis_zebra.c:918:22: error: invalid use of undefined type struct isis_srv6_sid
./lib/zlog.h:120:43: note: in definition of macro _zlog_ecref

Ubuntu 22.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U22AMD64BUILD/config.status/config.status

FreeBSD 11 amd64 build: Failed (click for details) FreeBSD 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI009BUILD/config.log/config.log.gz FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI009BUILD/config.status/config.status

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

gmake  all-am
gmake[1]: Entering directory '/usr/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:13: error: 'struct isis_srv6_sid' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for 'isis_zebra_srv6_sid_install' [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function 'isis_zebra_srv6_sid_install':
isisd/isis_zebra.c:918:8: error: invalid use of undefined type 'struct isis_srv6_sid'
./lib/zlog.h:120:29: note: in definition of macro '_zlog_ecref'
Debian 9 amd64 build: Failed (click for details) Debian 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI021BUILD/config.log/config.log.gz Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI021BUILD/config.status/config.status

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

/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
Redhat 9 amd64 build: Failed (click for details) Redhat 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/RH9BUILD/config.status/config.status

Make failed for Redhat 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/RH9BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:41: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function isis_zebra_srv6_sid_install:
isisd/isis_zebra.c:918:22: error: invalid use of undefined type struct isis_srv6_sid
./lib/zlog.h:120:43: note: in definition of macro _zlog_ecref

Redhat 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/RH9BUILD/config.log/config.log.gz

Ubuntu 20.04 amd64 build: Failed (click for details) Ubuntu 20.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U2004AMD64BUILD/config.log/config.log.gz

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function isis_zebra_srv6_sid_install:
isisd/isis_zebra.c:918:8: error: dereferencing pointer to incomplete type struct isis_srv6_sid
./lib/zlog.h:120:29: note: in definition of macro _zlog_ecref

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

Ubuntu 18.04 ppc64le build: Failed (click for details) Ubuntu 18.04 ppc64le build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U1804PPC64LEBUILD/config.log/config.log.gz Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U1804PPC64LEBUILD/config.status/config.status

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

make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
/home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
FreeBSD 12 amd64 build: Failed (click for details) FreeBSD 12 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/FBSD12AMD64/config.log/config.log.gz FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/FBSD12AMD64/config.status/config.status

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

gmake  all-am
gmake[1]: Entering directory '/usr/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: 'struct isis_srv6_sid' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for 'isis_zebra_srv6_sid_install' [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
Ubuntu 18.04 arm7 build: Failed (click for details) Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U18ARM7BUILD/config.status/config.status Ubuntu 18.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U18ARM7BUILD/config.log/config.log.gz

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

make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
/home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/DEB11AMD64/config.log/config.log.gz

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function isis_zebra_srv6_sid_install:
isisd/isis_zebra.c:918:8: error: invalid use of undefined type struct isis_srv6_sid
./lib/zlog.h:120:29: note: in definition of macro _zlog_ecref

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

Ubuntu 18.04 arm8 build: Failed (click for details)

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,

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

Warnings Generated during build:

Checkout code: Successful with additional warnings
Redhat 8 amd64 build: Failed (click for details) Redhat 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/REDHAT8/config.status/config.status

Make failed for Redhat 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/REDHAT8/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32,

Redhat 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/REDHAT8/config.log/config.log.gz

OpenBSD 7 amd64 build: Failed (click for details) OpenBSD 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI011BUILD/config.log/config.log.gz OpenBSD 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI011BUILD/config.status/config.status

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

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:10251: isisd/isis_zebra.o] Error 1
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
<<<<<<< HEAD
Debian 10 amd64 build: Failed (click for details) Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/DEB10BUILD/config.status/config.status

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32,

Debian 10 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/DEB10BUILD/config.log/config.log.gz

CentOS 7 amd64 build: Failed (click for details) CentOS 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI005BUILD/config.log/config.log.gz CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI005BUILD/config.status/config.status

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

pimd/pim_cmd_common.c:4893:2: warning: missing braces around initializer [-Wmissing-braces]
pimd/pim_cmd_common.c:4893:2: warning: (near initialization for sg.grp) [-Wmissing-braces]
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.  CC       bgpd/bgp_addpath.o
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed./home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
Ubuntu 18.04 i386 build: Failed (click for details)

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

make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
/home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,

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

Ubuntu 18.04 amd64 build: Failed (click for details) Ubuntu 18.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U1804AMD64/config.log/config.log.gz Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U1804AMD64/config.status/config.status

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

make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
/home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
Ubuntu 22.04 amd64 build: Failed (click for details) Ubuntu 22.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U22AMD64BUILD/config.log/config.log.gz

Make failed for Ubuntu 22.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U22AMD64BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:41: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function isis_zebra_srv6_sid_install:
isisd/isis_zebra.c:918:22: error: invalid use of undefined type struct isis_srv6_sid
./lib/zlog.h:120:43: note: in definition of macro _zlog_ecref

Ubuntu 22.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U22AMD64BUILD/config.status/config.status

FreeBSD 11 amd64 build: Failed (click for details) FreeBSD 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI009BUILD/config.log/config.log.gz FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI009BUILD/config.status/config.status

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

gmake  all-am
gmake[1]: Entering directory '/usr/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:13: error: 'struct isis_srv6_sid' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for 'isis_zebra_srv6_sid_install' [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function 'isis_zebra_srv6_sid_install':
isisd/isis_zebra.c:918:8: error: invalid use of undefined type 'struct isis_srv6_sid'
./lib/zlog.h:120:29: note: in definition of macro '_zlog_ecref'
Debian 9 amd64 build: Failed (click for details) Debian 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI021BUILD/config.log/config.log.gz Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/CI021BUILD/config.status/config.status

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

/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.14280/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
Redhat 9 amd64 build: Failed (click for details) Redhat 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/RH9BUILD/config.status/config.status

Make failed for Redhat 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/RH9BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:41: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function isis_zebra_srv6_sid_install:
isisd/isis_zebra.c:918:22: error: invalid use of undefined type struct isis_srv6_sid
./lib/zlog.h:120:43: note: in definition of macro _zlog_ecref

Redhat 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/RH9BUILD/config.log/config.log.gz

Ubuntu 20.04 amd64 build: Failed (click for details) Ubuntu 20.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U2004AMD64BUILD/config.log/config.log.gz

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function isis_zebra_srv6_sid_install:
isisd/isis_zebra.c:918:8: error: dereferencing pointer to incomplete type struct isis_srv6_sid
./lib/zlog.h:120:29: note: in definition of macro _zlog_ecref

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

Ubuntu 18.04 ppc64le build: Failed (click for details) Ubuntu 18.04 ppc64le build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U1804PPC64LEBUILD/config.log/config.log.gz Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U1804PPC64LEBUILD/config.status/config.status

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

make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
/home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
FreeBSD 12 amd64 build: Failed (click for details) FreeBSD 12 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/FBSD12AMD64/config.log/config.log.gz FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/FBSD12AMD64/config.status/config.status

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

gmake  all-am
gmake[1]: Entering directory '/usr/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: 'struct isis_srv6_sid' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for 'isis_zebra_srv6_sid_install' [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
Ubuntu 18.04 arm7 build: Failed (click for details) Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U18ARM7BUILD/config.status/config.status Ubuntu 18.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/U18ARM7BUILD/config.log/config.log.gz

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

make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
/home/ci/cibuild.14280/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /home/ci/cibuild.14280/frr-source/doc/user/nexthop_groups.rst
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,
Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-14280/artifact/DEB11AMD64/config.log/config.log.gz

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
In file included from ./lib/log.h:32,
isisd/isis_zebra.c: In function isis_zebra_srv6_sid_install:
isisd/isis_zebra.c:918:8: error: invalid use of undefined type struct isis_srv6_sid
./lib/zlog.h:120:29: note: in definition of macro _zlog_ecref

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

Ubuntu 18.04 arm8 build: Failed (click for details)

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.14280/frr-source'
isisd/isis_zebra.c:831:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
isisd/isis_zebra.c:907:13: error: struct isis_srv6_sid declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
isisd/isis_zebra.c:906:6: error: no previous prototype for isis_zebra_srv6_sid_install [-Werror=missing-prototypes]
 void isis_zebra_srv6_sid_install(struct isis_area *area,
In file included from ./lib/log.h:32:0,

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

Report for isis_zebra.c | 38 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #831: FILE: /tmp/f1-1852111/isis_zebra.c:831:
< ERROR: spaces required around that '==' (ctx:ExO)
< #832: FILE: /tmp/f1-1852111/isis_zebra.c:832:
< ERROR: spaces required around that '==' (ctx:OxO)
< #832: FILE: /tmp/f1-1852111/isis_zebra.c:832:
< ERROR: spaces required around that '==' (ctx:OxO)
< #832: FILE: /tmp/f1-1852111/isis_zebra.c:832:
< ERROR: spaces required around that '=' (ctx:OxE)
< #832: FILE: /tmp/f1-1852111/isis_zebra.c:832:
< WARNING: quoted string split across lines
< #1156: FILE: /tmp/f1-1852111/isis_zebra.c:1156:
< WARNING: Block comments use a trailing */ on a separate line
< #1184: FILE: /tmp/f1-1852111/isis_zebra.c:1184:
< WARNING: Block comments use a trailing */ on a separate line
< #1195: FILE: /tmp/f1-1852111/isis_zebra.c:1195:
< WARNING: quoted string split across lines
< #1244: FILE: /tmp/f1-1852111/isis_zebra.c:1244:
< WARNING: Block comments use a trailing */ on a separate line
< #1253: FILE: /tmp/f1-1852111/isis_zebra.c:1253:
< WARNING: line over 80 characters
< #1256: FILE: /tmp/f1-1852111/isis_zebra.c:1256:
< WARNING: quoted string split across lines
< #1259: FILE: /tmp/f1-1852111/isis_zebra.c:1259:
< WARNING: quoted string split across lines
< #1296: FILE: /tmp/f1-1852111/isis_zebra.c:1296:
< WARNING: Block comments use a trailing */ on a separate line
< #1317: FILE: /tmp/f1-1852111/isis_zebra.c:1317:
< WARNING: Block comments use a trailing */ on a separate line
< #1342: FILE: /tmp/f1-1852111/isis_zebra.c:1342:
< WARNING: line over 80 characters
< #1374: FILE: /tmp/f1-1852111/isis_zebra.c:1374:
< WARNING: space prohibited between function name and open parenthesis '('
< #1374: FILE: /tmp/f1-1852111/isis_zebra.c:1374:
< ERROR: spaces required around that '>' (ctx:OxW)
< #1374: FILE: /tmp/f1-1852111/isis_zebra.c:1374:
< ERROR: spaces required around that ':' (ctx:VxW)
< #1374: FILE: /tmp/f1-1852111/isis_zebra.c:1374:

@ton31337
Copy link
Member

Not in stable/8.5.

@ton31337 ton31337 closed this Sep 22, 2023
@ton31337 ton31337 deleted the mergify/bp/stable/8.5/pr-14453 branch September 22, 2023 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants