Skip to contentSkip to conversation

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

PATCH Mark Brown 3 participants 4 messages Sep 28

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

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.

Documentation/scheduler/index.rst +0 -0
diff --cc Documentation/scheduler/index.rst
index d6d75421756ac,a43647b9706d9..0000000000000
@@@ -23,6 -23,6 +23,7 @@@ Schedule
      sched-stats
      sched-ext
      sched-debug
+     sched-paravirt
 +    sched-preemption
  
      text_files
maintainer
#1 lore raw
Quoted 29 lines · Mark Brown

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.

Documentation/scheduler/index.rst +0 -0
diff --cc Documentation/scheduler/index.rst
index d6d75421756ac,a43647b9706d9..0000000000000

Documentation/scheduler/index.rst

Quoted 5 lines
Documentation/scheduler/index.rst +1 -0
@@@ -23,6 -23,6 +23,7 @@@ Schedule
      sched-stats
      sched-ext
      sched-debug
+     sched-paravirt
 +    sched-preemption

Seems like a fine fix, thanks. It looks like we're running into the "always add new stuff at the end" trap here...

jon

#2 lore raw
In reply to Mark Brown

Hi Mark.

Quoted 28 lines · Mark Brown

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.

Documentation/scheduler/index.rst +0 -0
diff --cc Documentation/scheduler/index.rst
index d6d75421756ac,a43647b9706d9..0000000000000

Documentation/scheduler/index.rst

Quoted 7 lines
Documentation/scheduler/index.rst +1 -0
@@@ -23,6 -23,6 +23,7 @@@ Schedule
       sched-stats
       sched-ext
       sched-debug
+     sched-paravirt
  +    sched-preemption
 
       text_files

Looks correct to me.
I guess it clashed since both were beginning around sched-p.

Sorry, I should have mentioned, But it didn't occur to me when I sent it.

author maintainer
#3 lore raw
Quoted 14 lines · Shrikanth Hegde

Review

Quoted 8 lines · Mark Brown

+++ b/Documentation/scheduler/index.rst

(quoted diff) +1 -0
@@@ -23,6 -23,6 +23,7 @@@ Schedule
       sched-stats
       sched-ext
       sched-debug
+     sched-paravirt
  +    sched-preemption
       text_files

Looks correct to me.
I guess it clashed since both were beginning around sched-p.

Quoted 1 line

Sorry, I should have mentioned, But it didn't occur to me when I sent it.

Don't worry about it, trivial conflicts like this don't cause any real issues.