Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp813927iog; Fri, 24 Jun 2022 15:00:13 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sOZbjtNBt4tvHMsu2A7NDItgSw5PBFwTC5ptpLJC1CPFGMwhsxhV9wQp6LXTJtMheXUtmt X-Received: by 2002:a17:902:dac1:b0:16a:7560:2ac4 with SMTP id q1-20020a170902dac100b0016a75602ac4mr1241403plx.55.1656108012840; Fri, 24 Jun 2022 15:00:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656108012; cv=none; d=google.com; s=arc-20160816; b=kf/xOHOb703Bs5r0vrCNtGdegJQxvksYmCDsp1d0w5TBZK4RLy6Z8mHuLrOIKKfTJp YvZemsRL6CDxZjp8Ho5kn6icV/Y2xtTNfLcekHgW3bIBQOzX4q8tjfym2TBC23XJ9f3U kyFEahYk8201fCO2jweRLR3w4xvgxyRPsjRNxv95f9O9OHLXOyEZfsNbBKxd3WPdCBtz xf6jANwJXT+PL9WPS7EYCEl8A+4w0Zi6ljZh8f8dlsAZVnTpbHCXaqXxd5ilFxEDGvMM CySYdCW0HlBwXcr6qICc0DUAhmKNmPMKo/qYY6NIgavrLLAV2OuDettpX4Yumv8F0LUe eIYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=1vw6jDbAQBJV5McJnm/NPAs3IUSFuM5RtJnklI0XcBw=; b=rzmD63tjHMtZmmHmLvy84h9zWyfq0z4TqhU8NMfql2GHTAiOJ9Wjs+GD92rHQTPUcz XspaxGxio2vryQo7oNYEFq2R4EfnwMznZFGP3nzjdAeUTBlkPVRAOhImysPsz0NvOobb Mulm2BkGHTg8m8UiqkgbWmg88tSC5W+q8nS4TaWy9KzCR/fa38Fc8lPQQweMtcRDAars aSAK/siaauaHWvyYKdn9OU/MhUBd9JO6JCDd/6qQSVTNMUZX63AgabRRB2UP1+mziRoy DzQfB1g5+StHXAPXWJna+sZMt/Pq8xHtVSnpB5ZO96kwQyZOBRQnz726zCITTqt2hXTU nh8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fYes7wtj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m8-20020a635808000000b0040c8d0953c5si4152120pgb.49.2022.06.24.15.00.00; Fri, 24 Jun 2022 15:00:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fYes7wtj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231615AbiFXVw1 (ORCPT + 99 others); Fri, 24 Jun 2022 17:52:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231587AbiFXVw0 (ORCPT ); Fri, 24 Jun 2022 17:52:26 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14E3E87B58; Fri, 24 Jun 2022 14:52:25 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id z7so5186753edm.13; Fri, 24 Jun 2022 14:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=1vw6jDbAQBJV5McJnm/NPAs3IUSFuM5RtJnklI0XcBw=; b=fYes7wtj5Vr+nx/Rmneu8OyzNivPtagsx6buJNAs3bhAT4HCNyExMQbYh8UIKMOCv5 5o78i8Z3k5t7+w3weCmlwLqhTy/keiZSO/4VN/t781DtudxuAZYzuHlpNuShzSU67VJv NFRDtIJzYtDSYKDJPx9MgPs5hao3WTZQscxcXSMXqag5xm4b2YCPSC14ljPkgAaTkqVi jyl+RulnirAJinlsogKqQmgd9BWAOTNcsG3eI+jdR4se1ty5ncWFpzGXpH7Cy9a65pbo zGQ0vP63ru1N0hQMDSSkHosLdYi3rNGJRaMsjKeqXSGepoYE18KmsmdnkHnW+rfYk4V9 hkXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=1vw6jDbAQBJV5McJnm/NPAs3IUSFuM5RtJnklI0XcBw=; b=A6NWutPPg6xKW8Xl6EzDO7pnm+ReUqLhah6298eON6U1Zy4Kx+B+UUVH0eS3VQTOyN nxHqppNMP6+IlwxjnB3Q8If+FCFnfunfPMsY9wBkDTDBLMKNYzTVsQuvkte0QwixakcZ jBjUGUgTJKKzP0t32zd4V4+shpsDvyTE2VHxf0Qg/i3IJzK23/oPU/NJ5V8DWNKNyFXg HBdA/XLEnoGONoxgvrgLTpBmkUAJVD+zA+mI81MBkO0PtWTlJcMusk2NAhXALDs4Xm9n j+TNO38uBCkL7QKSGd6gYJOoMva+w4rX53DVSYJc316XXPeO7M66AjiqxJIYm2ZQwuJ/ UMPw== X-Gm-Message-State: AJIora/d00NG/ZF+1U80wA1UlzIJjlVu5+4bLFHIDY6UB9y18+Oq4y1P HodZtc6oWesxnnCx5gFCOU++Qm/EFjA= X-Received: by 2002:a05:6402:354b:b0:437:60fd:4891 with SMTP id f11-20020a056402354b00b0043760fd4891mr1554559edd.344.1656107543674; Fri, 24 Jun 2022 14:52:23 -0700 (PDT) Received: from skbuf ([188.27.185.253]) by smtp.gmail.com with ESMTPSA id d6-20020a170906174600b00715705dd23asm1726474eje.89.2022.06.24.14.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jun 2022 14:52:22 -0700 (PDT) Date: Sat, 25 Jun 2022 00:52:21 +0300 From: Vladimir Oltean To: Oleksij Rempel Cc: Woojung Huh , Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Lukas Wunner , UNGLinuxDriver@microchip.com Subject: Re: [PATCH net-next v1 3/3] net: dsa: microchip: add pause stats support Message-ID: <20220624215221.irniht2xfxftodfw@skbuf> References: <20220624125902.4068436-1-o.rempel@pengutronix.de> <20220624125902.4068436-3-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220624125902.4068436-3-o.rempel@pengutronix.de> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Oleksij, On Fri, Jun 24, 2022 at 02:59:02PM +0200, Oleksij Rempel wrote: > Add support for pause specific stats. > > Tested on ksz9477. > > Signed-off-by: Oleksij Rempel > --- This conflicts with Arun's work: Applying: net: dsa: add get_pause_stats support Applying: net: dsa: ar9331: add support for pause stats Applying: net: dsa: microchip: add pause stats support Using index info to reconstruct a base tree... M drivers/net/dsa/microchip/ksz9477.c M drivers/net/dsa/microchip/ksz_common.c M drivers/net/dsa/microchip/ksz_common.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/dsa/microchip/ksz_common.h CONFLICT (content): Merge conflict in drivers/net/dsa/microchip/ksz_common.h Auto-merging drivers/net/dsa/microchip/ksz_common.c CONFLICT (content): Merge conflict in drivers/net/dsa/microchip/ksz_common.c Auto-merging drivers/net/dsa/microchip/ksz9477.c CONFLICT (content): Merge conflict in drivers/net/dsa/microchip/ksz9477.c error: Failed to merge in the changes. Patch failed at 0003 net: dsa: microchip: add pause stats support