From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
Linus <torvalds@linux-foundation•org>,
Eric Paris <eparis@redhat•com>, Greg KH <greg@kroah•com>
Subject: Re: linux-next: Tree for Jan 6
Date: Sat, 7 Jan 2012 13:23:00 +1100 [thread overview]
Message-ID: <20120107132300.0d299a2b7f1c84832b4c15dc@canb.auug.org.au> (raw)
In-Reply-To: <20120106154109.2a104bbb.akpm@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 2192 bytes --]
Hi Andrew,
On Fri, 6 Jan 2012 15:41:09 -0800 Andrew Morton <akpm@linux-foundation•org> wrote:
>
> On Fri, 6 Jan 2012 19:26:04 +1100
> Stephen Rothwell <sfr@canb•auug.org.au> 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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-01-07 2:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-06 8:26 linux-next: Tree for Jan 6 Stephen Rothwell
2012-01-06 23:41 ` Andrew Morton
2012-01-07 2:23 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-01-06 3:56 Stephen Rothwell
2016-01-06 8:01 Stephen Rothwell
2017-01-06 3:07 Stephen Rothwell
2020-01-06 6:27 Stephen Rothwell
2021-01-06 3:30 Stephen Rothwell
2022-01-06 15:50 Stephen Rothwell
2023-01-06 3:14 Stephen Rothwell
2025-01-06 7:27 Stephen Rothwell
2026-01-06 1:54 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120107132300.0d299a2b7f1c84832b4c15dc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=eparis@redhat$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox