* linux-next: manual merge of the nfsd tree with the powerpc tree
@ 2023-04-21 12:30 broonie
2023-04-21 13:23 ` Chuck Lever III
0 siblings, 1 reply; 2+ messages in thread
From: broonie @ 2023-04-21 12:30 UTC (permalink / raw)
To: Chuck Lever
Cc: David S . Miller, Linux Kernel Mailing List,
Linux Next Mailing List, Michael Ellerman, Tony Nguyen
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.
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the nfsd tree with the powerpc tree
2023-04-21 12:30 linux-next: manual merge of the nfsd tree with the powerpc tree broonie
@ 2023-04-21 13:23 ` Chuck Lever III
0 siblings, 0 replies; 2+ messages in thread
From: Chuck Lever III @ 2023-04-21 13:23 UTC (permalink / raw)
To: broonie
Cc: David S . Miller, Linux Kernel Mailing List,
Linux Next Mailing List, Michael Ellerman, Tony Nguyen
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-21 13:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-21 12:30 linux-next: manual merge of the nfsd tree with the powerpc tree broonie
2023-04-21 13:23 ` Chuck Lever III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).