From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83AFC3D980; Thu, 26 Oct 2023 22:21:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DWt7kbDw" Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 035DBCC; Thu, 26 Oct 2023 15:21:08 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4084b0223ccso11073175e9.2; Thu, 26 Oct 2023 15:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698358866; x=1698963666; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=BZVyVYzi+6QbDuBCDPXiv+7wbOfcRmZKqyElOZWrfZc=; b=DWt7kbDwohqS9bxyyggcvuxhI5HWgiH+dY5yaD8kijELakjz2DiQoxrFh5QubCBhV6 CLhhLm6BXlYk4KCwSCjEwEh1aIXAZNZb3L+dDf2p9ZOIMMnMBNggC6O206wFSxR+c3Ze byBHekN06lUKX5Av9ZfTcwXed+DeTgw68/Omif5jP0qufMIzY7FlfXoZnhm8ozwq1Kw4 i40qxj+ts+WV8x/xg0jK+cfJW3M5fLMDnoQ1OQPLz4nE6LRsk79+fbLNYOpQCUtD/GY/ o7wgzEyIhNYWqsJWwguT2aGgc80ef9ggtU1ZlLuyxKofo75VpGa0JXDlkgvoOgAoGUeJ l40g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698358866; x=1698963666; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BZVyVYzi+6QbDuBCDPXiv+7wbOfcRmZKqyElOZWrfZc=; b=PNZYTYK9ThUnUQgHR86LgWWvfBnQNi13UPXnrypr7SA66/9pjHjfdV4OHdNlqcd22s GVVuLfmmqQnvfJgOQAlJyD9+Gehftu1Yai5sb3PkxizzCsyqsO1OlR61rCWUl6/7X7L6 ze1hNUGfEhMbMeS4XkRVa1M5KNjKF4gi8em2vuWOzyjT0WJi3U6BH5G8GS3luKChbGaS Q8EmKghHJ8NCtz3WsVct3heBIE9KbHSk7IMIGFIlJ9jXr7+D1CoZETQecX17p0QtyvPW glgtbDSUuY9DPmMyXayNoEv4m6052BuqzF6laO6OPasxSlaaHFnzxCqsw6TuS7KCGikT bsJw== X-Gm-Message-State: AOJu0Yzn+yub9ob1aXZ7YoybPMKDDHVV1seApxDm4DeJLoFUsZRxy590 oyJ4zPSBzGP+dgXfrcDV10I= X-Google-Smtp-Source: AGHT+IEKimHb5xke6jH18TsHWKRxjcjGmlx0/kFhipt1/3/BG8Q2ivqVE2EsAdNFToNo9uL7wPtB6A== X-Received: by 2002:a05:600c:3c9a:b0:409:1d9a:1dec with SMTP id bg26-20020a05600c3c9a00b004091d9a1decmr908421wmb.35.1698358866086; Thu, 26 Oct 2023 15:21:06 -0700 (PDT) Received: from skbuf ([188.26.57.160]) by smtp.gmail.com with ESMTPSA id hg10-20020a05600c538a00b0040775fd5bf9sm148982wmb.0.2023.10.26.15.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 15:21:05 -0700 (PDT) Date: Fri, 27 Oct 2023 01:21:00 +0300 From: Vladimir Oltean To: Justin Stitt Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Noam Dagan , Saeed Bishara , Rasesh Mody , Sudarsana Kalluru , GR-Linux-NIC-Dev@marvell.com, Dimitris Michailidis , Yisen Zhuang , Salil Mehta , Jesse Brandeburg , Tony Nguyen , Louis Peens , Shannon Nelson , Brett Creeley , drivers@pensando.io, "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Ronak Doshi , VMware PV-Drivers Reviewers , Andy Whitcroft , Joe Perches , Dwaipayan Ray , Lukas Bulwahn , Hauke Mehrtens , Andrew Lunn , Florian Fainelli , =?utf-8?B?QXLEsW7DpyDDnE5BTA==?= , Daniel Golle , Landen Chao , DENG Qingfang , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , Linus Walleij , Alvin =?utf-8?Q?=C5=A0ipraga?= , Wei Fang , Shenwei Wang , Clark Wang , NXP Linux Team , Lars Povlsen , Steen Hegelund , Daniel Machon , UNGLinuxDriver@microchip.com, Jiawen Wu , Mengyuan Lou , Heiner Kallweit , Russell King , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Nick Desaulniers , Nathan Chancellor , Kees Cook , intel-wired-lan@lists.osuosl.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bpf@vger.kernel.org Subject: Re: [PATCH next v2 1/3] ethtool: Implement ethtool_puts() Message-ID: <20231026222100.yrjsdlq47djaurjf@skbuf> References: <20231026-ethtool_puts_impl-v2-0-0d67cbdd0538@google.com> <20231026-ethtool_puts_impl-v2-1-0d67cbdd0538@google.com> <20231026220248.blgf7kgt5fkkbg7f@skbuf> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Thu, Oct 26, 2023 at 03:11:28PM -0700, Justin Stitt wrote: > On Thu, Oct 26, 2023 at 3:09 PM Justin Stitt wrote: > > On Thu, Oct 26, 2023 at 3:02 PM Vladimir Oltean wrote: > > > Maybe this is due to an incorrect rebase conflict resolution, but you > > > shouldn't have touched any of the ethtool force speed maps. > > > > Ah, I did have a conflict and resolved by simply moving the hunks > > out of each other's way. Trivial resolution. > > > > Should I undo this? I want my patch against next since it's targeting > > some stuff in-flight over there. BUT, I also want ethtool_puts() to be > > directly below ethtool_sprintf() in the source code. What to do? > > Oh, I just realized my auto formatter had a field day with that function. > I will rectify this in a new version after waiting 24hrs for comments to > trickle in as well. Nothing other than ethtool_puts() should appear in the patch delta. pw-bot: cr