Re: linux-next: the cgroup tree has an unnecessary merge

[Tejun Heo]

Hello, Stephen.

On Wed, Jun 18, 2014 at 08:49:21AM +1000, Stephen Rothwell wrote:
> The cgroup tree has a merge of 963649d735c8 and c731ae1d0f02 both of
> which are already merged into v3.16-rc1.  Why did you just not use
> v3.16-rc1 itself (or the point where Linus merged your tree) (and then
> add the other commit on top?  That would have removed any chance that
> you resolved the merged differently to how it was resolved in Linus'
> tree (I don't know if there is a difference, but I have had conflicts
> from different merge resolutions in the past).

Oops, my mistake.  Reset to for-3.16-fixes.

Thanks.

-- 
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/