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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B054C433EF for ; Tue, 2 Nov 2021 03:14:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5580A60EE9 for ; Tue, 2 Nov 2021 03:14:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231873AbhKBDRT (ORCPT ); Mon, 1 Nov 2021 23:17:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbhKBDRS (ORCPT ); Mon, 1 Nov 2021 23:17:18 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A0E9C061714 for ; Mon, 1 Nov 2021 20:14:44 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id m14so18008717edd.0 for ; Mon, 01 Nov 2021 20:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=KHkSeemGPSvNiCh0s45k04F2zwQ0kuwkYVmbYsHMt8o=; b=EgiznZQNFI7r6O00KTXk7Ec0KBjB5MD7j7Q7Vt8ty3OZq0TTmFpp0STErNyzw6TOMv 4FY+oJFrfNjh6hAiVr0WDZATY6EONr3+qDov4y/RR2USrRSzJWbQmy9hcdgE0NjhXtTt CgDTNcSNzmODBrlinMP9n3Z9uFViS/4oL5qjo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=KHkSeemGPSvNiCh0s45k04F2zwQ0kuwkYVmbYsHMt8o=; b=tkm7YVrEYLrvILq8yr++QH3l3qXC3L1nYiAF9AHh3zu5X1y2Y8l/os35NfhO6CMejP dMb4SWbjDNu+doqVJ38vnaJwhreJfH2FPxiqazRbsoDUtKmZBUN4RRfkG/aWuB0I7+j4 HE8MUwnkQwPJxhOq9ZvqakV04UhvSvOunvEg7ktVW0RoKP3ZakmkZveo2faPneXoUrcC NrYir4KJBDjznY8Bzd7cHzTZikGBij4O0/mLynAFNXdamQxF3E5r6EldGCXbCp41UwO4 /uigA9AQ/A3Oc8OCZMcsesDkPO/i+tmjTFaKIMoOYA5MTdDuXWZMvsmrBHHYc123njpu WpOg== X-Gm-Message-State: AOAM531ayV1JqtXK0SxfBstcl+8dEpoHTyFi6MAWDKixf4eyVA9nHKMZ P3y4t7PRj5GuK4seMPdofkMqE9cD7rdpKRlfBMo= X-Google-Smtp-Source: ABdhPJz8VGqalF5HQPNThahWo6/MdqkHzADEaaH9xXAgFAupQuZPesHOctnfyPYwS7ZcTbJ43ZAP4A== X-Received: by 2002:a17:907:6eaa:: with SMTP id sh42mr33455574ejc.556.1635822882527; Mon, 01 Nov 2021 20:14:42 -0700 (PDT) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com. [209.85.208.44]) by smtp.gmail.com with ESMTPSA id w18sm10341661edc.4.2021.11.01.20.14.42 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 01 Nov 2021 20:14:42 -0700 (PDT) Received: by mail-ed1-f44.google.com with SMTP id z20so71293427edc.13 for ; Mon, 01 Nov 2021 20:14:42 -0700 (PDT) X-Received: by 2002:a19:ad0c:: with SMTP id t12mr31485660lfc.173.1635822526470; Mon, 01 Nov 2021 20:08:46 -0700 (PDT) MIME-Version: 1.0 References: <20211101175544.00fc0d57@gandalf.local.home> In-Reply-To: <20211101175544.00fc0d57@gandalf.local.home> From: Linus Torvalds Date: Mon, 1 Nov 2021 20:08:30 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] tracing: Updates for 5.16 To: Steven Rostedt Cc: LKML , Arnd Bergmann , Carles Pey , Changbin Du , Daniel Bristot de Oliveira , Jiri Olsa , Josh Poimboeuf , Kalesh Singh , Masami Hiramatsu , Mathieu Desnoyers , Punit Agrawal , "Robin H. Johnson" , Song Liu , Sven Schnelle , Tiezhu Yang , Viktor Rosendahl , Wang ShaoBo , Weizhao Ouyang , chongjiapeng , kernel test robot , =?UTF-8?B?546L6LSH?= , Heiko Carstens , "Gustavo A. R. Silva" Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 1, 2021 at 2:55 PM Steven Rostedt wrote: > > Also, this pull request will conflict with your tree against a fix I had > for trace recursions. I did the conflict resolution and pushed it to my > ftrace/conflicts branch if you want to reference it. In the meantime, my tree had grown a few more conflicts elsewhere, but it all looked fairly straightforward. It might be a good idea if you were to double-check that everything looks good, though. Linus