| Message ID | 20230421123018.78201-1-broonie@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1034463vqo;
Fri, 21 Apr 2023 05:39:37 -0700 (PDT)
X-Google-Smtp-Source:
AKy350bEX3wuDurHHuMYF38yFnxQAa86AdWzZ5edvNvW0CGlfln180Qi0XYmYC/IFqXCSIjOzch2
X-Received: by 2002:a05:6a00:1914:b0:63b:8425:bf5d with SMTP id
y20-20020a056a00191400b0063b8425bf5dmr5937152pfi.24.1682080777451;
Fri, 21 Apr 2023 05:39:37 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1682080777; cv=none;
d=google.com; s=arc-20160816;
b=WPUeQ1cynpsPY0+ev9mwDSkkoKuk6lbIIQxK7QmDcUQxeQx+51Iw7mvgO8ys7lLprT
UIirMTzkZKoLux0umjHGgHUzIKX9HpU/ytfsTBf0JIcPiqfFIPCoMtGEWCNl1Sy2o1oF
yMK96KQJ0NFPvUxhH63UzQbXLn7RH3XdBWsk36+LEVm957RXWGf1lm1iwwvM8Tn5xQP8
cMV3EruuPKpSCJsHmLhoFE4Bf51hC0NdGRYbD7ro4kucjWYqq48wcuTewU2YmF0oq6jo
uwCXlXCfIWwttiFnjDZ2PP+xoxY4kXd9blJ72YlwC9UO440GDKcoS12O2KHIfZ6F5EOr
RQWg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from:dkim-signature;
bh=bF9OZcNQ+AYYyfM+6GLnGUHzZzbTHJbugWA+CKLzsoU=;
b=bNxiE4yMvPXiF3Id6SXAPKtdaSJI/wmBVTeSx4xwjagIS2zRWbZPDBcCQP6tySDj2U
FLVJOV8yLQTgTn9tnvHVI9sv0EJKzZAxtUsO/s/gD9Tv8Jhukfd5Imy6ApNCMpt1YAB0
B6gROHaaRFGP+GBv8SkDsLQpe3UKtZHd9AcG0vB4Sc6HWt5IT3Y0AmterXIA8VpMB0EP
V0yBrHLFfg9OswLajMvUJMfxCJVDfs8vgOCvzKJvsJcOhvY8Y/IyI6z3a4viiEAxj1uN
DDXGdRrXAMfpc7u1Sf1TQp1eXZ1p3adp1nXuJxC/WzrLKH30O+dLrlcedYiWem9mCx/r
icOw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dkojo8e4;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
z11-20020a6552cb000000b005137bf7e2d3si4317551pgp.582.2023.04.21.05.39.22;
Fri, 21 Apr 2023 05:39:37 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dkojo8e4;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231991AbjDUMaa (ORCPT <rfc822;cjcooper78@gmail.com> + 99 others);
Fri, 21 Apr 2023 08:30:30 -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
<rfc822;linux-kernel@vger.kernel.org>);
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 <chuck.lever@oracle.com>
Cc: "David S . Miller" <davem@davemloft.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Tony Nguyen <anthony.l.nguyen@intel.com>
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: 8bit
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1763789533413149270?=
X-GMAIL-MSGID: =?utf-8?q?1763789533413149270?=
|
| Series |
linux-next: manual merge of the nfsd tree with the powerpc tree
|
|
Commit Message
Mark Brown
April 21, 2023, 12:30 p.m. UTC
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 ppc64le_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.
Comments
> On Apr 21, 2023, at 8:30 AM, broonie@kernel.org wrote: > > 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 ppc64le_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. Thanks. I rebased nfsd-next on net-next to pull in the handshake netlink protocol patches. e485f3a6eae08 comes from net-next, fwiw. > 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=m > CONFIG_E100=y > CONFIG_E1000=y > CONFIG_E1000E=y > -CONFIG_IGB=y > -CONFIG_IXGB=m > CONFIG_IXGBE=m > CONFIG_I40E=m > CONFIG_MLX4_EN=m -- Chuck Lever
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=m CONFIG_E100=y CONFIG_E1000=y CONFIG_E1000E=y -CONFIG_IGB=y -CONFIG_IXGB=m CONFIG_IXGBE=m CONFIG_I40E=m CONFIG_MLX4_EN=m