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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 6E753C76186 for ; Mon, 29 Jul 2019 20:54:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3315E20657 for ; Mon, 29 Jul 2019 20:54:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="PUZtEkof" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388301AbfG2Uy1 (ORCPT ); Mon, 29 Jul 2019 16:54:27 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:33745 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388000AbfG2Uy0 (ORCPT ); Mon, 29 Jul 2019 16:54:26 -0400 Received: by mail-pg1-f196.google.com with SMTP id f20so19614551pgj.0 for ; Mon, 29 Jul 2019 13:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=kUnRI+uvJWm0GEes59B4xRjFxCb8u1sHiDruwlb6sEw=; b=PUZtEkofS0tuKRa0Y42gQnH+EFFqyMmBaoflL0/HCseT3Azp1TlUimsvuLHBQZ8faM j9QFOlyizkdyatCpizKD1XCXy2Z+fWIA7Hq+J/+D8LbDAYffTvRy7ZDB09u/dLC7dlgg ULxTcBoFONaKZXa4SbYNcBynaEHTTrN9295v8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=kUnRI+uvJWm0GEes59B4xRjFxCb8u1sHiDruwlb6sEw=; b=ThNAArZczYz0ll0Fd7ZPmZSkYmLU45EqhCMjMH50E3W5gUVRyGvicJN8IbwJ2eSfxC c3X3u0T2wq0gmsRdabkCAYngSU263MX7hlI9EfVE5wcHl5kgzx3RW+DG3KKTNOMFEtOC Vrco6wjW8zvwvGuJAdRBnnSwg2FgEluyrzHlGo/N/zrBmXsae9FU/cCB8rNF+O10vXwk tKnwSWI+Ok5y30t5fMYBzk9G5aXhHLcNBRK8s8Plzt7DwA5SKeDWoqxuUAVEJTxF1sYr fOgn4pYMvntkcZoUa1BOQNB5gkwAgUliTb6lG0oJCZCHQ7Sv6Uo/1PzIV/6YLndHhgoM QFcA== X-Gm-Message-State: APjAAAUaidmjvYea3N5IiEi+bY0D8IckW3cu0AOS7T+XygHrq6GEFKhu YrY5bmcxtFocBYMi6uBE6gUs3Q== X-Google-Smtp-Source: APXvYqyfu6rl0NgVHNMaFe7oafd3oXnl6CYxWurF+gzg7S0Kxk7sgbWQTGGb7bPzwF0wjChHKhGXSg== X-Received: by 2002:a63:ab08:: with SMTP id p8mr16749967pgf.340.1564433665728; Mon, 29 Jul 2019 13:54:25 -0700 (PDT) Received: from localhost ([2620:15c:202:1:75a:3f6e:21d:9374]) by smtp.gmail.com with ESMTPSA id 201sm74608960pfz.24.2019.07.29.13.54.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:54:25 -0700 (PDT) Date: Mon, 29 Jul 2019 13:54:22 -0700 From: Matthias Kaehlcke To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Douglas Anderson , Nick Desaulniers , Alexander Duyck , "David S. Miller" , Sasha Levin , Toralf =?utf-8?Q?F=C3=B6rster?= , Nathan Huckleberry Subject: Re: [PATCH 5.2 083/215] net/ipv4: fib_trie: Avoid cryptic ternary expressions Message-ID: <20190729205422.GH250418@google.com> References: <20190729190739.971253303@linuxfoundation.org> <20190729190753.998851246@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20190729190753.998851246@linuxfoundation.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Greg, Toralf just pointed out in another thread that the commit message and the content of this patch don't match (https://lkml.org/lkml/2019/7/29/1475) I did some minor digging, the content of the queued patch is: commit 4df607cc6fe8e46b258ff2a53d0a60ca3008ffc7 Author: Nathan Huckleberry Date: Mon Jun 17 10:28:29 2019 -0700 kbuild: Remove unnecessary -Wno-unused-value however the commit message is from: commit 25cec756891e8733433efea63b2254ddc93aa5cc Author: Matthias Kaehlcke Date: Tue Jun 18 14:14:40 2019 -0700 net/ipv4: fib_trie: Avoid cryptic ternary expressions It seems this hasn't been commited to -stable yet, so we are probably in time to remove it from the queue before it becomes git history and have Nathan re-spin the patch(es). On Mon, Jul 29, 2019 at 09:21:19PM +0200, Greg Kroah-Hartman wrote: > [ Upstream commit 25cec756891e8733433efea63b2254ddc93aa5cc ] > > empty_child_inc/dec() use the ternary operator for conditional > operations. The conditions involve the post/pre in/decrement > operator and the operation is only performed when the condition > is *not* true. This is hard to parse for humans, use a regular > 'if' construct instead and perform the in/decrement separately. > > This also fixes two warnings that are emitted about the value > of the ternary expression being unused, when building the kernel > with clang + "kbuild: Remove unnecessary -Wno-unused-value" > (https://lore.kernel.org/patchwork/patch/1089869/): > > CC net/ipv4/fib_trie.o > net/ipv4/fib_trie.c:351:2: error: expression result unused [-Werror,-Wunused-value] > ++tn_info(n)->empty_children ? : ++tn_info(n)->full_children; > > Fixes: 95f60ea3e99a ("fib_trie: Add collapse() and should_collapse() to resize") > Signed-off-by: Matthias Kaehlcke > Reviewed-by: Douglas Anderson > Reviewed-by: Nick Desaulniers > Acked-by: Alexander Duyck > Signed-off-by: David S. Miller > Signed-off-by: Sasha Levin > --- > scripts/Makefile.extrawarn | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn > index 3ab8d1a303cd..b293246e48fe 100644 > --- a/scripts/Makefile.extrawarn > +++ b/scripts/Makefile.extrawarn > @@ -68,7 +68,6 @@ else > > ifdef CONFIG_CC_IS_CLANG > KBUILD_CFLAGS += -Wno-initializer-overrides > -KBUILD_CFLAGS += -Wno-unused-value > KBUILD_CFLAGS += -Wno-format > KBUILD_CFLAGS += -Wno-sign-compare > KBUILD_CFLAGS += -Wno-format-zero-length