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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
