From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755745AbbLGGgJ (ORCPT ); Mon, 7 Dec 2015 01:36:09 -0500 Received: from ozlabs.org ([103.22.144.67]:60164 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751857AbbLGGgI (ORCPT ); Mon, 7 Dec 2015 01:36:08 -0500 Date: Mon, 7 Dec 2015 17:36:05 +1100 From: Stephen Rothwell To: Tejun Heo Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nina Schiff , "David S. Miller" Subject: linux-next: manual merge of the cgroup tree with Linus' tree Message-ID: <20151207173605.37fe583d@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in: net/core/netclassid_cgroup.c between commit: 3b13758f51de ("cgroups: Allow dynamically changing net_classid") from Linus' tree and commit: 1f7dd3e5a6e4 ("cgroup: fix handling of multi-destination migration from subtree_control enabling") from the cgroup tree. I couldn't figure out how to fix this up, so I have just dropped the cgroup tree for today. Tejun, maybe you could merge Linus' tree (probably -rc4?) and fix this up yourself? -- Cheers, Stephen Rothwell sfr@canb.auug.org.au