From: Xin Xie <xiexinet@gmail.com>
To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, horms@kernel.org, andrew+netdev@lunn.ch,
shuah@kernel.org, kees@kernel.org, petr.wozniak@gmail.com,
qingfang.deng@linux.dev, fmaurer@redhat.com,
luka.gejak@linux.dev, bigeasy@linutronix.de,
xiaoliang.yang_1@nxp.com, skhawaja@google.com,
liuhangbin@gmail.com, stable@vger.kernel.org,
sdf.kernel@gmail.com,
syzbot+fbf74291c3b7e753b481@syzkaller.appspotmail.com
Subject: Re: [PATCH net v7 2/4] net: hsr: preserve submission order without a forwarding lock
Date: Sat, 10 Oct 2026 18:51:00 +0200 [thread overview]
Message-ID: <4b70af58-559c-4e6f-98fd-3b1da3c01998@gmail.com> (raw)
In-Reply-To: <20261009201324.17-3-xiexinet@gmail.com>
One integration note for net-next:
This series targets net. Contest reports conflicts in three files.
We handled the differences in those files as follows in our
net-next integration:
- In send_hsr_supervision_frame() and handle_std_frame(), net-next
already uses WRITE_ONCE() for hsr->sequence_nr. Remove the old
numbering blocks as this patch does, and keep the new consumer-side
numbering and WRITE_ONCE() updates. The supervision builder keeps
the zero sequence placeholder.
- In hsr_fill_info(), net-next already has READ_ONCE() and the updated
RCU handling. Omit only this patch's redundant sequence-read hunk
and keep the net-next RCU handling unchanged.
This resolution was included in the previously built and reviewed
integration series based on net-next cfb7793d1bc0. I also confirmed
that net/hsr is byte-for-byte identical in
net-next-2026-10-10--00-00, so the same resolution applies to these
conflicts. I have not rebuilt the series on that snapshot.
--
Xin
next prev parent reply other threads:[~2026-10-10 16:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-09 20:13 [PATCH net v7 0/4] net: hsr: fix super-packet forwarding and ordering Xin Xie
2026-10-09 20:13 ` [PATCH net v7 1/4] net: hsr: keep GRO disabled on HSR/PRP ports Xin Xie
2026-10-10 20:19 ` netdev-bot+sashiko
2026-10-09 20:13 ` [PATCH net v7 2/4] net: hsr: preserve submission order without a forwarding lock Xin Xie
2026-10-10 16:51 ` Xin Xie [this message]
2026-10-10 20:19 ` netdev-bot+sashiko
2026-10-09 20:13 ` [PATCH net v7 3/4] net: hsr: segment GSO before per-frame forwarding Xin Xie
2026-10-09 20:13 ` [PATCH net v7 4/4] selftests: net: hsr: verify GRO policy and ordered forwarding Xin Xie
2026-10-10 20:19 ` netdev-bot+sashiko
2026-10-11 18:58 ` Xin Xie
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=4b70af58-559c-4e6f-98fd-3b1da3c01998@gmail.com \
--to=xiexinet@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fmaurer@redhat.com \
--cc=horms@kernel.org \
--cc=kees@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=liuhangbin@gmail.com \
--cc=luka.gejak@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petr.wozniak@gmail.com \
--cc=qingfang.deng@linux.dev \
--cc=sdf.kernel@gmail.com \
--cc=shuah@kernel.org \
--cc=skhawaja@google.com \
--cc=stable@vger.kernel.org \
--cc=syzbot+fbf74291c3b7e753b481@syzkaller.appspotmail.com \
--cc=xiaoliang.yang_1@nxp.com \
/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
all inboxes | Powered by JetHome®