linux-next: manual merge of the tip tree with the jc_docs tree

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  Documentation/scheduler/index.rst

between commit:

  80c2913d0a06c ("sched/doc: add a preemption model overview")

from the jc_docs tree and commit:

  06a49ef784acf ("sched/docs: Document cpu_preferred_mask and Preferred CPU concept")

from the tip 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 --cc Documentation/scheduler/index.rst
index d6d75421756ac,a43647b9706d9..0000000000000
--- a/Documentation/scheduler/index.rst
+++ b/Documentation/scheduler/index.rst
@@@ -23,6 -23,6 +23,7 @@@ Schedule
      sched-stats
      sched-ext
      sched-debug
+     sched-paravirt
 +    sched-preemption
  
      text_files

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