From nobody Wed Dec 17 08:18:06 2025 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 CB0DEC77B76 for ; Fri, 21 Apr 2023 12:30:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231404AbjDUMab (ORCPT ); Fri, 21 Apr 2023 08:30:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229464AbjDUMa3 (ORCPT ); Fri, 21 Apr 2023 08:30:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3E48A5E4; Fri, 21 Apr 2023 05:30:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0135561284; Fri, 21 Apr 2023 12:30:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF286C433EF; Fri, 21 Apr 2023 12:30:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682080226; bh=qurM6pSWM3IbAE+idFHL8b8eovX/lSH8OmOwkRoNcQU=; h=From:To:Cc:Subject:Date:From; b=dkojo8e4E9lctsqc1uQxZF4+U9G3ahKKcxNKmT09NBEk458trFj5orQAej4jkMPQK IoobBKYALuG3MCUEkAQcuPl5F9WS0IJFfNQqH05HbfTZGKQJwmp/NXSuOtrLDYeuB8 /3AImFxmOTBH/cAVJJyxW/8/45w5BGbk5yp+Z4t+PxXdoKaCcrgXRtyPOr9xYomQsL L9cXwH1DTiz9BvBrdKg0r5QG1cGR1W1bLe3ZOuddAbMOtTkBf+/KjahIBcazY6tEkQ u1jdWZXYzyfZ4vNgfybwZ8kzYwrC2Qzvl9XWbN2k+CVfGuGDV26MFy/H2nWVZZeguc 7QBuFjifVSZeg== From: broonie@kernel.org To: Chuck Lever Cc: "David S . Miller" , Linux Kernel Mailing List , Linux Next Mailing List , Michael Ellerman , Tony Nguyen Subject: linux-next: manual merge of the nfsd tree with the powerpc tree Date: Fri, 21 Apr 2023 13:30:18 +0100 Message-Id: <20230421123018.78201-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the nfsd tree got conflicts in: arch/powerpc/configs/powernv_defconfig arch/powerpc/configs/pseries_defconfig between commit: 9ecda934f43b1 ("powerpc/configs: Make pseries_defconfig an alias for ppc6= 4le_guest") from the powerpc tree and commit: e485f3a6eae08 ("ixgb: Remove ixgb driver") from the nfsd 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 --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/= powernv_defconfig index 92e3a8fea04a5..f2a9be02a8d27 100644 --- a/arch/powerpc/configs/powernv_defconfig +++ b/arch/powerpc/configs/powernv_defconfig @@ -170,8 +170,6 @@ CONFIG_S2IO=3Dm CONFIG_E100=3Dy CONFIG_E1000=3Dy CONFIG_E1000E=3Dy -CONFIG_IGB=3Dy -CONFIG_IXGB=3Dm CONFIG_IXGBE=3Dm CONFIG_I40E=3Dm CONFIG_MLX4_EN=3Dm