From: Ingo Molnar <mingo@kernel.org>
To: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Fenghua Yu <fenghua.yu@intel.com>,
Johannes Weiner <hannes@cmpxchg.org>
Subject: Re: linux-next: manual merge of the cgroup tree with the tip tree
Date: Mon, 11 Jan 2016 16:15:18 +0100 [thread overview]
Message-ID: <20160111151518.GA28800@gmail.com> (raw)
In-Reply-To: <20151221044854.GB27493@htj.duckdns.org>
* Tejun Heo <tj@kernel.org> wrote:
> On Mon, Dec 21, 2015 at 03:41:19PM +1100, Stephen Rothwell wrote:
> > Hi Tejun,
> >
> > Today's linux-next merge of the cgroup tree got a conflict in:
> >
> > init/Kconfig
> >
> > between commits:
> >
> > 257372262056 ("x86/intel_rdt: Add support for Cache Allocation detection")
> > 5ad9144cdb9a ("x86,cgroup/intel_rdt : Add a cgroup interface to manage Intel cache allocation")
>
> Ingo, can you please revert the rdt cgroup. I still don't think this
> is the right approach and tglx's new proposal seems a lot better.
>
> Thanks.
Ok, it's all zapped.
Thanks,
Ingo
next prev parent reply other threads:[~2016-01-11 15:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-21 4:41 linux-next: manual merge of the cgroup tree with the tip tree Stephen Rothwell
2015-12-21 4:48 ` Tejun Heo
2016-01-11 15:15 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-25 5:15 Stephen Rothwell
2022-09-12 5:59 Stephen Rothwell
2022-10-10 21:00 ` Stephen Rothwell
2015-12-21 4:41 Stephen Rothwell
2015-10-16 5:40 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=20160111151518.GA28800@gmail.com \
--to=mingo@kernel.org \
--cc=fenghua.yu@intel.com \
--cc=hannes@cmpxchg.org \
--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 \
--cc=tj@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.