From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EF05C433B4 for ; Wed, 12 May 2021 19:35:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E717361289 for ; Wed, 12 May 2021 19:35:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380272AbhELTaw (ORCPT ); Wed, 12 May 2021 15:30:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344607AbhELRCG (ORCPT ); Wed, 12 May 2021 13:02:06 -0400 Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B834EC061348 for ; Wed, 12 May 2021 09:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=1JP4F+Z9+TEOr0TNcfdbm6Mnb1AommIz0iuHgy4wIgg=; b=ozvazW/OivZjzHfhztUO7Vh79y +cMUKNxfW6aohgg2DRwMyadT/ggbxJ4ENcHNY/4vE22QX9TNy43WLrgdkbUCPO9kh8JSuzdpuVXjF sVDR8AJ8jZUVXFuAnGaC9KtcUz6gHRk3uGnV/+2znI1DXu/saAVJuSLZZjddIjSdtrgWIalarFWm/ gA94+HU19Lv0x4rVNpmX7dfjV5OPpXzZQTf+vXBkgORipr9djg9/47+I0ohteMt4XKsiqgbicCRwF zGVlY9mdU2N68XgLDW+IogRRa0co7Y7j0RGn+wa557RQUOE9B1HGYMsLQFWRcDKIWVp4uLktpEzbV vtj2ok4g==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1lgs7s-003OE0-BP; Wed, 12 May 2021 16:54:24 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 8B1C33001E1; Wed, 12 May 2021 18:54:19 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 7907528B39B05; Wed, 12 May 2021 18:54:19 +0200 (CEST) Date: Wed, 12 May 2021 18:54:19 +0200 From: Peter Zijlstra To: Steven Rostedt Cc: Leo Yan , Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , Thomas Gleixner , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org Subject: Re: [PATCH] locking/lockdep: Correct calling tracepoints Message-ID: References: <20210512120937.90211-1-leo.yan@linaro.org> <20210512093202.5fca1259@gandalf.local.home> <20210512111439.5f80f707@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210512111439.5f80f707@gandalf.local.home> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 12, 2021 at 11:14:39AM -0400, Steven Rostedt wrote: > On Wed, 12 May 2021 16:05:33 +0200 > Peter Zijlstra wrote: > > > Thing is, if you look at the list copy: > > > > https://lore.kernel.org/lkml/20200821085348.782688941@infradead.org/ > > > > things were okay. I suspect there was a conflict at some point and > > resolution got it backwards because the hunks are so similar and I never > > noticed :/ > > Was this a git merge issue or a quilt merge issue ? Probably quilt, I never do anything like that with git.