From patchwork Wed Aug 14 10:51:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 2844366 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2EE119F2F4 for ; Wed, 14 Aug 2013 10:51:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3281220599 for ; Wed, 14 Aug 2013 10:51:43 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DEDC520598 for ; Wed, 14 Aug 2013 10:51:41 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9Yfy-0003YS-Pd; Wed, 14 Aug 2013 10:51:39 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9Yfw-0005Ar-9P; Wed, 14 Aug 2013 10:51:36 +0000 Received: from mail-wi0-f180.google.com ([209.85.212.180]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9Yft-0005AD-5p for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2013 10:51:34 +0000 Received: by mail-wi0-f180.google.com with SMTP id f14so1763819wiw.13 for ; Wed, 14 Aug 2013 03:51:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=HOxbIYeVSZdE0lX+CZUrrcBFwSoPSJQbxqU/trNIOV0=; b=IoIG4bWAwXqOEtdjnXuxT4xqK79eV+ZUvH+G32g5aQofx8kId6SGKx0rKmXxhXnBWv jn9FF6cO78Wx64rDkIUlFt3De7b6Vp02kot9myHyu5X/i/2vKi5EFpHPJynLNIx1xWyk /cU2lscqlVrSJJKqmc3x3Rpi8ZyKRJIu/12BGRy5SXmZ1im89NNom9WkJ/3OanHwFuUV JY726O/r8dLCfHUhZP277A5lzAGk2uXiiEfWdwc+gy7TE3+ykcEIespy8PuycL0e8TyN 6KQIwKvK6SrCy0yZKYsou3MghsvClZXp2aHgykjL1XPOImH4VMw1Llt7NdHBjrFln2tZ 7UHQ== X-Gm-Message-State: ALoCoQkuDHwSlwIpFx44kjDN5Qq3zcLo/riyEaCS5yvQK1/7v6yHTk15xOaEioTjg81bSu+LMagg X-Received: by 10.194.9.229 with SMTP id d5mr82213wjb.66.1376477470956; Wed, 14 Aug 2013 03:51:10 -0700 (PDT) Received: from [192.168.1.150] (AToulouse-654-1-360-10.w90-60.abo.wanadoo.fr. [90.60.119.10]) by mx.google.com with ESMTPSA id b13sm2178302wic.9.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Aug 2013 03:51:10 -0700 (PDT) Message-ID: <520B611D.8060500@linaro.org> Date: Wed, 14 Aug 2013 12:51:09 +0200 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Sudeep KarkadaNagesha Subject: Re: [PATCH v3 0/6] ARM/ARM64 architected timer updates References: <1374492082-13686-1-git-send-email-Sudeep.KarkadaNagesha@arm.com> <1376414984-14182-1-git-send-email-Sudeep.KarkadaNagesha@arm.com> <520B490A.4090109@linaro.org> <520B4B2E.1040700@arm.com> In-Reply-To: <520B4B2E.1040700@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130814_065133_324602_D92C3C56 X-CRM114-Status: GOOD ( 20.29 ) X-Spam-Score: -2.6 (--) Cc: Lorenzo Pieralisi , Catalin Marinas , Will Deacon , "linux-kernel@vger.kernel.org" , Thomas Gleixner , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 08/14/2013 11:17 AM, Sudeep KarkadaNagesha wrote: > On 14/08/13 10:08, Daniel Lezcano wrote: >> On 08/13/2013 07:29 PM, Sudeep KarkadaNagesha wrote: >>> From: Sudeep KarkadaNagesha >>> >>> This patch series adds support to configure the rate and enable the >>> event stream for architected timer. The event streams can be used to >>> impose a timeout on a WFE, to safeguard against any programming error >>> in case an expected event is not generated or even to implement >>> wfe-based timeouts for userspace locking implementations. >>> >>> Since the timer control register is reset to zero on warm boot, CPU >>> PM notifier is added to re-initialize it. >> >> It does not apply to my tree. >> >> Against which tree is this patchset ? Who is supposed to take it ? >> > As I had mentioned in previous version, because of the conflict, I had > to rebase it on 3.11-rc4 dlezcano@mai:~/Work/src/clockevents$ git show commit c095ba7224d8edc71dcef0d655911399a8bd4a3f Author: Linus Torvalds Date: Sun Aug 4 13:46:46 2013 -0700 Linux 3.11-rc4 dlezcano@mai:~/Work/src/clockevents$ git am -s arch_timer Applying: ARM/ARM64: arch_timer: add macros for bits in control register Applying: drivers: clocksource: configure event stream for ARM arch timer Applying: ARM: arch_timer: configure and enable event stream Applying: ARM64: arch_timer: configure and enable event stream Applying: drivers: clocksource: add CPU PM notifier for ARM architected timer error: patch failed: drivers/clocksource/arm_arch_timer.c:160 error: drivers/clocksource/arm_arch_timer.c: patch does not apply Patch failed at 0005 drivers: clocksource: add CPU PM notifier for ARM architected timer When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". >>> Changes v2->v3: >>> 1. Moved ARM and ARM64 changes into separate patches >>> 2. Added native hwcaps definations(ARM/ARM64) and compat-specific >>> definitions(ARM64) to the users for the event stream feature. >> >> Ok, we have the choice: >> 1. split the patchset into arch/arm changes and drivers/clocksource >> 2. I ack the patchset and Olof/Kevin take it >> 3. Olof/Kevin ack the patchset and I take it in my tree. >> >> This is really becoming fuzzy. >> > I am not sure if we need to split it. It would get too messy because of > dependencies. Once we have ACKs from all the corresponding maintainers, > it can go through one of the tree. > >> If you want a maintainer to take a patchset you have to send an email >> --to him and --cc mailing list and others concerned by the patchset. >> > Ok understood. > > Regards, > Sudeep > diff --git a/Makefile b/Makefile index 95a8e55..f93d4f7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 11 SUBLEVEL = 0 -EXTRAVERSION = -rc3 +EXTRAVERSION = -rc4 NAME = Linux for Workgroups # *DOCUMENTATION*