From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the userns tree with the tip tree
Date: Mon, 21 May 2012 17:02:39 -0600 [thread overview]
Message-ID: <87ipfp6sts.fsf@xmission.com> (raw)
In-Reply-To: <20120521173006.3c10df123692914ab19497b8@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 21 May 2012 17:30:06 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Eric,
>
> Today's linux-next merge of the userns tree got a conflict in
> include/linux/sched.h between commit 50954a1f450e ("sched/numa: Provide
> sysctl knob to disable numa scheduling and turn it off by default") from
> the tip tree and commit 7b44ab978b77 ("userns: Disassociate user_struct
> from the user_namespace") from the userns tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
It looks reasonable. Thanks.
Eric
next prev parent reply other threads:[~2012-05-21 23:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 7:30 linux-next: manual merge of the userns tree with the tip tree Stephen Rothwell
2012-05-21 23:02 ` Eric W. Biederman [this message]
2015-06-04 10:49 Stephen Rothwell
2018-09-24 3:34 Stephen Rothwell
2018-10-15 4:11 Stephen Rothwell
2018-10-15 4:34 ` Stephen Rothwell
2018-10-15 5:49 ` Eric W. Biederman
2020-12-11 7:24 Stephen Rothwell
2020-12-16 1:02 ` Stephen Rothwell
2022-05-09 6:49 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=87ipfp6sts.fsf@xmission.com \
--to=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).