linux-kernel - linux-next: build failure after merge of the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200110105738.2b20cbad@canb.auug.org.au>
Date:   Fri, 10 Jan 2020 10:57:38 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Petr Machata <petrm@...lanox.com>
Subject: linux-next: build failure after merge of the net-next tree

Hi all,

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

drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c: In function '__mlxsw_sp_qdisc_ets_graft':
drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c:770:7: error: 'p' undeclared (first use in this function); did you mean 'up'?
  770 |  if (!p->child_handle) {
      |       ^
      |       up

Caused by commit

  345457a6e2cd ("Merge remote-tracking branch 'net-next/master'")

i.e. an incorrect automatic merge between commit

  3971a535b839 ("mlxsw: spectrum_qdisc: Ignore grafting of invisible FIFO")

from Linus' tree and commit

  7917f52ae188 ("mlxsw: spectrum_qdisc: Generalize PRIO offload to support ETS")

from the net-next tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Fri, 10 Jan 2020 10:52:33 +1100
Subject: [PATCH] mlxws: fix up for "mlxsw: spectrum_qdisc: Ignore grafting of invisible FIFO"

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
index 17b29e2d19ed..54807b4930fe 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
@@ -767,7 +767,7 @@ __mlxsw_sp_qdisc_ets_graft(struct mlxsw_sp_port *mlxsw_sp_port,
 	    mlxsw_sp_port->tclass_qdiscs[tclass_num].handle == child_handle)
 		return 0;
 
-	if (!p->child_handle) {
+	if (!child_handle) {
 		/* This is an invisible FIFO replacing the original Qdisc.
 		 * Ignore it--the original Qdisc's destroy will follow.
 		 */
-- 
2.24.0

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped