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 99A13C54EAA for ; Fri, 27 Jan 2023 10:39:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231276AbjA0Kj6 (ORCPT ); Fri, 27 Jan 2023 05:39:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232052AbjA0Kjw (ORCPT ); Fri, 27 Jan 2023 05:39:52 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDCE879610 for ; Fri, 27 Jan 2023 02:39:43 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id p26so1287202ejx.13 for ; Fri, 27 Jan 2023 02:39:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=SHUCKrA1MY38l7jRww/OzcG36j2wbt8exUM91ClGZ4Y=; b=5d6apryI9mFbBoUjZOS8Xx1ePaL4MxM3dEbE5pWtVW8mPdMWkqpsB84y55XhvLEkAs E1r7D3SNDM4nhNiRs43v4lYkMD7jYBz9gVlGfCxWEQRyUs+rPmnbSwzif5IeGeyjcN8C Zcu9pP4M5yYJSdL5O1qezEhrzlf8fvahLBwReFvKawehm7xtpz+bfx5VtcGaa4umgjOm s1kUiIrWx73bFXL9Id4uzksKiSdNuxYrUhe7G/78yTG5ESqjvYfcdJG/RRzT+1bcDMCU v4gSITujqY5K7DrOI8KgkxsNVaG/MjXnndyCsQ9wVak5ppj6a34t0k3d8xN/eYb4xSvB 8uzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SHUCKrA1MY38l7jRww/OzcG36j2wbt8exUM91ClGZ4Y=; b=TDYRxst4TG2d7kGmHQ0RDNpLA4hzk+Z+NQw8O33miVpXAvnLPtDGg3EOHvOl+knrDT HRZHwy1uWCiEIR9rTmELRPOU4J3RkLW7lJYXOEEZ3RLcttjZgaAfvNVctaxcKK+XN1SI tr9EUxylDgsgJABJiu2g9h5Ij7BOIrdpNNRNwl1YomSgNq/2bU2o9nBJ+VD9Qg5IFP7y WGSKefy6F+21ZCrwrELRAuIpx8lTbh/AlQ5HAd7vOJURpM3Gs/GJ+hBXLuM09hGUj9a1 y8ODS+eds5hnU0PZM7g70AOC8W0Kp49DcPL0pltn3HsESEKbjiR0TQkGOvHjdTOyFStA JlXQ== X-Gm-Message-State: AFqh2koKowX/xfTcxqTBksvIoGYC72DamaNOPNYX1TunQ0Fp+imffll1 nCTfaDhqiKTgK9Ubl/ek4pVEdw== X-Google-Smtp-Source: AMrXdXukb3OHj8+zRZM4EDwTZoRvm5RlruWK3CW5QoarRIhNICqbspdxta5wCU8TbbyusGrXGZr2Mw== X-Received: by 2002:a17:906:8608:b0:86b:9216:2ddb with SMTP id o8-20020a170906860800b0086b92162ddbmr42868059ejx.52.1674815982304; Fri, 27 Jan 2023 02:39:42 -0800 (PST) Received: from [10.44.2.5] ([81.246.10.41]) by smtp.gmail.com with ESMTPSA id hd16-20020a170907969000b0087854d35687sm2049640ejc.172.2023.01.27.02.39.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Jan 2023 02:39:41 -0800 (PST) Message-ID: <1de50d67-1c1d-bf5e-5409-d0cc19aeda73@tessares.net> Date: Fri, 27 Jan 2023 11:39:41 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: linux-next: manual merge of the net-next tree with the net tree Content-Language: en-GB To: Stephen Rothwell , David Miller , Networking Cc: Gerhard Engleder , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List References: <20230127123604.36bb3e99@canb.auug.org.au> From: Matthieu Baerts In-Reply-To: <20230127123604.36bb3e99@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Hi Stephen, On 27/01/2023 02:36, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/engleder/tsnep_main.c > > between commit: > > 3d53aaef4332 ("tsnep: Fix TX queue stop/wake for multiple queues") > > from the net tree and commit: > > 25faa6a4c5ca ("tsnep: Replace TX spin_lock with __netif_tx_lock") > > from the net-next tree. Thank you for the proposed patch. I had the same conflict on my side with MPTCP when merging net-next with -net and your fix seems to do the job correctly! Tested-by: Matthieu Baerts Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net