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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF28CC433FE for ; Tue, 22 Mar 2022 04:52:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236578AbiCVExd (ORCPT ); Tue, 22 Mar 2022 00:53:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236545AbiCVExc (ORCPT ); Tue, 22 Mar 2022 00:53:32 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E96BB188D; Mon, 21 Mar 2022 21:52:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C177CB81B7D; Tue, 22 Mar 2022 04:51:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72538C340EC; Tue, 22 Mar 2022 04:51:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647924718; bh=eKcLWgpHdf9XPGlZN+BHHdUf5YEZfdRlI78wdT/+Xg4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=oUA2kdr5H79czLwPSKctVD/I+r/J0wt8ZbNJUSZPjKx2IF/9UfbirKRI+ZjTJWZla 5GsmxvxkkHqwZtibJx3CE16a/2dUP8zDcnFZIxNJrrrAtw9N+HH3cKntzbesgez7Wm 63O/bOiS8QaRh79TLD9lbgJYAhPXOud+bo4sLEjCOxz0hLHFFyZtSVL4Z/PAC1bkMF 6TQ05OTRVwdaT49VLHoqkXku7T8bZTohwq4E151IhzG0YYW/GUCbrlo09FeFJtgAXc Li6rkKj/uQ77BgX+QOP+aaSxYQ3aDpSx4tg2uGHq+mjfogVu8tF90NAUTahOm4i/Gc 38lfIxP+tmOiw== Date: Tue, 22 Mar 2022 13:51:51 +0900 From: Masami Hiramatsu To: Alexei Starovoitov Cc: Stephen Rothwell , Peter Zijlstra , Daniel Borkmann , Andrii Nakryiko , Linus Torvalds , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Linux Kernel Mailing List , Linux Next Mailing List , Masami Hiramatsu , Steven Rostedt , Alexei Starovoitov , "H.J. Lu" , "Edgecombe, Rick P" , Mike Rapoport , linux-toolchains , Andrew Cooper , Nick Desaulniers , bpf , Networking , David Miller , Jakub Kicinski Subject: Re: linux-next: build warnings after merge of the tip tree Message-Id: <20220322135151.307e7d7c478d1263e0eef43e@kernel.org> In-Reply-To: References: <20220321140327.777f9554@canb.auug.org.au> <20220322090541.7d06c8cb@canb.auug.org.au> <20220322094526.436ca4f7@elm.ozlabs.ibm.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-toolchains@vger.kernel.org On Mon, 21 Mar 2022 15:50:17 -0700 Alexei Starovoitov wrote: > On Mon, Mar 21, 2022 at 3:46 PM Stephen Rothwell wrote: > > > > Hi Alexei, > > > > On Mon, 21 Mar 2022 15:12:05 -0700 Alexei Starovoitov wrote: > > > > > > That makes little sense. It's not an unusual merge conflict. > > > Peter's endbr series conflict with Masami's fprobe. > > > Peter has a trivial patch that fixes objtool warning. > > > The question is how to land that patch. > > > I think the best is for Linus to apply it after bpf-next->net-next gets > > > merged. > > > > Peter has other concerns, please read the thread and consider them. > > Masami is an expert in kprobe. He copy pasted a bit of kprobe logic > to make it into 'multi kprobe' (he calls it fprobe). > I believe he knows what he's doing. > Steven reviewed and tested that set. > We've tested it as well and don't have any correctness or api concerns. Sorry, that's my mistake to not Ccing to arch maintainers for the arch dependent patches. Let me update and send v13 for this fprobe series. Thank you, -- Masami Hiramatsu