Linux-Next Archive on
 help / color / Atom feed
* linux-next: manual merge of the net-next tree with the risc-v tree
@ 2020-07-29  3:20 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-07-29  3:20 UTC (permalink / raw)
  To: David Miller, Networking, Palmer Dabbelt, Paul Walmsley
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jacob Keller

[-- Attachment #1: Type: text/plain, Size: 1026 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:


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.

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
 +	bool
+ config PLDMFW
+ 	bool
+ 	default n

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-29  3:20 linux-next: manual merge of the net-next tree with the risc-v tree Stephen Rothwell

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone