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;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     "broonie@kernel.org" <broonie@kernel.org>
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: Re: linux-next: manual merge of the nfsd tree with the powerpc tree
Thread-Topic: linux-next: manual merge of the nfsd tree with the powerpc tree
Thread-Index: AQHZdE0QrQ6D8ATLREuXep4isulzwq81wGCA
Date:   Fri, 21 Apr 2023 13:23:51 +0000
Message-ID: <C26150B7-9DF1-4477-BEAE-E45FB1FE7C33@oracle.com>
References: <20230421123018.78201-1-broonie@kernel.org>
In-Reply-To: <20230421123018.78201-1-broonie@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?1e9YQ6bRM2u2C2yhLoAoUwhclGElBgRkqAjaG5kGalVLIP+uRsIKuMHXisFU?=
 =?us-ascii?Q?fVQMHZ11iY40y2A54JxWTNNPK5d9qqkxPUNWpOrcCTUj2Tb4cx3VX7Dwd36G?=
 =?us-ascii?Q?imQuGJxUJqkp8PImKFvLhcXXtgBWP4YOZbygwgytP1caWqEq+UCl9K6JtXwj?=
 =?us-ascii?Q?srhODAQJ8wxhpoIoCzDKtxpCSq4xAfoRD2cCGRqYnetlAcKRthWRbRuoqIxA?=
 =?us-ascii?Q?9EGHsi4Ac91fVYQ/gfbgOOUq/WNvKlqB+iqxONEyVxIV/uOlJJQCfSTKubXS?=
 =?us-ascii?Q?XvnbBPU+RbbmCgmbRJfLA9xl3jh+MdEpbj38w8w46g0i9vkZbZwgNZKrcocG?=
 =?us-ascii?Q?4NDCuXu59ek5MULpwDsWSPmJ18ZcHZcRnFPSIOK3DskBMyNy3QaKdeCjMz20?=
 =?us-ascii?Q?cMCWOqVH00+FR7Sz8MmEqiiRxz7ltMuqyYB027COsrBtqfi+KvdciJvQXHOs?=
 =?us-ascii?Q?KK0U9I2uAiXn5j2+DoSGVR4IWRlysCZMNCILQ6f3RPNEubLskJzWkRg9n2VC?=
 =?us-ascii?Q?iImBGSodF3VC5JylWqrWORnd5XUvQw1GO5Qlig3ST4Zaf4x8ob9h+kaHcMhl?=
 =?us-ascii?Q?6ZxAZN6LK2ZrCgJZgj7E1QJtIknAJBkCFntgKXHySaK0QedYdGtJcGMSQlIG?=
 =?us-ascii?Q?Fv6dh/n6cALgJUV/DcHBs58hZaUXFZeM5kqxJnUXiqjtMCfNu+EZrZHZktPd?=
 =?us-ascii?Q?oJAkRiFCxEYzU0HUkVUL0E+wvwL52YzN9sVJjUOMSbNhZYfXkjLrPkZ3/+FJ?=
 =?us-ascii?Q?tm17HPkLyMh/aSw5w2Fhv0AmPffgAVkV7rtg3v0qtJrClLcBN4xOQjfKJ2iM?=
 =?us-ascii?Q?j0demq1iCm7ohbl8hjxPsZ8/vsYT19cHvmWeqkfjherUYurhN6pEHOZY3izx?=
 =?us-ascii?Q?Trag4MPaznOv/Ld9uGgykPz7BFBxhctMsFi0tn10rM+jf9nFgFPlLtn3fRjT?=
 =?us-ascii?Q?VW0/sszA1+mILVFvk3Uo6YNSRnp6MDVSOAoyBRxh45N0vPL8U5cAe2KggpFX?=
 =?us-ascii?Q?r1dfTRIw0SLTErH3N1Cc7L8wFAIIyIKM4BL/LAv/0jyBkvdvfFZBNyz76IMe?=
 =?us-ascii?Q?BhmFbhl9waz7Tbezjtc5p8gJq40o+lRiJnfLGpS2SeuNl73uqS8RsmX2UKLl?=
 =?us-ascii?Q?gVYV4wPsYZ6QoJfHjYPFjVStHFxk7e7oEUtDibUDBgWzn3MMNPnx5AfZqz18?=
 =?us-ascii?Q?WaQ2ZTJc3K03YlXoPx061Jzbta6i1mM0XytQ4lI0EZ/z/Qw3v8LtKTQk51N3?=
 =?us-ascii?Q?seAHjSPqwUZPU2J+StMZ4h7b5kHhyuYgrlZsaY9Sjb4FJ4POX2TglozIQN5g?=
 =?us-ascii?Q?L5m9DeHDfXn/OpCXfg1RcvZ7O6T8/qCK6hy4wKyvFuBGVwIPSzpbhHJZYw/j?=
 =?us-ascii?Q?baiEvA993dgpRc+hsSfr/7wNUcUH2we28qVulgsSPkHioAxvEJqhizj0gzH0?=
 =?us-ascii?Q?UQ1cY8IeRzk+ncdbeRzhDbXZ3x3fmLFfp40dN+GYAwDaXvfinO538uNE7u8t?=
 =?us-ascii?Q?Q9MK5Sb8NntbgIUd4rB/wkyS27IgpRx0du08+8YDOZYb03kdV7//Z6G85LMX?=
 =?us-ascii?Q?GXOidSJqueHJ5TMGigOvhPXou4YqRHlqY8fUkiuYOBbim5t/jhYCrASYh1fl?=
 =?us-ascii?Q?Ig=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <3BB183467B3ED04DAF7BDCB6C641F0E6@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 3xPVsZSwll268Eu82ZZVUSyXlQqV15fNp1/5EwBEZjVn5LRIXg3CKw5vLQqykliM2HX/ukc807ciyGKfQ3rv0qx2XKR6TAQ4igTWE1Peo8p/g/0OcjZCP4NX3P2EcDpB4JffgMBIPHRqa+dfpAUgq8vgAvEcMmM15hZrwSRjMwsaQEjBoxa/R71BGIoKf9sSVqAlCG9loK83Wq8O93qdFTuykBTxwIK5lbvEYv3EjFYaszcDxSh174suqIWhJkoOKZ6OX5CYIAuhJ6evn0SAWjAGqyYaVm6dBaC6Yo27EH/WbssRROUtSbIE03XyaWnAII6fYaOvmJG4E6kU1pH90hWUtSt1YFcPPZ0lNiL9IXxS9T34GoyEIthd/deZibVlJwDuHZsrxE6AlfEjJxSdg9OCTngPYvuw30LnatWfqKNl9nJrSeTYSam5AThdbI+VFrK8UIa6loepGk4QFLHXgJDuuEYNo1S6wAY3osH9P8VXfkuHjoWXqRWaTTKAaeh0vWhIjxhUuUyUwMDvnY4BV6FjtpYsVa01PER/rlwQRU01TZxPa3ByK+348b9rjEJxdkEB52S5X2ixiP+Co/oLB1N18/awVop+hXEmKXhtJuE7Hp9nPaCzXDb3S67kpiSlqPGEjznAvDlFXd0nXRzwlZyF0WMHdcRX4SQ+clWvITtUZD1d81Ogl08SENOkix4mh9sc2Lkk+tEywLZvB3U4w/WF6JmUc+jnc1kzSUNP/ZO22SUfhlED/po5pDdkIqSFvGeUnzT3T7RUZHg+HjesLVI+NyHdSxArrfmbTtIWyOQjPWFYxQdAI0A3K2W55uNgIrKyOJz/Lljk08nkP5lpBmj/nnZYOn+7dAGP05zAJZPHGGeoX0wy5Mdpb5YRWdewVluTkYNBtaRChlvbFK9EqQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7dae984d-c14f-429c-31c0-08db426ba61d
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Apr 2023 13:23:51.8861
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: K03Ma6526NuXJtcpqahcoY8vgh9AoiZs3q811BGMTsAVs24fsDMP1lmtIG+FpVUJhbXjYUll/GTnMs2Q5BkKJA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6871
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-21_06,2023-04-21_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 phishscore=0 malwarescore=0 spamscore=0 bulkscore=0 suspectscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2304210117
X-Proofpoint-ORIG-GUID: 2y4oG6Fb7h-8YZZ0a7tP61E1XUsrMk13
X-Proofpoint-GUID: 2y4oG6Fb7h-8YZZ0a7tP61E1XUsrMk13
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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


> On Apr 21, 2023, at 8:30 AM, broonie@kernel.org wrote:
>=20
> Hi all,
>=20
> Today's linux-next merge of the nfsd tree got conflicts in:
>=20
>  arch/powerpc/configs/powernv_defconfig
>  arch/powerpc/configs/pseries_defconfig
>=20
> between commit:
>=20
>  9ecda934f43b1 ("powerpc/configs: Make pseries_defconfig an alias for ppc=
64le_guest")
>=20
> from the powerpc tree and commit:
>=20
>  e485f3a6eae08 ("ixgb: Remove ixgb driver")
>=20
> from the nfsd 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.

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/config=
s/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

--
Chuck Lever