On Tue, Apr 20, 2021,ycollette.nospam@xxxxxxx wrote:
net/xfrm/xfrm_state.c: In function 'xfrm_state_init':...
./include/linux/seqlock.h:178:36: error: initialization of 'seqcount_spinlock_t *' {aka 'struct seqcount_spinlock *'} from incompatible pointer type 'seqcount_t *' {aka 'struct seqcount *'} [-Werror=incompatible-pointer-types]
178 | seqcount_##lockname##_t *____s = (s); \
| ^
net/xfrm/xfrm_state.c:2666:2: note: in expansion of macro 'seqcount_spinlock_init'There is a rebase error at:
2666 | seqcount_spinlock_init(&net->xfrm.xfrm_state_hash_generation,
| ^~~~~~~~~~~~~~~~~~~~~~
247560698349 ("Merge tag 'v5.10.30' into v5.10-rt")
Cherry-pick mainline's commit:
bc8e0adff343 ("net: xfrm: Use sequence counter with associated spinlock")
and your compilation issue will be fixed.