Subject: linux-next: manual merge of the jc_docs tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 25 Jul 2019 10:26:10 +1000

Hi all,

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

  MAINTAINERS

between commit:

  2f5947dfcaec ("Documentation: move Documentation/virtual to Documentation/virt")

from Linus' tree and commit:

  bff9e34c6785 ("docs: fix broken doc references due to renames")

from the jc_docs 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 MAINTAINERS
index 641ff29be1a5,ff3ae2be2746..d376dc0c7b68
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12136,7 -12137,7 +12136,7 @@@ M:	Thomas Hellstrom <thellstrom@vmware.
  M:	"VMware, Inc." <[email-masked]>
  L:	[email-masked]
  S:	Supported
- F:	Documentation/virt/paravirt_ops.txt
 -F:	Documentation/virtual/paravirt_ops.rst
++F:	Documentation/virt/paravirt_ops.rst
  F:	arch/*/kernel/paravirt*
  F:	arch/*/include/asm/paravirt*.h
  F:	include/linux/hypervisor.h