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, 10 May 2022 13:05:56 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Taehee Yoo <ap420073@gmail.com>,
        Martin Habets <habetsm.xilinx@gmail.com>,
        Paolo Abeni <pabeni@redhat.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: <20220510130556.52598fe2@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/S5P4vjS+eFW2D4is1FV5ZOw";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/S5P4vjS+eFW2D4is1FV5ZOw
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 (x86_64
allmodconfig) failed like this:

drivers/net/ethernet/sfc/ptp.c:2191:35: error: 'efx_copy_channel' undeclare=
d here (not in a function); did you mean 'efx_ptp_channel'?
 2191 |         .copy                   =3D efx_copy_channel,
      |                                   ^~~~~~~~~~~~~~~~
      |                                   efx_ptp_channel

Caused by commit

  54fccfdd7c66 ("sfc: efx_default_channel_type APIs can be static")

interacting with commit

  49e6123c65da ("net: sfc: fix memory leak due to ptp channel")

from the net tree.

I have added the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 May 2022 12:56:18 +1000
Subject: [PATCH] fix up for "net: sfc: fix memory leak due to ptp channel"

This is a partial revert of

  54fccfdd7c66 ("sfc: efx_default_channel_type APIs can be static")

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/sfc/efx_channels.c | 1 -
 drivers/net/ethernet/sfc/efx_channels.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet=
/sfc/efx_channels.c
index ec913f62790b..79df636d6df8 100644
--- a/drivers/net/ethernet/sfc/efx_channels.c
+++ b/drivers/net/ethernet/sfc/efx_channels.c
@@ -598,7 +598,6 @@ void efx_fini_channels(struct efx_nic *efx)
 /* Allocate and initialise a channel structure, copying parameters
  * (but not resources) from an old channel structure.
  */
-static
 struct efx_channel *efx_copy_channel(const struct efx_channel *old_channel)
 {
 	struct efx_rx_queue *rx_queue;
diff --git a/drivers/net/ethernet/sfc/efx_channels.h b/drivers/net/ethernet=
/sfc/efx_channels.h
index 64abb99a56b8..46b702648721 100644
--- a/drivers/net/ethernet/sfc/efx_channels.h
+++ b/drivers/net/ethernet/sfc/efx_channels.h
@@ -39,6 +39,7 @@ int efx_set_channels(struct efx_nic *efx);
 void efx_remove_channel(struct efx_channel *channel);
 void efx_remove_channels(struct efx_nic *efx);
 void efx_fini_channels(struct efx_nic *efx);
+struct efx_channel *efx_copy_channel(const struct efx_channel *old_channel=
);
 void efx_start_channels(struct efx_nic *efx);
 void efx_stop_channels(struct efx_nic *efx);
=20
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/S5P4vjS+eFW2D4is1FV5ZOw
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJ51pUACgkQAVBC80lX
0GzvHwf9EXy4w+uGpo0tk+2WihFJ/UZdyu+oOvJ7oTwzstQeXxhGeVKmVEy4PQHB
ZH8eGfJkOB7STfEWjndNAKeTBJcd6zuOVNZIj9Wtyylrh4CbI8YZS4tqxLvwVbFp
UvtZAbxTIzbjq7BQls/I4Xa3O5XB4XMj3KZE2W+ZSm3XYAVlhJkQwnylbReg8PeK
6InMQkZ4mHjkn2AerjPUkAHMn8uC1vNNJcU/9ctl2NVhaaGk19z5P1RqXJATpO70
dysS0c2OeWuDpL876/FO1fqVnEgc2wCqV/vgHsxkeCUXvQq87aCR8IyPCWlYfG0P
Y9ufcIfmk5IMIe1PezKD6N1O+AQZvA==
=7VI9
-----END PGP SIGNATURE-----

--Sig_/S5P4vjS+eFW2D4is1FV5ZOw--