From patchwork Tue Aug 13 00:40:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13761175 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 BF7E019A; Tue, 13 Aug 2024 00:40:42 +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=1723509647; cv=none; b=F89nhGXEgl2hYh8gYIrvYjEWVG7qfzwdDv3uHwVyQ8RPSCiklulI0unmFYU4exHwKXD7U8VrMxfxk7x27QxgHx9lwTZ82m+07ZRUll5hqVHto0efwngCS1R1FuZtO+xFmp/jVeCvTpJUxoGwTvmhXA+B/zeepcVP0zYTDOyBVjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723509647; c=relaxed/simple; bh=ID59+p7FrTqh802vHkr/f1tQxCRkDvEKZTEO87DYGc4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=ErF0uDdP34AzOpQJEOhtVUnYnSRceaXfwwheX8QMvZyDOPy0kKm5teLniioP/UxTRmdn30gn73/sAytvHTUhQKpiYC45ogQTQ3pbN4SkgWBmzFXXP5qeM4EEdFDNEHxO5GZL8gPpZAGyc0CojA7nYclWY7yQUgN2yhgFLwmTJGQ= 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=oUFu2zE9; 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="oUFu2zE9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1723509640; bh=MNTBvRnLDTANZYC59P8V3WswAMgZiL1fxaExBZ/3+KM=; h=Date:From:To:Cc:Subject:From; b=oUFu2zE9E3bjYVsKUpHYcHISyQQWWB7u+aDLBS/cFubbNv4EdmgsO3pHOQo5BVWzR N4z6tZ0Tw5Mw2mLyhwmoE7AsUW6hc0vZ9tgr1p5lgD/wIXtABdiOAEwEDmb/WPtLxb hmgOU4lSSJkKDOZD2y7XHcUbtDNHBXH9ZetOl69502nhU1bLwAO7JpKmLAXvnY9W3U VDW9HTgT18oD/tVUVJqyyPJM/jMyvGcr3myIeUKwqOO1SwnmT5MzTf9hPHywHNQazZ +B9baTjO1qAvRuicHlz1oOeybjcbk3/0CfVGvaFTMz7q5PrVYZJdyAqBO7/IAC6NwH cBg+6cAQOTqxQ== 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 4WjXc83Kvyz4x6l; Tue, 13 Aug 2024 10:40:39 +1000 (AEST) Date: Tue, 13 Aug 2024 10:40:39 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Linux Kernel Mailing List , Linux Next Mailing List , Pawel Dembicki Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20240813104039.429b9fe6@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/dsa/vitesse-vsc73xx-core.c between commits: 5b9eebc2c7a5 ("net: dsa: vsc73xx: pass value in phy_write operation") fa63c6434b6f ("net: dsa: vsc73xx: check busy flag in MDIO operations") from the net tree and commit: 2524d6c28bdc ("net: dsa: vsc73xx: use defined values in phy operations") 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/dsa/vitesse-vsc73xx-core.c index e3f95d2cc2c1,a82b550a9e40..000000000000 --- a/drivers/net/dsa/vitesse-vsc73xx-core.c