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

Reply via email to