Hi Andrew,
On Fri, 6 Jan 2012 15:41:09 -0800 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Fri, 6 Jan 2012 19:26:04 +1100
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> > I have created today's linux-next tree at
> > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
>
> Did you get this?
>
> kernel/sched/core.c: In function 'sched_setaffinity':
> kernel/sched/core.c:4333: error: implicit declaration of function 'task_ns_capable'
No, I didn't. task_ns_capable does not appear anywhere in my tree. There
is a commit in the selinux tree that removes task_ns_capable (replacing
it with the equivalent ns_capable call).
In my tree and in the current version of Linus' tree, kernel/sched/core.c
include linux/cpapbility.h that declares {,task_}ns_capable. So I am at
a loss to know what happened in your tree.
> Apparently because Eric has today added a two-month old patch into
> linux-next at the same time as mainline moved the entire file.
That is the commit above. But git's merges seem to work for me here and
does the replacement in the file in its new position.
> Eric, please never put 3.x material into linux-next until 3.x-rc1 has
> opened. Please remove these patches from linux-next until 3.3-rc1
> opens.
Certainly if the above commit is not meant for this merge window, it
should not be in linux-next.
> Also, more gregmess:
>
.
.
.
> And below is what I had to do to fix up all the conflicts between
> mainline and linux-next. This all results from a single morning's
> merging into mainline. It's mainly tools/perf. I have to fix up
> all this crap so I can get code tested and released. Or I can turn
> off the machines, stomp home and see if things have improved on
> Monday. Bye.
Well some of this will be caused by Linus' doing different merge
resolutions than I did (in particular the cputime ones) and some may be
because Linus' has not take all of the tip trees yet (which I get in a
single hit).
It will be interesting to see what I get on Monday.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpEZ5ZW9QTRe.pgp
Description: PGP signature
