linux-next: manual merge of the sched-ext tree with the tip tree merge

[Stephen Rothwell]

Hi all,

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

  kernel/sched/ext.c

between commit:

  a98ec5cb7e15 ("Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git";)

from the tip tree and commit:

  70d837c3e017 ("sched_ext: Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-6.19")

from the sched-ext tree.

I fixed it up (this was just white space differences between the
2 merges followed by another change in the shced-ext tree, so I just
used the latter) 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

Attachment: pgppZWQQHx0dJ.pgp
Description: OpenPGP digital signature