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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the rcu tree got conflicts in:

  kernel/sched/core.c
  include/linux/sched.h

between commit:

  cfe43f478b79 ("preempt/dynamic: Introduce preemption model accessors")

from the tip tree and commit:

  42e3e3c6a774 ("EXP preempt/dynamic: Introduce preempt mode accessors")

from the rcu tree.

Well, this is just a pain.  Paul, please don't put expierimental things
in you linuc-nect included branch.  I have dropped the rcu tree today.

The rules I use for the linux-next tree are:

"You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
        Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary."

-- 
Cheers,
Stephen Rothwell 
sfr@xxxxxxxxxxxxxxxx

-- 
Cheers,
Stephen Rothwell

Attachment: pgpajBRzIzxV1.pgp
Description: OpenPGP digital signature