Messages in this thread |  | | Date | Sun, 20 Dec 2015 23:48:54 -0500 | From | Tejun Heo <> | Subject | Re: linux-next: manual merge of the cgroup tree with the tip tree |
| |
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.
-- tejun
|  |