From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Lezcano Subject: Re: linux-next: please clean up the clockevents tree Date: Wed, 13 May 2015 09:46:42 +0200 Message-ID: <55530162.9030509@linaro.org> References: <20150513151913.731a0d65@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-wg0-f41.google.com ([74.125.82.41]:34893 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751762AbbEMHqp (ORCPT ); Wed, 13 May 2015 03:46:45 -0400 Received: by wgnd10 with SMTP id d10so31982245wgn.2 for ; Wed, 13 May 2015 00:46:44 -0700 (PDT) In-Reply-To: <20150513151913.731a0d65@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On 05/13/2015 07:19 AM, Stephen Rothwell wrote: > Hi Daniel, > > All the commits in the clockevents tree have appeared upstream (as > different commits, unfortunately). Please clean up your tree it is > just causing unnecessary conflicts. Hi Stephen, I updated the branch. Let me know if everything is all right now. Thanks. -- Daniel --=20 Linaro.org =E2=94=82 Open source software fo= r ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog