> On Apr 21, 2023, at 8:30 AM, broonie@xxxxxxxxxx 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
