From patchwork Mon Feb 24 01:58:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13987277 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 865B315696E; Mon, 24 Feb 2025 01:58:52 +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=1740362336; cv=none; b=bhEjNAWh8IUdeH8O0f7V2RWopfmw/Oq0GyleA9ggrUvNKryDToM1o8f+H0dlaAW2J8Crl/eSnEOlgGDo/aPactSb3ZmwHqeD90jP4M5fy05sdbE6h7Uj0bmekStY2Sq6w4Uz4YNRUIfIb4T6GAzK6X8/SYT7Z8ee/JIwl6O7zMc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740362336; c=relaxed/simple; bh=ORlFFla8sC1IpgaS/KRaD+T3b765e/z0A+g0jIZemO4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=naCFaQ1AWYK0G01dE4IPNuPsgxp880SmlQNX6R+nMT2FQXEp2tyuOUDXRticJ3VO5WgTpkqiYPCAhHcbUwalz6YiCbDgcpuo9ZKLraJBC2kg0irDIsLH4w5CpWmM93knSFTiVUR3u5a11h6j85YrFpaL85paGaEZVtLqkW6lbak= 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=gHgxLdmb; 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="gHgxLdmb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1740362330; bh=QUU/uAf5++LoUnqMdvxhIP8nL0SijKpkWviqlxn7xFY=; h=Date:From:To:Cc:Subject:From; b=gHgxLdmbp3i4D55NxYZ58AIzLG4Gly+dDXhewUykgAFRYXcTCRTkTNSc2iOs9z8JF l0L61p8HSTWOTEwnus8Mw+RqG+mAAEpONEHAoWZBHbNwSgUVrwnoj08/d8u8jZigDc 9e8duQo0eCNEgNp6+Xxg2SRXJ2L/jHgJ+LqVpgdewm0yjt5CuATbTogfn1O6OHa+Bs 5DZG0nRSIE0SdL//8+AMVyg/mZ9KEKovcCmxPx1HmQ8svziKqB8eRQBjRkYfcMtOnt o8CDZmWVNFeGnurteO9F3zaJgXNlobC5U/UfRGQ2l8ckFKG9fHH6IyN56r1IZvLCWw 3cVNY6tcCm5iw== 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 4Z1P6L13zZz4wcj; Mon, 24 Feb 2025 12:58:49 +1100 (AEDT) Date: Mon, 24 Feb 2025 12:58:48 +1100 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Linux Kernel Mailing List , Linux Next Mailing List , Sean Anderson Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20250224125848.68ee63e5@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/ethernet/cadence/macb_main.c between commit: fa52f15c745c ("net: cadence: macb: Synchronize stats calculations") from the net tree and commit: 75696dd0fd72 ("net: cadence: macb: Convert to get_stats64") 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/cadence/macb_main.c index c1f57d96e63f,5345f3e1a795..000000000000 --- a/drivers/net/ethernet/cadence/macb_main.c