From: Jakub Kicinski <kuba@kernel.org>
To: Matthieu Baerts <matthieu.baerts@tessares.net>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>,
netdev@vger.kernel.org, davem@davemloft.net,
linux-can@vger.kernel.org, kernel@pengutronix.de,
MPTCP Upstream <mptcp@lists.linux.dev>
Subject: Re: [PATCH net 2/3] can: gs_usb: gs_can_open(): fix race dev->can.state condition
Date: Thu, 22 Sep 2022 13:05:25 -0700 [thread overview]
Message-ID: <20220922130525.6b1a1104@kernel.org> (raw)
In-Reply-To: <20220922082338.a6mbf2bbtznr3lvz@pengutronix.de>
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 :)
next prev parent reply other threads:[~2022-09-22 20:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 8:36 [PATCH net 0/3] pull-request: can 2022-09-21 Marc Kleine-Budde
2022-09-21 8:36 ` [PATCH net 1/3] can: flexcan: flexcan_mailbox_read() fix return value for drop = true Marc Kleine-Budde
2022-09-21 14:20 ` patchwork-bot+netdevbpf
2022-09-21 8:36 ` [PATCH net 2/3] can: gs_usb: gs_can_open(): fix race dev->can.state condition Marc Kleine-Budde
2022-09-22 8:04 ` Matthieu Baerts
2022-09-22 8:23 ` Marc Kleine-Budde
2022-09-22 20:05 ` Jakub Kicinski [this message]
2022-09-23 9:24 ` Matthieu Baerts
2022-09-21 8:36 ` [PATCH net 3/3] can: gs_usb: gs_usb_set_phys_id(): return with error if identify is not supported Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220922130525.6b1a1104@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=mkl@pengutronix.de \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).