Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp5129355rwb; Mon, 31 Jul 2023 19:15:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlHoV6M1OX6kQgnWYA7fQo/Urh0ZhmHw71lAAnyLvbkey4wOdh0BhGBwAG4OE3xhW+d7KASD X-Received: by 2002:a17:907:78cb:b0:997:decf:11e7 with SMTP id kv11-20020a17090778cb00b00997decf11e7mr1175701ejc.12.1690856100633; Mon, 31 Jul 2023 19:15:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690856100; cv=none; d=google.com; s=arc-20160816; b=xzz3HA6YuGDTXLx5MhkwwAeBm19C4qgRjjZRlBMvX5eoPoAo63yn4x+2ixj6atcxYa +dQsbZK3DZyptnMDPwXgdsgJOEz3y0nt1fWTZq0S5tF6DTs4Px5zdKJlX9YXhTHpE75D Qn8i7N9o7E55CtzlHsgIlfxWIW8+n2aNAA8FnenHEmZf+B4qF5OZid+WNgZyQObyEDlR m9BDn4w/KiQfAhTH6tQykLbUeAWRobT+2uTTxVecyvaDWYhKVLtUcFjNCScwzzgWOC+i y5hdgXNDO3nZkGHIkDb91BGVJxIZKBHY600JYPFPYAg66ZAPW8glmnxhgAgqgwt7MRKu ULWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date; bh=jLeec7BRSK/EYEB4TmIrpNz3n8hsqxSlyuMwtXRPHvQ=; fh=z4naGDl+JufTMJrmjDSFmCqAh8fjYgMonaGcJpXXq6w=; b=XetXcNZ1nBDxNEX7g40C9VzYLuNCZE3voqiO9USAA/DgLiBo2WuD2p/KhQS7Lcf209 sOpGtVd5dqg42BA4xtSWEYhh8sKg9jvctRBDsQLKzlgwf1p0HGTikS6Z9OotmEGRSHbP d4rvzxQvUuEXWF1hLFHuIm/tZ4invRSGJOUpNSJF+XZvOOM+1G90/KqMJ/aTR9fHa8eY DRQWvnvUtnNhm530RAC72l5ojdZy4cYEgnXfO7KmHY0KgouyaKkhsDt9HgUdMZGM/ISj byTu7ijGaNU1BbBZ4nuskUTYfz4rkilma15Eoqguo1fKotnGvt017q3ig1FwtqUJYp8c 2WHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gl23-20020a170906e0d700b00992437c5881si4408247ejb.198.2023.07.31.19.14.37; Mon, 31 Jul 2023 19:15:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231134AbjHABPe (ORCPT + 99 others); Mon, 31 Jul 2023 21:15:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbjHABPc (ORCPT ); Mon, 31 Jul 2023 21:15:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B049210E7; Mon, 31 Jul 2023 18:15:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4F4C861355; Tue, 1 Aug 2023 01:15:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7079AC433C7; Tue, 1 Aug 2023 01:15:29 +0000 (UTC) Date: Mon, 31 Jul 2023 21:15:27 -0400 From: Steven Rostedt To: Alexei Starovoitov Cc: "Masami Hiramatsu (Google)" , linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Linus Torvalds Subject: Re: [PATCH v4 3/9] bpf/btf: Add a function to search a member of a struct/union Message-ID: <20230731211527.3bde484d@gandalf.local.home> In-Reply-To: References: <169078860386.173706.3091034523220945605.stgit@devnote2> <169078863449.173706.2322042687021909241.stgit@devnote2> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 31 Jul 2023 14:59:47 -0700 Alexei Starovoitov wrote: > Assuming that is addressed. How do we merge the series? > The first 3 patches have serious conflicts with bpf trees. > > Maybe send the first 3 with extra selftest for above recursion > targeting bpf-next then we can have a merge commit that Steven can pull > into tracing? Would it be possible to do this by basing it off of one of Linus's tags, and doing the merge and conflict resolution in your tree before it gets to Linus? That way we can pull in that clean branch without having to pull in anything else from BPF. I believe Linus prefers this over having tracing having extra changes from BPF that are not yet in his tree. We only need these particular changes, we shouldn't be pulling in anything specific for BPF, as I believe that will cause issues on Linus's side. -- Steve > > Or if we can have acks for patches 4-9 we can pull the whole set into bpf-next.