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=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS 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 4EFE1C433E6 for ; Thu, 14 Jan 2021 17:16:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 213DC23B1A for ; Thu, 14 Jan 2021 17:16:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728848AbhANRPh (ORCPT ); Thu, 14 Jan 2021 12:15:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:57282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726172AbhANRPg (ORCPT ); Thu, 14 Jan 2021 12:15:36 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1C723238EC; Thu, 14 Jan 2021 17:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610644495; bh=RDEJdDVwILr1jM/hUHMK43X/Aq2TqFRPO473xjQ/s4U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=k4n/STNmaNHIWsT916GZmz4QENJO11kKIpmhTvbk+3HBZbLsJS5+OOU5kdJp8GsqJ jc7NomeF0hPCzT0GF0uPkxUbffiWCJr1vCgbcugvXeJHZonSh7o/oKtcZOT/9Ses5D cZacciofUZDcTAyidREbaNUiW32XgyI3zoa+jFvu05di+mGUv2rGqJEO7IoesrXS5O 1eBMFEKEF79c6FsTgQU6A6tHuxBjMVP6GlaxD3sbs/SfjxsYWPCEXyJWCmt+i8czt3 9/X4W4WmRiMBPIHSF6tMMy3SVsQJc3YdRAosQp9cOyWYmerHidiQ+Rvdi/KmnmiQSo 2+qDHsOaHb3Ng== Date: Thu, 14 Jan 2021 09:14:53 -0800 From: Jakub Kicinski To: Lee Jones Cc: linux-kernel@vger.kernel.org, Alexei Starovoitov , Benjamin Herrenschmidt , bpf@vger.kernel.org, Daniel Borkmann , Dany Madden , Daris A Nevil , "David S. Miller" , Erik Stahlman , Geoff Levand , Grygorii Strashko , "Gustavo A. R. Silva" , Ishizaki Kou , Ivan Khoronzhuk , Jens Osterkamp , Jesper Dangaard Brouer , John Allen , John Fastabend , Kurt Kanzenbach , Lijun Pan , linuxppc-dev@lists.ozlabs.org, Michael Ellerman , netdev@vger.kernel.org, Nicolas Pitre , Paul Durrant , Paul Mackerras , Peter Cammaert , Russell King , Rusty Russell , Santiago Leon , Sukadev Bhattiprolu , Thomas Falcon , Utz Bacher , Wei Liu , xen-devel@lists.xenproject.org Subject: Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet Message-ID: <20210114091453.30177d20@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20210114083349.GI3975472@dell> References: <20210113164123.1334116-1-lee.jones@linaro.org> <20210113183551.6551a6a2@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> <20210114083349.GI3975472@dell> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote: > On Wed, 13 Jan 2021, Jakub Kicinski wrote: > > > On Wed, 13 Jan 2021 16:41:16 +0000 Lee Jones wrote: > > > Resending the stragglers again. > > > > > > This set is part of a larger effort attempting to clean-up W=1 > > > kernel builds, which are currently overwhelmingly riddled with > > > niggly little warnings. > > > > > > v2: > > > - Squashed IBM patches > > > - Fixed real issue in SMSC > > > - Added Andrew's Reviewed-by tags on remainder > > > > Does not apply, please rebase on net-next/master. > > These are based on Tuesday's next/master. What's next/master? This is net-next: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/ > I just rebased them now with no issue. > > What conflict are you seeing? Applying: net: ethernet: smsc: smc91x: Fix function name in kernel-doc header error: patch failed: drivers/net/ethernet/smsc/smc91x.c:2192 error: drivers/net/ethernet/smsc/smc91x.c: patch does not apply Patch failed at 0001 net: ethernet: smsc: smc91x: Fix function name in kernel-doc header hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".