From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D61BC001DF for ; Tue, 1 Aug 2023 00:17:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230099AbjHAARP (ORCPT ); Mon, 31 Jul 2023 20:17:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbjHAARO (ORCPT ); Mon, 31 Jul 2023 20:17:14 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7087173D; Mon, 31 Jul 2023 17:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1690849030; bh=oMvFNBSH98YR96Y1UgC3tI4QIdqPVGbnRBQS4lVnmK8=; h=Date:From:To:Cc:Subject:From; b=gooAluXNE0NE4d1IrtCFx4onVZdMVkan3zpCN8kPtCq1etsbOUKYAVWlWKVzgaSlS fHbit6ZBAVIgloW/9N5P/CqAeoEbWt5fHe5OddJ0q9/a+6VH8CJgQKq/g8u/Pe/PFy iAEweQRYTpXm9avv5jC6WAC1aVTo6MszsOEkkQqT2qI6npP5qZSZ+ED2Mr9jmtbPrz DXv4kj/NV/ID5EVEjvybVliSjJjrOpy1GxecNiza3IPpN82Z87/Kt2Xa5uqW3VPhP8 g5NqK+9igU6Mkimv6asMqVjrXB9Vp0hojboqx8F7vB/PzKJyvlmkLZHi5seBjY+e8c w2XstjARXNI5A== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RFFzT6nYXz4wy5; Tue, 1 Aug 2023 10:17:09 +1000 (AEST) Date: Tue, 1 Aug 2023 10:17:08 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20230801101708.1dc7faac@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/+G_pMPqYCr2nKoaTLK9Q1F7"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/+G_pMPqYCr2nKoaTLK9Q1F7 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/broadcom/bnxt/bnxt.c between commit: 37b61cda9c16 ("bnxt: don't handle XDP in netpoll") from the net tree and commit: 2b56b3d99241 ("eth: bnxt: handle invalid Tx completions more gracefully") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell idiff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c index 06b238bef9dd,a3bbd13c070f..000000000000 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@@ -686,10 -744,9 +745,10 @@@ static void bnxt_tx_int(struct bnxt *bp next_tx_int: cons =3D NEXT_TX(cons); =20 - dev_kfree_skb_any(skb); + dev_consume_skb_any(skb); } =20 + bnapi->tx_pkts =3D 0; WRITE_ONCE(txr->tx_cons, cons); =20 __netif_txq_completed_wake(txq, nr_pkts, tx_bytes, @@@ -2571,11 -2595,12 +2597,11 @@@ static int __bnxt_poll_work(struct bnx return rx_pkts; } =20 -static void __bnxt_poll_work_done(struct bnxt *bp, struct bnxt_napi *bnap= i) +static void __bnxt_poll_work_done(struct bnxt *bp, struct bnxt_napi *bnap= i, + int budget) { - if (bnapi->tx_pkts) - if (bnapi->tx_pkts && !bnapi->tx_fault) { - bnapi->tx_int(bp, bnapi, bnapi->tx_pkts); - bnapi->tx_pkts =3D 0; - } ++ if (bnapi->tx_pkts && !bnapi->tx_fault) + bnapi->tx_int(bp, bnapi, budget); =20 if ((bnapi->events & BNXT_RX_EVENT) && !(bnapi->in_reset)) { struct bnxt_rx_ring_info *rxr =3D bnapi->rx_ring; --Sig_/+G_pMPqYCr2nKoaTLK9Q1F7 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTITwQACgkQAVBC80lX 0GwP/wgAhR+JXLjo1+DQCJkzFHBJVeJtPEQiJ94Kn92FzNJ9wwPNhNTsySwaKcZp SjcSq6q+MHyv4f2dZ6vLXKw1PByLC1+Qmv3veJ+wPiHXvOQQEWNdtSUOaPslxGpK FcdmWSm+SmH55BbdNzrHb4bobfkU5HHTceJcgokYj7Zwb+R1mKUqBMyJSPU8KlB5 1BMSU5n2hvLiyCJ0w3xnx/V7mREnqxtG/QgBbqH6Av6vO8aj9Dzuk+cdIp3fAiTk xinou48ZkPiZmIHTcdb6/tlQCpjzwqtK4UIqhTGV0w5conBHuTNH+cmN3JS91jw8 GHGzV9vMC8DceBVyMFyoxJtbGj0+mA== =2RXl -----END PGP SIGNATURE----- --Sig_/+G_pMPqYCr2nKoaTLK9Q1F7--