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.

Sign up for GitHub

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

Jump to bottom

ospf6d : Send LSA update immediately when ospf instance is deleted (backport #8978) #9143

Closed
wants to merge 1 commit into from
Closed

ospf6d : Send LSA update immediately when ospf instance is deleted (backport #8978) #9143

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 23, 2021

This is an automatic backport of pull request #8978 done by Mergify.
Cherry-pick of 7359e9b has failed:

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

You are currently cherry-picking commit 7359e9ba7.
  (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:   ospf6d/ospf6_message.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.io/

@kssoman
ospf6d : Send LSA update immediately when ospf instance is deleted
7fedc4f 
Fix: The fix is to call ospf6_write to send the packet immediately to all neighbors

Signed-off-by: kssoman <somanks@gmail.com>
(cherry picked from commit 7359e9b)

# Conflicts:
#	ospf6d/ospf6_message.c
@mergify mergify bot added the conflicts label Jul 23, 2021
@mergify mergify bot mentioned this pull request Jul 23, 2021
Merged
@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

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

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 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-20459/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/CI021BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI021BUILD/config.status/config.status
Debian 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI021BUILD/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-20459/artifact/U1604I386/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before == token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/U1604I386/config.status/config.status
Ubuntu 16.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/U1604I386/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-20459/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-20459/artifact/CI012BUILD/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
ospf6d/ospf6_message.c: In function 'ospf6_send_lsupdate':
ospf6d/ospf6_message.c:2086:3: error: expected expression before '<<' token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before '==' token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ')' token
ospf6d/ospf6_message.c:2095:4: error: 'op' undeclared (first use in this function)

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

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-20459/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/U18ARM7BUILD/config.status/config.status

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-20459/artifact/CI014BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before == token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI014BUILD/config.status/config.status
Ubuntu 16.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI014BUILD/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-20459/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-20459/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 2086 | <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 2093 | =======
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
 2094 |       || (on->ospf6_if->state == OSPF6_INTERFACE_BDR))
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/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-20459/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 2086 | <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 2093 | =======
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
 2094 |       || (on->ospf6_if->state == OSPF6_INTERFACE_BDR))
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

Debian 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/CI011BUILD/ErrorLog/log_make.txt)

static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
3 warnings generated.
ospf6d/ospf6_message.c:2086:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
ospf6d/ospf6_message.c:2086: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-20459/artifact/CI011BUILD/config.status/config.status
OpenBSD 6 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI011BUILD/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-20459/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-20459/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/CI009BUILD/ErrorLog/log_make.txt)

 1033 | static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
ospf6d/ospf6_message.c: In function 'ospf6_send_lsupdate':
ospf6d/ospf6_message.c:2086:3: error: expected expression before '<<' token
 2086 | <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 2093 | =======
ospf6d/ospf6_message.c:2094:54: error: expected statement before ')' token
 2094 |       || (on->ospf6_if->state == OSPF6_INTERFACE_BDR))
ospf6d/ospf6_message.c:2095:4: error: 'op' undeclared (first use in this function); did you mean 'oh'?

FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI009BUILD/config.status/config.status
FreeBSD 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI009BUILD/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-20459/artifact/CI005BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory `/home/ci/cibuild.20459/frr-source'
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./home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD

CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI005BUILD/config.status/config.status
CentOS 7 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI005BUILD/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-20459/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before == token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/U16ARM8BUILD/config.status/config.status

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-20459/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?
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-20459/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
ospf6d/ospf6_message.c: In function 'ospf6_send_lsupdate':
ospf6d/ospf6_message.c:2086:3: error: expected expression before '<<' token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ')' token
ospf6d/ospf6_message.c:2095:4: error: 'op' undeclared (first use in this function); did you mean 'oh'?

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

Ubuntu 18.04 i386 build: Failed (click for details) Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/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-20459/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?
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-20459/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-20459/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/CI101BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before == token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Warnings Generated during build:

Checkout code: Successful with additional warnings
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-20459/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/CI021BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI021BUILD/config.status/config.status
Debian 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI021BUILD/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-20459/artifact/U1604I386/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before == token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/U1604I386/config.status/config.status
Ubuntu 16.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/U1604I386/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-20459/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-20459/artifact/CI012BUILD/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
ospf6d/ospf6_message.c: In function 'ospf6_send_lsupdate':
ospf6d/ospf6_message.c:2086:3: error: expected expression before '<<' token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before '==' token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ')' token
ospf6d/ospf6_message.c:2095:4: error: 'op' undeclared (first use in this function)

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

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-20459/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/U18ARM7BUILD/config.status/config.status

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-20459/artifact/CI014BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before == token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI014BUILD/config.status/config.status
Ubuntu 16.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI014BUILD/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-20459/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-20459/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 2086 | <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 2093 | =======
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
 2094 |       || (on->ospf6_if->state == OSPF6_INTERFACE_BDR))
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/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-20459/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 2086 | <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 2093 | =======
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
 2094 |       || (on->ospf6_if->state == OSPF6_INTERFACE_BDR))
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

Debian 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/CI011BUILD/ErrorLog/log_make.txt)

static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
3 warnings generated.
ospf6d/ospf6_message.c:2086:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
ospf6d/ospf6_message.c:2086: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-20459/artifact/CI011BUILD/config.status/config.status
OpenBSD 6 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI011BUILD/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-20459/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-20459/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/CI009BUILD/ErrorLog/log_make.txt)

 1033 | static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
ospf6d/ospf6_message.c: In function 'ospf6_send_lsupdate':
ospf6d/ospf6_message.c:2086:3: error: expected expression before '<<' token
 2086 | <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 2093 | =======
ospf6d/ospf6_message.c:2094:54: error: expected statement before ')' token
 2094 |       || (on->ospf6_if->state == OSPF6_INTERFACE_BDR))
ospf6d/ospf6_message.c:2095:4: error: 'op' undeclared (first use in this function); did you mean 'oh'?

FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI009BUILD/config.status/config.status
FreeBSD 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI009BUILD/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-20459/artifact/CI005BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory `/home/ci/cibuild.20459/frr-source'
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./home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD

CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI005BUILD/config.status/config.status
CentOS 7 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/artifact/CI005BUILD/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-20459/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before == token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/U16ARM8BUILD/config.status/config.status

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-20459/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?
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-20459/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
ospf6d/ospf6_message.c: In function 'ospf6_send_lsupdate':
ospf6d/ospf6_message.c:2086:3: error: expected expression before '<<' token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ')' token
ospf6d/ospf6_message.c:2095:4: error: 'op' undeclared (first use in this function); did you mean 'oh'?

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

Ubuntu 18.04 i386 build: Failed (click for details) Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/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-20459/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?
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-20459/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-20459/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20459/frr-source'
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: version control conflict marker in file
 =======
 ^~~~~~~
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function); did you mean oh?

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

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-20459/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20459/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-20459/artifact/CI101BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20459/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
ospf6d/ospf6_message.c: In function ospf6_send_lsupdate:
ospf6d/ospf6_message.c:2086:3: error: expected expression before << token
 <<<<<<< HEAD
ospf6d/ospf6_message.c:2093:1: error: expected expression before == token
 =======
 ^
ospf6d/ospf6_message.c:2094:54: error: expected statement before ) token
ospf6d/ospf6_message.c:2095:4: error: op undeclared (first use in this function)

Report for ospf6_message.c | 16 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #2086: FILE: /tmp/f1-18571/ospf6_message.c:2086:
< ERROR: spaces required around that '==' (ctx:ExO)
< #2093: FILE: /tmp/f1-18571/ospf6_message.c:2093:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2093: FILE: /tmp/f1-18571/ospf6_message.c:2093:
< ERROR: spaces required around that '==' (ctx:OxO)
< #2093: FILE: /tmp/f1-18571/ospf6_message.c:2093:
< ERROR: spaces required around that '=' (ctx:OxE)
< #2093: FILE: /tmp/f1-18571/ospf6_message.c:2093:
< WARNING: line over 80 characters
< #2151: FILE: /tmp/f1-18571/ospf6_message.c:2151:
< WARNING: space prohibited between function name and open parenthesis '('
< #2151: FILE: /tmp/f1-18571/ospf6_message.c:2151:
< ERROR: spaces required around that '>' (ctx:OxW)
< #2151: FILE: /tmp/f1-18571/ospf6_message.c:2151:

@idryzhov idryzhov closed this Jul 23, 2021
@mergify mergify bot deleted the mergify/bp/stable/8.0/pr-8978 branch July 23, 2021 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicts ospfv3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@NetDEF-CI @idryzhov @polychaeta @kssoman