From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <paul@pwsan.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jacob Keller <jacob.e.keller@intel.com>
Subject: linux-next: manual merge of the net-next tree with the risc-v tree
Date: Wed, 29 Jul 2020 13:20:50 +1000 [thread overview]
Message-ID: <20200729132050.10527ff1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1026 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
lib/Kconfig
between commit:
1a479f783857 ("lib: Add a generic version of devmem_is_allowed()")
from the risc-v tree and commit:
b8265621f488 ("Add pldmfw library for PLDM firmware update")
from the net-next 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.
--
Cheers,
Stephen Rothwell
diff --cc lib/Kconfig
index 610c16ecbb7c,3ffbca6998e5..000000000000
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -677,5 -677,6 +677,9 @@@ config GENERIC_LIB_CMPDI
config GENERIC_LIB_UCMPDI2
bool
+config GENERIC_LIB_DEVMEM_IS_ALLOWED
+ bool
++
+ config PLDMFW
+ bool
+ default n
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2020-07-29 3:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200729132050.10527ff1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=jacob.e.keller@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul@pwsan.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).