Subject: linux-next: manual merge of the net-next tree with the risc-v tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 29 Jul 2020 13:20:50 +1000

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