From patchwork Wed Sep 4 01:58:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13789563 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 B81E41EC01C; Wed, 4 Sep 2024 01:58:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725415114; cv=none; b=O5wX/RmVNsNGz/bl4XwRxLcXcjl5PeJMF437sJuEj1+7L53jkj4M1qmdUjnYt5ka/lJekgpiak0V3TRMAGhVYWu4t+AmnvcAagKEz87lJInZiJ/8QDNxyOc5PfEJEGNsx+sHfqNUeEsnqxAdyKIuUcSazzf0JRZAVoKSUDamPDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725415114; c=relaxed/simple; bh=yLdAmYZlfpNDVb6YCzzEs9vdP++iVQkXU4U+Lw3fgY0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=kRyu7JN+acH/G2WbARsxM4H3aZiRBziPzQCmlu4LcisEgu8efzYMgNuonFepjmisd4wXpD65vXZRK+JLq2Y//DWuTQqC2+4aIb1u33FIrki85Uismgs/6OJtteY611RsTKwu/ZAEwnKk0uEf6Z18GS60ERll/aHLoph7vumWV2I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=U/KM9q14; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="U/KM9q14" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1725415107; bh=ZuO15yUl5vff6kR/j4REFogDmZtE93e0EvXLU+0784o=; h=Date:From:To:Cc:Subject:From; b=U/KM9q14TZZg+f/FfgqjYcMCVgmV+w89jSNTSoW6ZwFNxaVjGpODyHdtOESCbKB4V tTrTJMOuY6M7pHd4aVcFLoBCB9te3cj+ArS1ZhVYb+DZJT3wOEAokA8RbGef1K+/9F xKPdm+lOOPN+7QstLqMYPi7YlyANfW+Ca1nnarHd6zJOD4zvT1ROlSuj1oye1fNvqN /Uks4w2EgJ5pPP0JH/lGkUFhghWTxFb/4tipnDoQ/fB5xWaEWYfDdMTk556nWveE50 w/DgQN2z0udeBdbvSdN9KNZgxIK23AzXeNUabraWF9oETfviYb5/7K6aiIX7kDj6rv g266TXCmtAWPQ== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Wz5Hk3SlCz4x3J; Wed, 4 Sep 2024 11:58:25 +1000 (AEST) Date: Wed, 4 Sep 2024 11:58:23 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni Cc: Jinjie Ruan , Networking , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20240904115823.74333648@canb.auug.org.au> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/phy/phy_device.c between commit: 2560db6ede1a ("net: phy: Fix missing of_node_put() for leds") from the net tree and commit: 1dce520abd46 ("net: phy: Use for_each_available_child_of_node_scoped()") 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/phy/phy_device.c index 6bb2793de0a9,7c4a09455493..000000000000 --- a/drivers/net/phy/phy_device.c