From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 88BA32DECBF; Thu, 26 Feb 2026 13:10:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772111450; cv=none; b=FvnGwj0S8Pbi+SbGQQq5PgI/762M2TJoXzh19M7T/pGo/lhL/jrrGugvTRHMlSuUuX1uZljQenriwueAtGABxZ9uBlIk4HVYiUsKKZ6C+fMhbxHujk1WiSPRtOV1z2ToXYjYJMO0Q9Z/2sfI8lEFdtEalkLuYlfURTdJIkl//VI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772111450; c=relaxed/simple; bh=C4eMAFRdacQNFuE024DtfsctH+er00ixJMhwD+JseHE=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=uQsP7btT4UKp9u6E6maAhJrxxzDLi9Myz/SqwQ8lQIKz5HlyDvyXjygNw4AuaWtpl88kGFJiQChb0D52a8lPL4O7YpP7Udn7kv+4XGGITQuXjeq/t6EzoN6w8RFEIIqs2X5CneQtiP4gMpwZUmx1qHoVMyf1uAjimJPTOz+rwRY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WFE78K9x; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WFE78K9x" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21D11C116C6; Thu, 26 Feb 2026 13:10:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772111450; bh=C4eMAFRdacQNFuE024DtfsctH+er00ixJMhwD+JseHE=; h=Date:From:To:Cc:Subject:From; b=WFE78K9xm9eujsTLCvowp6+vqtegWFnuc26lR3QWfYMm1Dqw5F560bczzmq7fWdrR 8c/r0WTEjwKqoFi7CT4S8GQ9gwRmCi9ll+SllwqrGBidWTSA/yQMlrDJ/wluax8BsN sPg6eY7BvpkXStl2jScsZVJramcZC7WtaWn7Fh35mkojVbiKhGkYkdqgrfpdz+a17T rV+Jr2qWvdX0fWTQN8z5/5Nx56uWLs8cNEOIyxC6e5CM4dlqQXP3YKT7uTkjsiKVg6 SVJBttuP4sB9njz+pf6dwkaViZIrfIiYpUQ0ooB6DEr2lUXFhf9M5ADA9sjBQ5J6KF f8D1S9kDDyhgw== Date: Thu, 26 Feb 2026 13:10:45 +0000 From: Mark Brown To: David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Dragos Tatulea , Kees Cook , Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List , Tariq Toukan Subject: linux-next: manual merge of the net-next tree with the origin tree Message-ID: Precedence: bulk X-Mailing-List: netdev@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="U+dCWai39WQ5lHEl" Content-Disposition: inline --U+dCWai39WQ5lHEl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c between commits: 69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar= types") bf4afc53b77ae ("Convert 'alloc_obj' family to use the new default GFP_KER= NEL argument") =66rom the origin tree and commit: 8a96b9144f18a ("net/mlx5e: Alloc xsk channel param out of mlx5e_open_xsk(= )") =66rom 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/mellanox/mlx5/core/en/xsk/setup.c index ac6f0581aa09a,d39f778ecd85b..0000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c --U+dCWai39WQ5lHEl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmmgRlQACgkQJNaLcl1U h9BZEQf+LBneEKglD0/YYqsmeSDobLWl00I5wVUA0JmukMcuIFkAYFA6PLpYzaad 0xWSRTqAcTMUPY7hRbPQ/tnvFKVSBl9Xy43fZPMMqpxRBIn27vIBre7fq4y1qWkk iYGE5T2ewqU5DaoUpd+nE4FJqvThQIHOCUdSoF7bnJ7CLRMW1tk8XBHn65t3jhpa toYw+qHxARbzr2MpU5aMFjAkW1HWcoqvhGg/oHPKDpd0fLukWQo+7sdM4F3UbAy1 IEEpka6mbzKkyLQ5wVYgAhKCfmq3GeIpyARGdBw+0ZqIuHQfdMpfesMWsO0+SNJV kw4LsIhgTRN48kfOK14s8lEpVGgX3Q== =rsBm -----END PGP SIGNATURE----- --U+dCWai39WQ5lHEl--