From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2C0429AB for ; Fri, 23 Sep 2022 09:24:07 +0000 (UTC) Received: by mail-ej1-f48.google.com with SMTP id dv25so26528323ejb.12 for ; Fri, 23 Sep 2022 02:24:07 -0700 (PDT) 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; bh=sdhEqqcLQ9mPBvHp0xzH8RN91FNsaGFp1sqEEbf0Klg=; b=8KEj5RkoExqB7QUn1pVTDUOrzMbG1hNThr7BgxpbklpvEXMeqF3jO5MPncDCFjXE5i q4y7h6MF1HLf5sVkFR5zLUyHReyhib6fkML8mtDrmZEqruuHSAjbTlGzxQbu+l+a31bC xTFZgJpUljY8tjpCP/8i/V5n2QIEXXTgwfDtpNXs40EvtmOZUJob7KVi9NHEmDrnHdRE nakPv+SbbaCEzZ4iKMyBoH2yHkMcTo7wzWMKYOHAMHcYt/kHjOByV8w8N6OZ+rpRVpef u3qtaqItwqMGX/i5kuAIpb6C7TOKt4ty69TMnU1Pr7JccOjfKTjm7JebH7zBzS9Ui9zs /Udw== 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; bh=sdhEqqcLQ9mPBvHp0xzH8RN91FNsaGFp1sqEEbf0Klg=; b=5EK41lyIQyzfeseLtapV8s3c3XA1HRX/C8UMnSiz0DgUWkaMa82YxbTU/YZCK5v+iv mRlDuJHCKMQJ7AsVbrh3Z+ejBTevhSnErDgSSawgT/9EB5fqbR28S+P+x6lnSxuqBNyk 4k8M2Pw2FukKjsYc274aXhKKt+4kiRZ754iUBSS8E7Adcm7833pHq1gSD4rCXTPTGZaJ bt3FjmekDsaZEMEHKh1Nyc0EqKbTHsAcIQS1mjGJAB+U5LSMBPP8gttw3FllZqHxAGoi th4IWX3zNUgC5Eu5GXG94YPCrKZDsrPGJHkDBx2fnUDZccb4wxpnFgVPnwgmANw8Qi5U Thqw== X-Gm-Message-State: ACrzQf05Rp8f+z4UHI1KJd2CLKzHw106vYSbq01DQBXUi2NNFttDuNSh PL7Z4OJ1vVyUNkFO0OfNC+m3i1cutzOjFC5Q X-Google-Smtp-Source: AMsMyM6YZ/wN8xFwdDm3pQTdYhSKMRqDUQ4TSVSOKmqOMRFu564QuPXlK8k6ORG6biif7eZE2kTHFA== X-Received: by 2002:a17:906:7945:b0:73b:e605:f31 with SMTP id l5-20020a170906794500b0073be6050f31mr6114135ejo.129.1663925045890; Fri, 23 Sep 2022 02:24:05 -0700 (PDT) Received: from ?IPV6:2a02:578:8593:1200:5e2b:69ae:ba71:ae54? ([2a02:578:8593:1200:5e2b:69ae:ba71:ae54]) by smtp.gmail.com with ESMTPSA id 13-20020a170906318d00b00738467f743dsm3764902ejy.5.2022.09.23.02.24.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 Sep 2022 02:24:04 -0700 (PDT) Message-ID: Date: Fri, 23 Sep 2022 11:24:03 +0200 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Subject: Re: [PATCH net 2/3] can: gs_usb: gs_can_open(): fix race dev->can.state condition Content-Language: en-GB To: Jakub Kicinski Cc: Marc Kleine-Budde , netdev@vger.kernel.org, davem@davemloft.net, linux-can@vger.kernel.org, kernel@pengutronix.de, MPTCP Upstream References: <20220921083609.419768-1-mkl@pengutronix.de> <20220921083609.419768-3-mkl@pengutronix.de> <84f45a7d-92b6-4dc5-d7a1-072152fab6ff@tessares.net> <20220922082338.a6mbf2bbtznr3lvz@pengutronix.de> <20220922130525.6b1a1104@kernel.org> From: Matthieu Baerts In-Reply-To: <20220922130525.6b1a1104@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi Jakub, On 22/09/2022 22:05, Jakub Kicinski wrote: > On Thu, 22 Sep 2022 10:23:38 +0200 Marc Kleine-Budde wrote: >> On 22.09.2022 10:04:55, Matthieu Baerts wrote: >>> FYI, we got a small conflict when merging -net in net-next in the MPTCP >>> tree due to this patch applied in -net: >>> >>> 5440428b3da6 ("can: gs_usb: gs_can_open(): fix race dev->can.state >>> condition") >>> >>> and this one from net-next: >>> >>> 45dfa45f52e6 ("can: gs_usb: add RX and TX hardware timestamp support") >>> >>> The conflict has been resolved on our side[1] and the resolution we >>> suggest is attached to this email. > > Thanks for the resolution! If you happen to remember perhaps throw > "manual merge" into the subject. That's what I search my inbox for > when merging, it will allow us to be even more lazy :) I thought you were going to ask me to impersonate "Stephen Rothwell" :-P Good to know, I can sure do that! (Or at least try to remember that next time) Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net