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 ECA3CC7618E for ; Thu, 20 Apr 2023 23:40:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229761AbjDTXk2 (ORCPT ); Thu, 20 Apr 2023 19:40:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbjDTXk1 (ORCPT ); Thu, 20 Apr 2023 19:40:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E15E196 for ; Thu, 20 Apr 2023 16:40:21 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 9812B64CD1 for ; Thu, 20 Apr 2023 23:40:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id EF0FAC433D2; Thu, 20 Apr 2023 23:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682034020; bh=oqfROW44poag7AwCwZ5sO6q1Sn56/FNongi51VRQzjA=; h=Subject:From:Date:References:In-Reply-To:To:Cc:From; b=jc1iOY1+mLGHqMlLMy/xkBF0dkBc0RHVxnL3j/Yr5PZ11XDIQxgRv5RYFfUykZWWr VA6nmvaVLdkwmlOHGsXa0pbSDyYWUitmOnYMUcaE1OMNscI5/BJHWJBvM5GPluFK2a uWozIn2bu1TG2NcqLv6d4rpnq46+k/Znqv9DEJh3797syNeS27BdXCG1UxQT9uMTR/ OVD2Wwb7DEVL2dNi3yW3w8hByRS6B+2bnQhrSY/kd86AlkHknhzXB8RJkPnjhA1aHR /rMVMC9k4N5jh+S43/I2d5263YWXkncPjp9wjU3hIc/qsls5s8KtS0ZMsranE4TXKo JUX21yfUGJfjA== Received: from aws-us-west-2-korg-oddjob-1.ci.codeaurora.org (localhost.localdomain [127.0.0.1]) by aws-us-west-2-korg-oddjob-1.ci.codeaurora.org (Postfix) with ESMTP id D2984E501E3; Thu, 20 Apr 2023 23:40:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [PATCH bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict From: patchwork-bot+netdevbpf@kernel.org Message-Id: <168203401985.29653.2966948536924910337.git-patchwork-notify@kernel.org> Date: Thu, 20 Apr 2023 23:40:19 +0000 References: <20230420003333.90901-1-quentin@isovalent.com> In-Reply-To: <20230420003333.90901-1-quentin@isovalent.com> To: Quentin Monnet Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, bpf@vger.kernel.org, broonie@kernel.org, hca@linux.ibm.com, sfr@canb.auug.org.au, liam.howlett@oracle.com, acme@redhat.com, svens@linux.ibm.com, tmricht@linux.ibm.com Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Hello: This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko : On Thu, 20 Apr 2023 01:33:33 +0100 you wrote: > The recent support for inline annotations in control flow graphs > generated by bpftool introduced the usage of the "__fallthrough" macro > in a switch/case block in btf_dumper.c. This change went through the > bpf-next tree, but resulted in a merge conflict in linux-next, because > this macro has been renamed "fallthrough" (no underscores) in the > meantime. > > [...] Here is the summary with links: - [bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict https://git.kernel.org/bpf/bpf-next/c/4b7ef71ac977 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html