Skip to contentSkip to conversation

linux-next: manual merge of the nfsd tree with the powerpc tree

PATCH [email protected] 2 participants 2 messages Apr 21, 2023

Subsystems (2)
PowerPC Linux-next tree
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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.

arch/powerpc/configs/powernv_defconfig +0 -2
index 92e3a8fea04a5..f2a9be02a8d27 100644
@@ -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
#1 lore raw
Quoted 19 lines · On Apr 21, 2023, at 8:30 AM, [email protected] 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")

Quoted 8 lines

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.

Quoted 10 lines
arch/powerpc/configs/powernv_defconfig +0 -0
index 92e3a8fea04a5..f2a9be02a8d27 100644
@@ -170,8 +170,6 @@ CONFIG_S2IO=m

CONFIG_E100=y
CONFIG_E1000=y
CONFIG_E1000E=y

arch/powerpc/configs/powernv_defconfig +0 -2
-CONFIG_IGB=y
-CONFIG_IXGB=m
Quoted 3 lines

CONFIG_IXGBE=m
CONFIG_I40E=m
CONFIG_MLX4_EN=m

--
Chuck Lever