From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23905C83F18 for ; Tue, 29 Aug 2023 23:29:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241135AbjH2X3B (ORCPT ); Tue, 29 Aug 2023 19:29:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239198AbjH2X2e (ORCPT ); Tue, 29 Aug 2023 19:28:34 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAEEA11B; Tue, 29 Aug 2023 16:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1693351706; bh=MxfD5rB/5DGRsx1UFZiv+c2vCsiVC6XlMi4cYQc+DJY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BaCv5kNx3dK43bYNeOzj6Uef42zVtb1lJodrEvVcs0sGdKSGUpXPrh+PLu94Mzea8 b1ak4Xru3g3jS2nCZm/lm3bCBj4KDwX8iiySRUVsnbULEtDuXtjqHumUiuF7X3j+tU b39oAdffrJ9AlEA95TTw0C/Kt+6C9P246jdhqC5jPgwvZHNxfvTUnDUjrhfIUcfXkn EitkyhpU3LkeMQOWrI7BfmpnEHxbWWrRSLXH9HlC8VIid0w2N8DjzX1I1p/lhTuUcq IhKWsY/FIgLyt45/n5zyKn3fOd1GsEKQW94QR05zb6sHagxVKb8ratyQnCeYQvTR1f 7nbRrey4/yfDQ== 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 ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rb3Ws3NT9z4wd0; Wed, 30 Aug 2023 09:28:25 +1000 (AEST) Date: Wed, 30 Aug 2023 09:28:14 +1000 From: Stephen Rothwell To: Michael Ellerman Cc: David Miller , Jakub Kicinski , Paolo Abeni , Networking , PowerPC , Christophe Leroy , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the net-next tree with the powerpc tree Message-ID: <20230830092814.71cb6911@canb.auug.org.au> In-Reply-To: <20230818111707.2714e8cb@canb.auug.org.au> References: <20230818111707.2714e8cb@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/kzYIKj8Isww0Z0lB3pjBXEU"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/kzYIKj8Isww0Z0lB3pjBXEU Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Fri, 18 Aug 2023 11:17:07 +1000 Stephen Rothwell = wrote: > > Today's linux-next merge of the net-next tree got a conflict in: >=20 > drivers/net/ethernet/freescale/fs_enet/fs_enet.h >=20 > between commit: >=20 > 60bc069c433f ("powerpc/include: Remove unneeded #include ") >=20 > from the powerpc tree and commit: >=20 > 7a76918371fe ("net: fs_enet: Move struct fs_platform_info into fs_enet.= h") >=20 > from the net-next tree. >=20 > 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. >=20 > --=20 > Cheers, > Stephen Rothwell >=20 > diff --cc drivers/net/ethernet/freescale/fs_enet/fs_enet.h > index aad96cb2ab4e,d371072fff60..000000000000 > --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h > +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h > @@@ -9,8 -10,8 +10,6 @@@ > #include > #include > =20 > - #include > -#include > -- > #ifdef CONFIG_CPM1 > #include > #endif This is now a conflict between the powerpc tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/kzYIKj8Isww0Z0lB3pjBXEU Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTufw8ACgkQAVBC80lX 0GwGLgf/YrbEQb46AZGblOXOfqDRqvOClfY16YPJ421dwyYDswib581afeFKKuT4 vTnIg78VaetO8fLJXBP1E9mzu9LRPLmxMfYwDrlK5fk6IHP9X5euTN8VenbZsmYi giGEaVKOd23q/CfZ0NRi+JhWRffPezZabAIYmo23UKw+QNaKMCsdziARRKmvT8DN jkqfvR8GQz7nMJjzhMZj24xiTWs478zGRhOTXUXMWxDdcNKdbg4GzZlcD8ikV8az GAU59J9HXcHeGPYpW4zLS2TWEFw1xF7xphIRlYJd63qRKQeiI4zyHQn+5V2wfgLm OptDIA4IDHhVixYrjyCleSXLrlm8UQ== =LI+k -----END PGP SIGNATURE----- --Sig_/kzYIKj8Isww0Z0lB3pjBXEU--