public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <20230421123018.78201-1-broonie@kernel.org> (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.

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

             reply	other threads:[~2023-04-21 12:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-21 12:30 broonie [this message]
2023-04-21 13:23 ` linux-next: manual merge of the nfsd tree with the powerpc tree Chuck Lever III

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230421123018.78201-1-broonie@kernel.org \
    --to=broonie@kernel$(echo .)org \
    --cc=anthony.l.nguyen@intel$(echo .)com \
    --cc=chuck.lever@oracle$(echo .)com \
    --cc=davem@davemloft$(echo .)net \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mpe@ellerman$(echo .)id.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox