From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753485AbbEMHqs (ORCPT ); Wed, 13 May 2015 03:46:48 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:36790 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752051AbbEMHqp (ORCPT ); Wed, 13 May 2015 03:46:45 -0400 Message-ID: <55530162.9030509@linaro.org> Date: Wed, 13 May 2015 09:46:42 +0200 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Stephen Rothwell CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: please clean up the clockevents tree References: <20150513151913.731a0d65@canb.auug.org.au> In-Reply-To: <20150513151913.731a0d65@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: 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 -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog