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

bfdd: Some interfaces don't have mac addresses (backport #11759) #11764

Closed
wants to merge 1 commit into from
Closed

bfdd: Some interfaces don't have mac addresses (backport #11759) #11764

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 8, 2022

This is an automatic backport of pull request #11759 done by Mergify.
Cherry-pick of 97739c2 has failed:

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

You are currently cherry-picking commit 97739c280.
  (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:   bfdd/bfd_packet.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

@donaldsharp @mergify
bfdd: Some interfaces don't have mac addresses
e122e7d 
When an interface does not have a mac address, don't
try to retrieve the mac address ( for it to just fail ).

Example interface:
sharpd@eva [2]> ip link show tun100
21: tun100@NONE: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1480 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
    link/ipip 192.168.119.224 peer 192.168.119.120

Let's just notice that there is a NOARP flag and abort the call.

Fixes: #11733
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 97739c2)

# Conflicts:
#	bfdd/bfd_packet.c
@mergify mergify bot added the conflicts label Aug 8, 2022
@mergify mergify bot mentioned this pull request Aug 8, 2022
Merged
@ton31337 ton31337 closed this Aug 8, 2022
@ton31337 ton31337 deleted the mergify/bp/stable/8.3/pr-11759 branch August 8, 2022 07:12
@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

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

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

OpenBSD 7 amd64 build: Failed (click for details)

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

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:10321: bfdd/bfd_packet.o] Error 1
/home/ci/cibuild.6823/frr-source/doc/user/isisd.rst:43: WARNING: duplicate clicmd description of net XX.XXXX. ... .XXX.XX, other instance in fabricd
/home/ci/cibuild.6823/frr-source/doc/user/isisd.rst:53: WARNING: duplicate clicmd description of domain-password [clear | md5] <password>, other instance in fabricd

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

Redhat 8 amd64 build: Failed (click for details) Redhat 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/REDHAT8/config.log/config.log.gz

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

Redhat 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/REDHAT8/config.status/config.status

Debian 10 amd64 build: Failed (click for details) Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/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-PULLREQ2-6823/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

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-PULLREQ2-6823/artifact/CI005BUILD/ErrorLog/log_make.txt)

pimd/pim_msdp.c:706:9: warning: missing braces around initializer [-Wmissing-braces]
pimd/pim_msdp.c:706:9: warning: (near initialization for nexthop.last_lookup) [-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.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.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".

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

/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
bfdd/bfd_packet.c:1260:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
bfdd/bfd_packet.c:1303:1: error: expected identifier or ( before >> token
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
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-PULLREQ2-6823/artifact/CI009BUILD/ErrorLog/log_make.txt)

gmake  all-am
gmake[1]: Entering directory '/usr/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character

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

Ubuntu 22.04 amd64 build: Failed (click for details) Ubuntu 22.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/U22AMD64BUILD/config.status/config.status

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]

Ubuntu 22.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/U22AMD64BUILD/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-PULLREQ2-6823/artifact/CI021BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
bfdd/bfd_packet.c:1260:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
bfdd/bfd_packet.c:1303:1: error: expected identifier or ( before >> token
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

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-PULLREQ2-6823/artifact/U1804AMD64/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

Ubuntu 16.04 amd64 build: Failed (click for details)

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

/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
bfdd/bfd_packet.c:1260:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
bfdd/bfd_packet.c:1303:1: error: expected identifier or ( before >> token
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

Redhat 9 amd64 build: Failed (click for details) Redhat 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/RH9BUILD/config.log/config.log.gz

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]

Redhat 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/RH9BUILD/config.status/config.status

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-PULLREQ2-6823/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-PULLREQ2-6823/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]

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

Ubuntu 18.04 ppc64le build: Failed (click for details)

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

NetBSD 9 amd64 build: Failed (click for details) NetBSD 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/CI012BUILD/config.log/config.log.gz

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

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)

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

FreeBSD 12 amd64 build: Failed (click for details)

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

gmake  all-am
gmake[1]: Entering directory '/usr/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
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-PULLREQ2-6823/artifact/F29BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/DEB11AMD64/config.status/config.status

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]

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

Ubuntu 18.04 arm8 build: Failed (click for details) Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/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-PULLREQ2-6823/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
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-PULLREQ2-6823/artifact/U1604I386/ErrorLog/log_make.txt)

/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
bfdd/bfd_packet.c:1260:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
bfdd/bfd_packet.c:1303:1: error: expected identifier or ( before >> token
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

Warnings Generated during build:

Checkout code: Successful with additional warnings
OpenBSD 7 amd64 build: Failed (click for details)

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

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:10321: bfdd/bfd_packet.o] Error 1
/home/ci/cibuild.6823/frr-source/doc/user/isisd.rst:43: WARNING: duplicate clicmd description of net XX.XXXX. ... .XXX.XX, other instance in fabricd
/home/ci/cibuild.6823/frr-source/doc/user/isisd.rst:53: WARNING: duplicate clicmd description of domain-password [clear | md5] <password>, other instance in fabricd

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

Redhat 8 amd64 build: Failed (click for details) Redhat 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/REDHAT8/config.log/config.log.gz

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

Redhat 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/REDHAT8/config.status/config.status

Debian 10 amd64 build: Failed (click for details) Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/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-PULLREQ2-6823/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

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-PULLREQ2-6823/artifact/CI005BUILD/ErrorLog/log_make.txt)

pimd/pim_msdp.c:706:9: warning: missing braces around initializer [-Wmissing-braces]
pimd/pim_msdp.c:706:9: warning: (near initialization for nexthop.last_lookup) [-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.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.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".

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

/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
bfdd/bfd_packet.c:1260:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
bfdd/bfd_packet.c:1303:1: error: expected identifier or ( before >> token
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
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-PULLREQ2-6823/artifact/CI009BUILD/ErrorLog/log_make.txt)

gmake  all-am
gmake[1]: Entering directory '/usr/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character

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

Ubuntu 22.04 amd64 build: Failed (click for details) Ubuntu 22.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/U22AMD64BUILD/config.status/config.status

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]

Ubuntu 22.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/U22AMD64BUILD/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-PULLREQ2-6823/artifact/CI021BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
bfdd/bfd_packet.c:1260:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
bfdd/bfd_packet.c:1303:1: error: expected identifier or ( before >> token
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

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-PULLREQ2-6823/artifact/U1804AMD64/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

Ubuntu 16.04 amd64 build: Failed (click for details)

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

/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
bfdd/bfd_packet.c:1260:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
bfdd/bfd_packet.c:1303:1: error: expected identifier or ( before >> token
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

Redhat 9 amd64 build: Failed (click for details) Redhat 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/RH9BUILD/config.log/config.log.gz

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]

Redhat 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/RH9BUILD/config.status/config.status

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-PULLREQ2-6823/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-PULLREQ2-6823/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]

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

Ubuntu 18.04 ppc64le build: Failed (click for details)

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

NetBSD 9 amd64 build: Failed (click for details) NetBSD 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/CI012BUILD/config.log/config.log.gz

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

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)

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

FreeBSD 12 amd64 build: Failed (click for details)

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

gmake  all-am
gmake[1]: Entering directory '/usr/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
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-PULLREQ2-6823/artifact/F29BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/DEB11AMD64/config.status/config.status

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

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 1260 | <<<<<<< HEAD
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
 1303 | >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
bfdd/bfd_packet.c:1303:45: error: missing terminating ' character [-Werror]

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

Ubuntu 18.04 arm8 build: Failed (click for details) Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-6823/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-PULLREQ2-6823/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory '/home/ci/cibuild.6823/frr-source'
bfdd/bfd_packet.c:1260:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
bfdd/bfd_packet.c:1303:1: error: version control conflict marker in file
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^~~~~~~
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant
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-PULLREQ2-6823/artifact/U1604I386/ErrorLog/log_make.txt)

/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.6823/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
bfdd/bfd_packet.c:1260:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
bfdd/bfd_packet.c:1303:1: error: expected identifier or ( before >> token
 >>>>>>> 97739c280 (bfdd: Some interfaces don't have mac addresses)
 ^
bfdd/bfd_packet.c:1303:9: error: invalid suffix "c280" on integer constant

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

Report for bfd_packet.c | 16 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #1260: FILE: /tmp/f1-14041/bfd_packet.c:1260:
< ERROR: spaces required around that '==' (ctx:ExO)
< #1261: FILE: /tmp/f1-14041/bfd_packet.c:1261:
< ERROR: spaces required around that '==' (ctx:OxO)
< #1261: FILE: /tmp/f1-14041/bfd_packet.c:1261:
< ERROR: spaces required around that '==' (ctx:OxO)
< #1261: FILE: /tmp/f1-14041/bfd_packet.c:1261:
< ERROR: spaces required around that '=' (ctx:OxE)
< #1261: FILE: /tmp/f1-14041/bfd_packet.c:1261:
< WARNING: space prohibited between function name and open parenthesis '('
< #1303: FILE: /tmp/f1-14041/bfd_packet.c:1303:
< ERROR: spaces required around that '>' (ctx:OxW)
< #1303: FILE: /tmp/f1-14041/bfd_packet.c:1303:
< ERROR: spaces required around that ':' (ctx:VxW)
< #1303: FILE: /tmp/f1-14041/bfd_packet.c:1303:

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
bfd bugfix conflicts stable/8.3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@NetDEF-CI @ton31337 @donaldsharp