From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751997AbbAKUvR (ORCPT ); Sun, 11 Jan 2015 15:51:17 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:51178 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751282AbbAKUvP (ORCPT ); Sun, 11 Jan 2015 15:51:15 -0500 Message-ID: <54B2E240.8030701@linaro.org> Date: Sun, 11 Jan 2015 21:51:12 +0100 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Barry Song CC: Thierry Reding , Thomas Gleixner , "linux-arm-kernel@lists.infradead.org" , LKML , DL-SHA-WorkGroupLinux Subject: Re: [PATCH] clocksource: sirf: Remove unused variable References: <1418659160-2115-1-git-send-email-thierry.reding@gmail.com> <548F09B6.6010202@linaro.org> In-Reply-To: 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 01/11/2015 04:58 PM, Barry Song wrote: > 2014-12-16 0:17 GMT+08:00 Daniel Lezcano : >> On 12/15/2014 04:59 PM, Thierry Reding wrote: >>> >>> From: Thierry Reding >>> >>> Commit ef89af1f4380 ("clocksource: sirf: Remove hard-coded clock rate") >>> removes all uses of the timer_div variable. Since the variable is no >>> longer used it should be removed. >>> >>> Signed-off-by: Thierry Reding >>> --- >> >> >> Applied to my tree. Thanks! > > Daniel, > > i didn't find this commit in any tree in kernel.org. am i missing something? Nope, I did probably something wrong. > so i manually rebased "clocksource: marco: rename marco to atlas7" > against this commit. > > can you help to apply the attached patch to your tree? i guess pulling > by arm-soc will cause conflicts. Ok, done. Both patches are in my tree [1]. Thanks -- Daniel [1] https://git.linaro.org/people/daniel.lezcano/linux.git/shortlog/refs/heads/clockevents/3.20 -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog