Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 15 Mar 2022 22:44:21 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Vladimir Oltean <vladimir.oltean@nxp.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the net-next tree
Message-ID: <20220315224421.23a8def1@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/u9Y+4SMt+b9MeJhzmI11hoN";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/u9Y+4SMt+b9MeJhzmI11hoN
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the net-next tree, today's linux-next build (arm64
defconfig) failed like this:

drivers/net/ethernet/mscc/ocelot.c: In function 'ocelot_port_set_default_pr=
io':
drivers/net/ethernet/mscc/ocelot.c:2920:21: error: 'IEEE_8021QAZ_MAX_TCS' u=
ndeclared (first use in this function)
 2920 |         if (prio >=3D IEEE_8021QAZ_MAX_TCS)
      |                     ^~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/mscc/ocelot.c:2920:21: note: each undeclared identifie=
r is reported only once for each function it appears in
drivers/net/ethernet/mscc/ocelot.c: In function 'ocelot_port_add_dscp_prio':
drivers/net/ethernet/mscc/ocelot.c:2962:21: error: 'IEEE_8021QAZ_MAX_TCS' u=
ndeclared (first use in this function)
 2962 |         if (prio >=3D IEEE_8021QAZ_MAX_TCS)
      |                     ^~~~~~~~~~~~~~~~~~~~

Caused by commit

  978777d0fb06 ("net: dsa: felix: configure default-prio and dscp prioritie=
s")

I have applied the following fix up patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Mar 2022 22:34:25 +1100
Subject: [PATCH] fixup for "net: dsa: felix: configure default-prio and dsc=
p priorities"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/mscc/ocelot.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc=
/ocelot.c
index 41dbb1e326c4..7c4bd3f8e7ec 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -7,6 +7,7 @@
 #include <linux/dsa/ocelot.h>
 #include <linux/if_bridge.h>
 #include <linux/ptp_classify.h>
+#include <net/dcbnl.h>
 #include <soc/mscc/ocelot_vcap.h>
 #include "ocelot.h"
 #include "ocelot_vcap.h"
--=20
2.34.1


--=20
Cheers,
Stephen Rothwell

--Sig_/u9Y+4SMt+b9MeJhzmI11hoN
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIwfBUACgkQAVBC80lX
0GyMbQgAgahDoiC6FAzw9S27/y1ElyAuLOYwCXFN7I+bbv98pI22SUm0XhaufTOz
OuipKroQN/w5C15nyMbAKiw5tvCXUIM1Bd4TlvUxZS65qBQ+8Aaci1ASWunMpC0T
1eZVUXrwhbwjumciKrlC+deEGWVW09MQ+yUCI2DDRFXofftbJNXlWVe3AC45/MBd
l6AJTzun5HcO3HzisgOFL+VEfVzOh/sh98vmLedRg9La2hJYYhvrcTqEw12gQRlr
AcXuPwrwTmND1URg/UB3qrYXJxELOq8A50i53Qb3uAl9nGWErnlGT2efV6QzaRQu
uhuMfv69fs9HB5d4XQ2kbUpmbb/PBA==
=/JqO
-----END PGP SIGNATURE-----

--Sig_/u9Y+4SMt+b9MeJhzmI11hoN--