From patchwork Fri Aug 18 01:17:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1822636 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=PK/TgGoI; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RRkWN5MdMz1yZd for ; Fri, 18 Aug 2023 11:17:36 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=PK/TgGoI; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4RRkWN48Cgz3cVT for ; Fri, 18 Aug 2023 11:17:36 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=PK/TgGoI; dkim-atps=neutral Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4RRkW24zpyz2xwG for ; Fri, 18 Aug 2023 11:17:18 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1692321430; bh=Wj52K4lZS/g/aHhULzZG+L4pSUEP25cWrpsFG22rQf0=; h=Date:From:To:Cc:Subject:From; b=PK/TgGoIQym7SkBAW1O619pBDmh4ZWIrHy1ZL1APXY1N9PgjuOVNcTzqPtKff2vYi Gm7bS7g0PJ4d2KglE8k0r5qvWWdA1vCq6ii1d3iT6cxXJPx45zzQF3Sk1k86qbD6el RMmOEDIk41xRL/0VgCavqBSaiYodX63u27EIdo5P0YrBkKZRzNQ5nzAo+LdUalEKVC 8OJ2Yf6TWujxCDBc7WsSAS53/afWGZteBLytxD6NEWqyD+pBHhU0CmlG9Hc+KaEts+ k5QE0f5tVm234ehT17BNVL95wGY+QLKHhrZWi/a02fTqXZInuIqjfO+UzmDj+HdBod G48goFp5a/woQ== 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 4RRkVs1gXZz4wy5; Fri, 18 Aug 2023 11:17:08 +1000 (AEST) Date: Fri, 18 Aug 2023 11:17:07 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni , Michael Ellerman Subject: linux-next: manual merge of the net-next tree with the powerpc tree Message-ID: <20230818111707.2714e8cb@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Networking , Linux Next Mailing List , PowerPC , Linux Kernel Mailing List Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/freescale/fs_enet/fs_enet.h between commit: 60bc069c433f ("powerpc/include: Remove unneeded #include ") from the powerpc tree and commit: 7a76918371fe ("net: fs_enet: Move struct fs_platform_info into fs_enet.h") 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/freescale/fs_enet/fs_enet.h index aad96cb2ab4e,d371072fff60..000000000000 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h