From nobody Mon Jun 15 19:04:49 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D124E3FC5A2; Mon, 15 Jun 2026 14:42:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781534563; cv=none; b=C+ihAR3GLihJYJozdHsY/fB7Eu47vZUEh/v64dhsag5DendVBpXilSAglRSI+BLoUwbbXHKOLtaC746T8/C2HXCt+ZbyiGn/DCD77rLU0GAC/lQovFNHySu/or9GnpNd1IFTeH2btsUcykSE2IAaTTcHv2Ro/1KDBQVmVgW/9Ts= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781534563; c=relaxed/simple; bh=lyz0o5bIqrQU6GZA9FlIrh0SIJtPiDxC//iPq+MIZlM=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=PAVkgnGZVkrm58rNXK7T34pSYSBILrhiGyeiW45GcUZVQV5iIcD6n32xFdrNqFVWCeHbfMBj0uxWkGSuQjCyNa3ql8jEkTOCG70XMFPnN5iv6HzuUrQV83vcZBAzYSrJSD5FgX6hnHbJniZ5M6YNb7AHi8gG32Z20LRDcLC2KIE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mYeejUh5; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mYeejUh5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E8821F000E9; Mon, 15 Jun 2026 14:42:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781534562; bh=0rbF5ZboVW29ctA9StQPDra1Vwsw3zYmxUpbz90V8XU=; h=Date:From:To:Cc:Subject; b=mYeejUh5X3i6i8Wi9z4oe4NYq+nCAjPsHkFic3fW1a2OeoPogHrwKgnNz15EH/Dmr +igNibVsxxGQ49+XNLe0a4Ermo5Nvj6gB0m5Nagk/gia/Ah+90ku+Jfx/VtcsbC9m3 GG9dYt30y9/fuUeUI7XnBzerccGlI1/i8Jc7BgTA4+2YHwojkTQDB7G+5txsa/nqu+ ryUlv+6QKejrjvHIH6/pXXUew7ORNSJvhrjnnwYB8c8KqQxIHWbAldzJVgNvqspyRw jHRX8qcnHUxi6urq4V7zL2t5IFpnkIZLKYUrXqkvJ8J9HHZFRG4MdAsoLYubVzjpIf ncAlflSB/xCGw== Date: Mon, 15 Jun 2026 15:42:38 +0100 From: Mark Brown To: David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Aditya Garg , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="/QBcvnCH+4/MDw3o" Content-Disposition: inline --/QBcvnCH+4/MDw3o Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/microsoft/mana/mana_en.c between commit: f8fd56977eeea ("net: mana: guard TX wq object destroy with INVALID_MANA_H= ANDLE check") from the net tree and commit: d07efe5a6e641 ("net: mana: Use per-queue allocation for tx_qp to reduce a= llocation size") 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. diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c index d7de4c4d25bbe,26aef21c6c2c8..0000000000000 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@@ -2332,14 -2399,15 +2399,16 @@@ static void mana_destroy_txq(struct man napi_synchronize(napi); napi_disable_locked(napi); netif_napi_del_locked(napi); - apc->tx_qp[i].txq.napi_initialized =3D false; + apc->tx_qp[i]->txq.napi_initialized =3D false; } - mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i]->tx_object); - if (apc->tx_qp[i].tx_object !=3D INVALID_MANA_HANDLE) ++ if (apc->tx_qp[i]->tx_object !=3D INVALID_MANA_HANDLE) - mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i].tx_object); ++ mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i]->tx_object); =20 - mana_deinit_cq(apc, &apc->tx_qp[i].tx_cq); + mana_deinit_cq(apc, &apc->tx_qp[i]->tx_cq); =20 - mana_deinit_txq(apc, &apc->tx_qp[i].txq); + mana_deinit_txq(apc, &apc->tx_qp[i]->txq); +=20 + kvfree(apc->tx_qp[i]); } =20 kfree(apc->tx_qp); --/QBcvnCH+4/MDw3o Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmowD10ACgkQJNaLcl1U h9DlZAf/SF3nOP+uAj/jqoZYtu4Umt3BpN94o0KIp53+bE0f/nqY3knknrrC+5pd vCx5Kdy+5+JSELyE6MESO0fx8Pl+MwM7IHWwV7l/2gF6NXEx/I6ltkRIKf4nxyQL Gi3EA4N4vv2TLN5kP50BzjL7XjCRkV/rlutl8E7ikkc0B5wSVVIyFqyTExD0IPm1 KrBIeOf6r7GmIw2/ENaznOaDMazrGIZ90jit1mHyAfcJQl0x9Hhm0PL6WYZdNVe8 NPM9R6+8kUGLgjxCwGLRXZk6jsYKrJdy9tkKlMy+uEtszzXujCHG3fLUYkbiPR/z PWlGqYUH3Zm2Fh9Wo1dSA/t6kQlCiA== =mvno -----END PGP SIGNATURE----- --/QBcvnCH+4/MDw3o--